📦 v1.1.8 fix bug

truechain · May 20, 2019 · 3bcfd30 · 3bcfd30
1 parent f5c20d5
commit 3bcfd30
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "namespace": "truechain",
   "name": "web3t",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "Truechain JavaScript API",
   "license": "LGPL-3.0",
   "main": [

diff --git a/dist/web3t.min.js b/dist/web3t.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.js b/package.js
@@ -1,7 +1,7 @@
 /* jshint ignore:start */
 Package.describe({
   name: 'truechain:web3t',
-  version: '1.1.7',
+  version: '1.1.8',
   summary: 'Truechain JavaScript API wrapper repository',
   git: 'https://github.com/truechain/web3true.js',
   // By default, Meteor will default to using README.md for documentation.

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "web3true",
   "private": false,
   "namespace": "truechain",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "Truechain JavaScript API wrapper repository",
   "license": "LGPL-3.0",
   "main": "./packages/web3/index.js",

diff --git a/packages/web3-eth-accounts/index.js b/packages/web3-eth-accounts/index.js
@@ -278,11 +278,19 @@ Accounts.prototype.signTransaction = async function signTransaction(tx, privateK
         return signed(tx)
     }
 
+    let from = ''
+    if (privateKey.isMetaMask) {
+        const greenbelt = privateKey
+        from = greenbelt.selectedAddress
+    } else {
+        from = _this.privateKeyToAccount(privateKey).address
+    }
+
     // Otherwise, get the missing info from the Ethereum Node
     return Promise.all([
         isNot(tx.chainId) ? _this._ethereumCall.getId() : tx.chainId,
         isNot(tx.gasPrice) ? _this._ethereumCall.getGasPrice() : tx.gasPrice,
-        isNot(tx.nonce) ? _this._ethereumCall.getTransactionCount(_this.privateKeyToAccount(privateKey).address) : tx.nonce
+        isNot(tx.nonce) ? _this._ethereumCall.getTransactionCount(from) : tx.nonce
     ]).then(function (args) {
         if (isNot(args[0]) || isNot(args[1]) || isNot(args[2])) {
             throw new Error('One of the values "chainId", "gasPrice", or "nonce" couldn\'t be fetched: '+ JSON.stringify(args));
@@ -392,19 +400,11 @@ Accounts.prototype.signPrePaymentTransaction = async function signPrePaymentTran
         return signed(tx)
     }
 
-    let from = ''
-    if (privateKey.isMetaMask) {
-        const greenbelt = privateKey
-        from = greenbelt.selectedAddress
-    } else {
-        from = _this.privateKeyToAccount(privateKey).address
-    }
-
     // Otherwise, get the missing info from the Ethereum Node
     return Promise.all([
         isNot(tx.chainId) ? _this._ethereumCall.getId() : tx.chainId,
         isNot(tx.gasPrice) ? _this._ethereumCall.getGasPrice() : tx.gasPrice,
-        isNot(tx.nonce) ? _this._ethereumCall.getTransactionCount(from) : tx.nonce
+        isNot(tx.nonce) ? _this._ethereumCall.getTransactionCount(_this.privateKeyToAccount(privateKey).address) : tx.nonce
     ]).then(function (args) {
         if (isNot(args[0]) || isNot(args[1]) || isNot(args[2])) {
             throw new Error('One of the values "chainId", "gasPrice", or "nonce" couldn\'t be fetched: '+ JSON.stringify(args));