aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-081-2/+3
|\
| * blacklist - update phishing on boot and speed up polling to 4 minkumavis2017-08-051-2/+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-053-18/+59
|\|
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into blacklist-r...kumavis2017-08-041-3/+0
| |\
| | * remove stack from txsfrankiebee2017-08-041-3/+0
| * | blacklist - use module eth-phishing-detectkumavis2017-08-041-10/+18
| |/
| * Merge pull request #1848 from MetaMask/transactionControllerRefractorkumavis2017-08-031-172/+173
| |\
| * | blacklist controller - breakout from metamask and infura controllerskumavis2017-08-032-15/+51
* | | 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-022-1/+26
|\|
| * Merge branch 'master' into i1805-LiveBlacklistUpdatingDan Finlay2017-07-271-1/+0
| |\
| | * nonce-tracker - hotfix for provider proxyingkumavis2017-07-271-1/+0
| * | Begin implementing live-updating blacklist, not working yetDan Finlay2017-07-271-0/+14
| |/
| * 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-262-7/+8
|\|
| * Merge branch 'master' into betterErrorsOnTxFrankie2017-07-262-7/+8
| |\
| | * tx cont - add argument for provider constructorkumavis2017-07-261-2/+3
| | * 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
* Infura Network response teststmashuang2017-07-151-0/+1
* 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-122-23/+71
| |\ \
| | * \ Merge branch 'master' into nonce-trackerkumavis2017-07-082-23/+71
| | |\ \
| * | | | 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-283-0/+51
| |\ \ \
| * | | | 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 #1620 from MetaMask/i1616-AddTokenAddingThomas Huang2017-06-291-4/+25
|\ \ \ \
| * \ \ \ Merge branch 'AddTokenList' into i1616-AddTokenAddingDan Finlay2017-06-201-35/+68
| |\ \ \ \
| * | | | | Add ability to add tokens to token listDan Finlay2017-06-161-4/+25
* | | | | | Merge pull request #1509 from MetaMask/i1473-dappDefaultGasPriceDan Finlay2017-06-281-7/+9
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into i1473-dappDefaultGasPriceThomas Huang2017-06-283-1/+51
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Keeps dapp gas price if setThomas Huang2017-06-201-7/+9
| | |_|_|_|/ | |/| | | |
* | | | | | dont stop retrying brodcasting txsfrankiebee2017-06-281-4/+0
| |/ / / / |/| | | |
* | | | | Merge pull request #1663 from MetaMask/infura-statusThomas Huang2017-06-271-0/+42
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add infura network status to our UI state.Kevin Serrano2017-06-231-1/+1
| * | | | Add infura network status to our UI state.Kevin Serrano2017-06-231-0/+42
| |/ / /
* | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo...Kevin Serrano2017-06-202-1/+9
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge remote-tracking branch 'origin/master' into AddTokenListDan Finlay2017-06-161-10/+5
| |\|
| * | Refresh token balance on network changeDan Finlay2017-06-151-1/+0
| * | Persist selected account tabDan Finlay2017-06-151-0/+8
| * | Merge branch 'master' into AddTokenListDan Finlay2017-06-135-14/+596
| |\ \
* | \ \ 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
|/ /
* | Use new URL for currency API from cryptonator.Kevin Serrano2017-06-061-1/+1
* | stop polling when switching networksfrankiebee2017-05-241-0/+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-242-52/+36
* | | Wrap the provider in a proxyfrankiebee2017-05-232-80/+57
* | | Merge branch 'master' into networkControllerfrankiebee2017-05-231-0/+418
|\| |
| * | Fix path referencesDan Finlay2017-05-171-2/+2
| * | Rename tx manager to tx controllerDan Finlay2017-05-171-0/+404
* | | Create a network controller to manage switcing networks an updating the providerfrankiebee2017-05-191-0/+152
|/ /
* / Fix linting warningsThomas Huang2017-04-273-13/+11
|/
* Limit the number of addresses stored in our book.Kevin Serrano2017-03-141-0/+4
* Connect keyring controller to address book to prevent additional duplicates.Kevin Serrano2017-03-111-4/+18
* Improve duplicate checking in address book.Kevin Serrano2017-03-111-2/+2
* Add comments.Kevin Serrano2017-03-111-4/+19
* Rename functions for consistency.Kevin Serrano2017-03-101-6/+6
* Create persistence address book.Kevin Serrano2017-03-101-0/+46
* Create distinct labels and names for addresses.Kevin Serrano2017-03-101-1/+3
* Refactor of code into separate reducers and actions.Kevin Serrano2017-03-081-1/+1
* More conflict resolution.Kevin Serrano2017-03-021-1/+0
* add controllers to root scripts folderDan Finlay2017-02-283-0/+238