Merge pull request #132 from torusresearch/develop

Release v1.2.2 [skip ci]

Author: tetratorus

examples/angular-example/package-lock.json

@@ -19,7 +19,7 @@
     "@angular/platform-browser": "~8.2.14",
     "@angular/platform-browser-dynamic": "~8.2.14",
     "@angular/router": "~8.2.14",
-    "@toruslabs/torus-embed": "^1.2.0",
+    "@toruslabs/torus-embed": "^1.2.1",
     "human-standard-token-abi": "^2.0.0",
     "rxjs": "~6.4.0",
     "tslib": "^1.10.0",

examples/angular-example/package.json

@@ -3,10 +3,10 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@toruslabs/torus-embed": "^1.2.0",
+    "@toruslabs/torus-embed": "^1.2.1",
     "human-standard-token-abi": "^2.0.0",
-    "react": "^16.13.0",
-    "react-dom": "^16.13.0",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
     "react-scripts": "3.4.0",
     "web3": "^1.2.6"
   },
@@ -37,6 +37,6 @@
     "eslint-plugin-import": "^2.20.1",
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-react": "^7.19.0",
-    "eslint-plugin-react-hooks": "^2.5.0"
+    "eslint-plugin-react-hooks": "^2.5.1"
   }
 }

examples/react-basic-app/package-lock.json

@@ -8,7 +8,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@toruslabs/torus-embed": "^1.2.0",
+    "@toruslabs/torus-embed": "^1.2.1",
     "core-js": "^3.6.4",
     "eth-sig-util": "^2.5.3",
     "human-standard-token-abi": "^2.0.0",

examples/react-basic-app/package.json

@@ -23,6 +23,7 @@
       <button @click="signTypedData_v4">sign typed data v4</button>
       <button @click="changeProvider">Change Provider</button>
       <button @click="sendDai">Send DAI</button>
+      <button @click="approveKnc">Approve Knc</button>
       <div :style="{marginTop: '20px'}">
         <select name="verifier" :value="selectedVerifier" @change="onSelectedVerifierChanged">
           <option selected value="google">Google</option>
@@ -308,6 +309,22 @@ export default {
         )
       })
     },
+    approveKnc() {
+      window.torus.setProvider({ host: 'mainnet' }).finally(() => {
+        const localWeb3 = window.web3
+        const instance = new localWeb3.eth.Contract(tokenAbi, '0xdd974D5C2e2928deA5F71b9825b8b646686BD200')
+        const value = Math.floor(parseFloat(0.01) * 10 ** parseFloat(18)).toString()
+        instance.methods.approve(this.publicAddress, value).send(
+          {
+            from: this.publicAddress
+          },
+          (err, hash) => {
+            if (err) this.console(err)
+            this.console(hash)
+          }
+        )
+      })
+    },
     async getUserInfo() {
       window.torus.getUserInfo().then(this.console).catch(this.console)
     },

examples/vue-app/package-lock.json

@@ -1,10 +1,15 @@
 #!/usr/bin/env bash
 git clone git@gist.github.com:733405286923fa047af4cb26d167acd4.git ~/gist
-PACKAGE_VERSION=$(cat ./src/embed.js | grep app.tor.us | head -1 | awk -F//app.tor.us/ '{ print $2 }' | sed "s/[']//g")
+PACKAGE_VERSION=$(cat package.json \
+  | grep '"version"' \
+  | head -1 \
+  | awk -F: '{ print $2 }' \
+  | sed 's/[",]//g')
 cd public/
 HASH="$(cat embed.min.js | openssl dgst -sha384 -binary | openssl base64 -A)"
 cd ~/gist
-echo "<script src=\"https://app.tor.us/$PACKAGE_VERSION/embed.min.js\"
+URL=$(echo https://app.tor.us/v"$PACKAGE_VERSION"/embed.min.js | tr -d ' ')
+echo "<script src=\"$URL\"
         integrity=\"sha384-$HASH\"
         crossorigin=\"anonymous\"></script>" > torus-embed.html
 

examples/vue-app/package.json

@@ -6,8 +6,8 @@ PACKAGE_VERSION=$(cat package.json \
   | awk -F: '{ print $2 }' \
   | sed 's/[",]//g')
 if [ "$CIRCLE_BRANCH" == 'master' ]; then
-  URL=$(echo s3://app.tor.us/"$PACKAGE_VERSION" | tr -d ' ')
+  URL=$(echo s3://app.tor.us/v"$PACKAGE_VERSION" | tr -d ' ')
 elif [ "$CIRCLE_BRANCH" == 'staging' ]; then
-  URL=$(echo s3://staging.tor.us/"$PACKAGE_VERSION" | tr -d ' ')
+  URL=$(echo s3://staging.tor.us/v"$PACKAGE_VERSION" | tr -d ' ')
 fi
 aws s3 cp ./public/embed.min.js $URL/embed.min.js

examples/vue-app/src/App.vue

@@ -1031,7 +1031,7 @@ class Torus {
         const preopenInstanceId = getPreopenInstanceId()
         this._handleWindow(preopenInstanceId)
         topupStream.write({ name: 'topup_request', data: { provider, params, preopenInstanceId } })
-      } else reject(new Error('User has not logged in yet'))
+      } else reject(new Error('User has not initialized in yet'))
     })
   }
 }