aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers/transactions.js
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into uatDan2018-02-081-0/+4
|\
| * wipe only transactions for current accountBruno Barbieri2018-01-311-2/+2
| * added reset account featureBruno Barbieri2018-01-311-0/+4
* | Merge branch 'uat' into newmasterChi Kei Chan2018-01-201-0/+4
|\ \ | |/ |/|
| * Merge branch 'uat' into uat-master-011618Alexander Tseung2018-01-171-0/+4
| |\
| | * Merge branch 'NewUI-flat' into merge-masterAlexander Tseung2017-12-231-0/+4
| | |\
| | | * Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20Chi Kei Chan2017-12-211-0/+4
| | | |\
| | | | * Adds updateTransaction to background and used it to update after editing in s...Dan2017-12-211-5/+4
| | | | * Canceled, edited transactions show edited amount.Dan2017-12-211-0/+5
* | | | | Update transactions.jskumavis2018-01-181-1/+1
* | | | | transactions - transtion approved transactions to failed transactions on bootfrankiebee2018-01-181-0/+8
* | | | | transactions - fail txs on boot who fail addTxDefaultsfrankiebee2018-01-181-0/+2
* | | | | transactions - wrap addTxDefaults in a try catch and re try addTxDefaults on ...frankiebee2018-01-181-2/+20
|/ / / /
* | | | transactions - emit 'newUnapprovedTx' before estimateGas finishesfrankiebee2018-01-151-2/+6
* | | | bugfix - transactions controller - breakout logic and fix order of operations...kumavis2018-01-091-2/+4
* | | | Fix feature to workDan Finlay2018-01-061-1/+2
* | | | Derive gas price estimate from previous transactionsDan Finlay2018-01-061-1/+2
|/ / /
* / / Remove retryTimePeriod from tx controllerDan Finlay2017-12-221-1/+0
|/ /
* | tx-controller - failed state is a finished statekumavis2017-12-081-6/+8
* | Do not allow nonces larger than the next valid nonceDan Finlay2017-12-081-0/+4
* | Merge branch 'master' into patch-2Dan Finlay2017-12-081-0/+7
|\ \
| * | Enforce retry tx at minimum gas of previous txDan Finlay2017-12-071-1/+4
| * | Add retry background method and actionDan Finlay2017-12-071-0/+4
| |/
* | A more expressive wayvicnaum2017-12-071-5/+2
* | Fix for #2644 - Specified Nonce isn't usedvicnaum2017-12-071-1/+6
|/
* Correct note for updateTx after block-update event in transaction.jsDan2017-12-071-1/+1
* Exponentional backoff on transaction retry in pending-tx-trackerDan2017-12-061-0/+6
* newUnaprovedTx => newUnapprovedTxDora E. Mondrian2017-11-061-1/+1
* Merge pull request #2291 from MetaMask/gasPriceSpecifiedKevin Serrano2017-10-281-0/+1
|\
| * Add indicator for specified gas priceKevin Serrano2017-10-061-0/+1
* | Revert "NetworkController refactor for new EthClient interface"kumavis2017-10-191-1/+0
* | nonce-tracker - use blockTracker directlykumavis2017-10-121-0/+1
* | Provide method for tx tracker to refer to all txsDan Finlay2017-10-071-0/+1
* | pending-tx - check time stamp instead of block number for resubmitfrankiebee2017-10-061-1/+1
|/
* transaction - provide notes for historyfrankiebee2017-10-031-7/+9
* pending-tx - dont check the balance to rebrodcastfrankiebee2017-09-301-10/+1
* Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3kumavis2017-09-281-279/+86
|\
| * pending-tx - move incrementing of the retryCount on the txMeta outside pendin...frankiebee2017-09-271-0/+5
| * transactions: reveal #getFilteredTxList from txStateManage and fix accountTra...frankiebee2017-09-271-1/+5
| * transactions: make evnt names pretty and eaiser to readfrankiebee2017-09-271-3/+3
| * transactions: lint fixes and reveal status-update event for balance controllerfrankiebee2017-09-271-2/+3
| * Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-09-271-3/+3
| |\
| * | ensure that values written to txParams are hex stringsfrankiebee2017-09-141-1/+1
| * | linting && format fixingfrankiebee2017-09-131-7/+3
| * | match other controller patternsfrankiebee2017-09-131-14/+8
| * | more tests and craete a getPendingTransactions functionfrankiebee2017-09-091-11/+4
| * | fix messy mergefrankiebee2017-09-071-4/+4
| * | fix merge and errors disaperaing on updatefrankiebee2017-09-071-1/+1
| * | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-09-071-1/+12
| |\ \
| * | | add better commentsfrankiebee2017-09-061-31/+41
| * | | Merge branch 'master' into transactionControllerRefractorPt3frankiebee2017-08-221-1/+1
| |\ \ \
| * | | | Create TxStateManagerfrankiebee2017-08-221-45/+28
| * | | | Create tests for TxStateManagerfrankiebee2017-08-191-192/+17
* | | | | Fix accountTracker store referencesDan Finlay2017-09-281-1/+1
* | | | | Merge branch 'master' into filter-fixes-moarDan Finlay2017-09-281-3/+4
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Refactor eth-store into account-trackerDan Finlay2017-09-231-3/+3
| * | | | Add state-labeled events to allow subscribing to any transaction's state changeDan Finlay2017-09-141-0/+1
| | |_|/ | |/| |
* / | | listen for the blocke event on the block tracker instead of rawBlock on the p...frankiebee2017-09-271-1/+1
|/ / /
* | | Fail transactions after a day of retriesDan Finlay2017-08-241-1/+5
* | | Merge branch 'master' into useLocalNonceDan Finlay2017-08-241-16/+19
|\ \ \ | | |/ | |/|
| * | tx controller - tx state history various small fixeskumavis2017-08-151-1/+0
| * | introduce tx-state-history-helper and diff-based historykumavis2017-08-151-15/+19
| |/
* / use "localNonce" when the network returns a nonce that is lower then a known ...frankiebee2017-08-191-0/+7
|/
* tx controller - fix error serializationkumavis2017-08-091-2/+5
* tx controller - fix getBalance fnkumavis2017-08-091-1/+1
* filter by network for pending txsfrankiebee2017-08-091-0/+2
* fix getPendingTransactions function for pendingTxTrackerfrankiebee2017-08-091-2/+1
* fix class namesfrankiebee2017-08-091-16/+22
* fix the bind on pending tx watchersfrankiebee2017-08-081-3/+3
* remove unnecessary if statment for error messagefrankiebee2017-08-081-1/+0
* fix spellingfrankiebee2017-08-081-9/+9
* rename PendingTransactionUtils -> PendingTransactionWatchersfrankiebee2017-08-051-8/+8
* Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-051-3/+0
|\
| * remove stack from txsfrankiebee2017-08-041-3/+0
* | break out tx status pendding watchersfrankiebee2017-08-051-145/+27
* | use error for #approveTransaction when setting failedfrankiebee2017-08-031-5/+2
|/
* move newUnapprovedTransaction to transactions.jsfrankiebee2017-08-031-21/+42
* lint fixesfrankiebee2017-08-021-4/+2
* Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-021-1/+12
|\
| * nonce-tracker - hotfix for provider proxyingkumavis2017-07-271-1/+0
| * tx cont - dont recursively store historykumavis2017-07-271-3/+9
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into betterError...kumavis2017-07-271-1/+1
| |\
| * | tx controller + nonce tracker - record nonce components on txMetakumavis2017-07-271-0/+4
* | | fix addTxDefaultsfrankiebee2017-08-021-1/+1
* | | make addUnapprovedTransaction async function and use promise based ethQueryfrankiebee2017-08-021-158/+138
| |/ |/|
* | Merge branch 'betterErrorsOnTx' of https://github.com/MetaMask/metamask-exten...frankiebee2017-07-261-5/+5
|\|
| * Merge branch 'master' into betterErrorsOnTxFrankie2017-07-261-5/+5
| |\
| | * tx cont - remove old cb from async fnkumavis2017-07-261-5/+5
* | | fix typofrankiebee2017-07-261-1/+1
|/ /
* | fix stack wordingfrankiebee2017-07-261-2/+2
* | use clonefrankiebee2017-07-261-1/+1
* | remove line numbersfrankiebee2017-07-261-3/+3
* | Add stack traces both in errors and as a way to track txMetasfrankiebee2017-07-261-8/+22
|/
* transactions - block nonce-tracker while updating pending transactionskumavis2017-07-191-0/+3
* transaction - promisify _checkPendingTxskumavis2017-07-191-27/+41
* Merge pull request #1617 from MetaMask/nonce-trackerFrankie2017-07-141-46/+58
|\
| * make publishTransaction and signTransaction async methodsfrankiebee2017-07-141-19/+12
| * mv updateAndApproveTx to txControllerfrankiebee2017-07-131-3/+7
| * Merge branch 'master' into nonce-trackerfrankiebee2017-07-121-20/+16
| |\
| * \ Merge branch 'nonce-tracker' of https://github.com/MetaMask/metamask-plugin i...frankiebee2017-07-121-19/+46
| |\ \
| | * \ Merge branch 'master' into nonce-trackerkumavis2017-07-081-19/+46
| | |\ \
| * | | | remove irrelevan codefrankiebee2017-07-121-1/+0
| |/ / /
| * | | clean up unused code from old noncelockfrankiebee2017-07-061-2/+0
| * | | nonce-tracker: only check transactions that are not supposed to be ignoredfrankiebee2017-06-281-1/+8
| * | | calculate nonce based on local pending txs w/o error state.frankiebee2017-06-281-1/+10
| * | | Merge branch 'master' into nonce-trackerfrankiebee2017-06-281-0/+1
| |\ \ \
| * | | | fix nonceTrackerfrankiebee2017-06-221-38/+13
| * | | | Merge branch 'master' into nonce-trackerfrankiebee2017-06-171-35/+68
| |\ \ \ \
| * | | | | transaction controller - use nonce-trackerkumavis2017-06-151-32/+58
* | | | | | add "nonce too low" to the ignored errs list for tx retrysfrankiebee2017-07-131-0/+1
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #1762 from MetaMask/ImproveRetryLogickumavis2017-07-121-12/+1
|\ \ \ \ \
| * | | | | Improve insufficient balance checking in retry loopDan Finlay2017-07-121-4/+1
| * | | | | Remove local nonce error setting.Dan Finlay2017-07-121-8/+0
* | | | | | use .includesfrankiebee2017-07-121-3/+3
* | | | | | add "Gateway timeout" to ignored errors when resubmiting and use .includes ov...frankiebee2017-07-121-1/+3
|/ / / / /
* | | | | tx controller - resubmit - correctly set error on bad nonce/balancekumavis2017-07-081-2/+2
* | | | | tx controller - correctly set error message on resubmit errorkumavis2017-07-081-4/+8
* | | | | tx controller - resubmit - recognize parity known hash messagekumavis2017-07-081-0/+1
| |_|_|/ |/| | |
* | | | fail transactions that fail in resubmitfrankiebee2017-07-071-25/+22
* | | | tx controller - clean codekumavis2017-07-071-13/+14
* | | | tx controller - move commentskumavis2017-07-071-3/+7
* | | | add commentfrankiebee2017-07-071-5/+11
* | | | if an error happens during a tx publication set tx status to failfrankiebee2017-07-071-1/+10
* | | | Fix failing testDan Finlay2017-07-061-12/+6
* | | | Fail pending txs with low balance or invalid nonceDan Finlay2017-07-061-4/+22
* | | | Merge pull request #1509 from MetaMask/i1473-dappDefaultGasPriceDan Finlay2017-06-281-7/+9
|\ \ \ \
| * \ \ \ Merge branch 'master' into i1473-dappDefaultGasPriceThomas Huang2017-06-281-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Keeps dapp gas price if setThomas Huang2017-06-201-7/+9
| | |_|/ | |/| |
* | | | dont stop retrying brodcasting txsfrankiebee2017-06-281-4/+0
| |/ / |/| |
* | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo...Kevin Serrano2017-06-201-1/+1
|\ \ \ | |/ / |/| |
| * | Merge remote-tracking branch 'origin/master' into AddTokenListDan Finlay2017-06-161-10/+5
| |\|
| * | Refresh token balance on network changeDan Finlay2017-06-151-1/+0
| * | Merge branch 'master' into AddTokenListDan Finlay2017-06-131-0/+1
* | | Merge branch 'master' into i1567-FixInaccurateErrorFrankie2017-06-171-3/+2
|\ \ \
| * | | put the block listeners back on the providerfrankiebee2017-06-171-3/+2
* | | | put event back on the "blockTracker:/provider"frankiebee2017-06-171-1/+1
* | | | Merge branch 'master' into i1567-FixInaccurateErrorfrankiebee2017-06-161-16/+52
|\| | |
| * | | Merge pull request #1611 from MetaMask/checkTxsOnSynckumavis2017-06-161-0/+46
| |\ \ \
| | * | | transactions controller - add commentskumavis2017-06-161-0/+5
| | * | | add a check for weather a tx is included in a block when jumping blocksfrankiebee2017-06-151-0/+41
| | | |/ | | |/|
| * / | check for the tx in the block that provider engine gives usfrankiebee2017-06-151-15/+5
| |/ /
* | | check nonce and balance when resubmiting txfrankiebee2017-06-161-11/+16
* | | remove unnecessary logfrankiebee2017-06-151-4/+1
* | | Do not mark slowly mined txs as failed.Dan Finlay2017-06-151-8/+4
|/ /
* | Merge pull request #1598 from MetaMask/txRetryDan Finlay2017-06-141-9/+4
|\ \
| * | rename continuallyResubmitPendingTxs to resubmitPendingTxsfrankiebee2017-06-141-2/+2
| * | put tx resubmission on the block eventfrankiebee2017-06-131-8/+3
| |/
* / Fix networkState in chain idThomas Huang2017-06-131-1/+1
|/
* Merge branch 'master' into networkControllerFrankie2017-05-241-4/+55
|\
| * CleanupDan Finlay2017-05-241-2/+3
| * Continually resubmit pending txsDan Finlay2017-05-241-2/+52
* | Fix for testsfrankiebee2017-05-241-3/+1
* | Wrap the provider in a proxyfrankiebee2017-05-231-20/+7
* | Merge branch 'master' into networkControllerfrankiebee2017-05-231-5/+19
|/
* Fix path referencesDan Finlay2017-05-171-2/+2
* Rename tx manager to tx controllerDan Finlay2017-05-171-0/+404