diff options
author | kumavis <kumavis@users.noreply.github.com> | 2016-04-21 13:07:00 +0800 |
---|---|---|
committer | kumavis <kumavis@users.noreply.github.com> | 2016-04-21 13:07:00 +0800 |
commit | db85827b2be19d7bfc7dfaeec4786c4d051b6629 (patch) | |
tree | 39075d39ddcfbcb80016d61a22942451dbc745b9 /app/scripts/lib/idStore.js | |
parent | f82a4de725e384ab4bb39c57f83a3dbb406c8db6 (diff) | |
parent | 532edf670e8c30db958765141974f3fb0f5ec44c (diff) | |
download | tangerine-wallet-browser-db85827b2be19d7bfc7dfaeec4786c4d051b6629.tar tangerine-wallet-browser-db85827b2be19d7bfc7dfaeec4786c4d051b6629.tar.gz tangerine-wallet-browser-db85827b2be19d7bfc7dfaeec4786c4d051b6629.tar.bz2 tangerine-wallet-browser-db85827b2be19d7bfc7dfaeec4786c4d051b6629.tar.lz tangerine-wallet-browser-db85827b2be19d7bfc7dfaeec4786c4d051b6629.tar.xz tangerine-wallet-browser-db85827b2be19d7bfc7dfaeec4786c4d051b6629.tar.zst tangerine-wallet-browser-db85827b2be19d7bfc7dfaeec4786c4d051b6629.zip |
Merge pull request #125 from MetaMask/TransactionList
Add transaction history to account detail view
Diffstat (limited to 'app/scripts/lib/idStore.js')
-rw-r--r-- | app/scripts/lib/idStore.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js index b451fd6d4..7763d33d8 100644 --- a/app/scripts/lib/idStore.js +++ b/app/scripts/lib/idStore.js @@ -135,6 +135,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function(txParams, cb){ // create txData obj with parameters and meta data var time = (new Date()).getTime() var txId = createId() + txParams.metamaskId = txId var txData = { id: txId, txParams: txParams, @@ -337,6 +338,13 @@ function IdManagement(opts) { txParams.gasLimit = ethUtil.addHexPrefix(txParams.gasLimit || txParams.gas) txParams.nonce = ethUtil.addHexPrefix(txParams.nonce) var tx = new Transaction(txParams) + + // Add the tx hash to the persisted meta-tx object + var hash = '0x' + tx.hash().toString('hex') + var metaTx = configManager.getTx(txParams.metamaskId) + metaTx.hash = hash + configManager.updateTx(metaTx) + var rawTx = '0x'+tx.serialize().toString('hex') return '0x'+LightwalletSigner.signTx(this.keyStore, this.derivedKey, rawTx, txParams.from, this.hdPathString) } |