aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers/transactions.js
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
* | | | fix nonceTrackerfrankiebee2017-06-221-38/+13
* | | | Merge branch 'master' into nonce-trackerfrankiebee2017-06-171-35/+68
|\| | |
| * | | 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
| |/ /
* / / transaction controller - use nonce-trackerkumavis2017-06-151-32/+58
|/ /
* | 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