diff options
author | kumavis <kumavis@users.noreply.github.com> | 2016-02-23 05:41:16 +0800 |
---|---|---|
committer | kumavis <kumavis@users.noreply.github.com> | 2016-02-23 05:41:16 +0800 |
commit | bdf262fb180eeddcae05b82eec163efd546e6673 (patch) | |
tree | cf448cbbdce107978154def7f88dac7aabc20fc4 /app/scripts | |
parent | fddb99c9b3e5203be109e5a6bbcaeeab90a0115f (diff) | |
parent | bab37466d7465f15c749ebe20320f4924c9ead41 (diff) | |
download | tangerine-wallet-browser-bdf262fb180eeddcae05b82eec163efd546e6673.tar tangerine-wallet-browser-bdf262fb180eeddcae05b82eec163efd546e6673.tar.gz tangerine-wallet-browser-bdf262fb180eeddcae05b82eec163efd546e6673.tar.bz2 tangerine-wallet-browser-bdf262fb180eeddcae05b82eec163efd546e6673.tar.lz tangerine-wallet-browser-bdf262fb180eeddcae05b82eec163efd546e6673.tar.xz tangerine-wallet-browser-bdf262fb180eeddcae05b82eec163efd546e6673.tar.zst tangerine-wallet-browser-bdf262fb180eeddcae05b82eec163efd546e6673.zip |
Merge pull request #7 from MetaMask/rawtx_fix
Fix issue with raw transaction injection.
Diffstat (limited to 'app/scripts')
-rw-r--r-- | app/scripts/lib/idStore.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js index 430092cc7..d26a7391c 100644 --- a/app/scripts/lib/idStore.js +++ b/app/scripts/lib/idStore.js @@ -71,7 +71,7 @@ IdentityStore.prototype.setSelectedAddress = function(address){ IdentityStore.prototype.addUnconfirmedTransaction = function(txParams, cb){ var self = this - + var time = (new Date()).getTime() var txId = createId() self._currentState.unconfTxs[txId] = { @@ -81,7 +81,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function(txParams, cb){ status: 'unconfirmed', } console.log('addUnconfirmedTransaction:', txParams) - + // temp - just sign the tx // otherwise we need to keep the cb around // signTransaction(txId, cb) @@ -140,7 +140,7 @@ IdentityStore.prototype.sendTransaction = function(txId, cb){ const self = this var txData = self._currentState.unconfTxs[txId] - + if (!txData || txData.status !== 'signed') { return cb(new Error('IdentityStore - Transaction not signed:', txId)) } @@ -164,7 +164,7 @@ IdentityStore.prototype.cancelTransaction = function(txId){ var txData = self._currentState.unconfTxs[txId] delete self._currentState.unconfTxs[txId] - self._didUpdate() + self._didUpdate() } // @@ -180,7 +180,7 @@ IdentityStore.prototype._signTransaction = function(password, txParams, cb){ nonce: txParams.nonce, to: txParams.to, value: txParams.value, - data: txParams.input, + data: txParams.data, gasPrice: txParams.gasPrice, gasLimit: txParams.gas, }) @@ -288,4 +288,4 @@ IdentityStore.prototype._saveKeystore = function(keyStore){ // util -function noop(){}
\ No newline at end of file +function noop(){} |