Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | tx controller - fix error serialization | kumavis | 2017-08-09 | 1 | -2/+5 |
| | |||||
* | tx controller - fix getBalance fn | kumavis | 2017-08-09 | 1 | -1/+1 |
| | |||||
* | filter by network for pending txs | frankiebee | 2017-08-09 | 1 | -0/+2 |
| | |||||
* | fix getPendingTransactions function for pendingTxTracker | frankiebee | 2017-08-09 | 1 | -2/+1 |
| | |||||
* | fix class names | frankiebee | 2017-08-09 | 1 | -16/+22 |
| | |||||
* | fix the bind on pending tx watchers | frankiebee | 2017-08-08 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-08 | 1 | -2/+3 |
|\ | |||||
| * | blacklist - update phishing on boot and speed up polling to 4 min | kumavis | 2017-08-05 | 1 | -2/+3 |
| | | |||||
* | | remove unnecessary if statment for error message | frankiebee | 2017-08-08 | 1 | -1/+0 |
| | | |||||
* | | fix spelling | frankiebee | 2017-08-08 | 1 | -9/+9 |
| | | |||||
* | | rename PendingTransactionUtils -> PendingTransactionWatchers | frankiebee | 2017-08-05 | 1 | -8/+8 |
| | | |||||
* | | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-05 | 3 | -18/+59 |
|\| | |||||
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵ | kumavis | 2017-08-04 | 1 | -3/+0 |
| |\ | | | | | | | | | | blacklist-refactor2 | ||||
| | * | remove stack from txs | frankiebee | 2017-08-04 | 1 | -3/+0 |
| | | | |||||
| * | | blacklist - use module eth-phishing-detect | kumavis | 2017-08-04 | 1 | -10/+18 |
| |/ | |||||
| * | Merge pull request #1848 from MetaMask/transactionControllerRefractor | kumavis | 2017-08-03 | 1 | -172/+173 |
| |\ | | | | | | | Transaction controller refractor part 1: promises for everyone and more tests! | ||||
| * | | blacklist controller - breakout from metamask and infura controllers | kumavis | 2017-08-03 | 2 | -15/+51 |
| | | | |||||
* | | | break out tx status pendding watchers | frankiebee | 2017-08-05 | 1 | -145/+27 |
| | | | |||||
* | | | use error for #approveTransaction when setting failed | frankiebee | 2017-08-03 | 1 | -5/+2 |
| |/ |/| | |||||
* | | move newUnapprovedTransaction to transactions.js | frankiebee | 2017-08-03 | 1 | -21/+42 |
| | | |||||
* | | lint fixes | frankiebee | 2017-08-02 | 1 | -4/+2 |
| | | |||||
* | | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-02 | 2 | -1/+26 |
|\| | |||||
| * | Merge branch 'master' into i1805-LiveBlacklistUpdating | Dan Finlay | 2017-07-27 | 1 | -1/+0 |
| |\ | |||||
| | * | nonce-tracker - hotfix for provider proxying | kumavis | 2017-07-27 | 1 | -1/+0 |
| | | | |||||
| * | | Begin implementing live-updating blacklist, not working yet | Dan Finlay | 2017-07-27 | 1 | -0/+14 |
| |/ | |||||
| * | tx cont - dont recursively store history | kumavis | 2017-07-27 | 1 | -3/+9 |
| | | |||||
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵ | kumavis | 2017-07-27 | 1 | -1/+1 |
| |\ | | | | | | | | | | betterErrorsOnTx | ||||
| * | | tx controller + nonce tracker - record nonce components on txMeta | kumavis | 2017-07-27 | 1 | -0/+4 |
| | | | |||||
* | | | fix addTxDefaults | frankiebee | 2017-08-02 | 1 | -1/+1 |
| | | | |||||
* | | | make addUnapprovedTransaction async function and use promise based ethQuery | frankiebee | 2017-08-02 | 1 | -158/+138 |
| |/ |/| | |||||
* | | Merge branch 'betterErrorsOnTx' of ↵ | frankiebee | 2017-07-26 | 2 | -7/+8 |
|\| | | | | | | | https://github.com/MetaMask/metamask-extension into betterErrorsOnTx | ||||
| * | Merge branch 'master' into betterErrorsOnTx | Frankie | 2017-07-26 | 2 | -7/+8 |
| |\ | |||||
| | * | tx cont - add argument for provider constructor | kumavis | 2017-07-26 | 1 | -2/+3 |
| | | | |||||
| | * | tx cont - remove old cb from async fn | kumavis | 2017-07-26 | 1 | -5/+5 |
| | | | |||||
* | | | fix typo | frankiebee | 2017-07-26 | 1 | -1/+1 |
|/ / | |||||
* | | fix stack wording | frankiebee | 2017-07-26 | 1 | -2/+2 |
| | | |||||
* | | use clone | frankiebee | 2017-07-26 | 1 | -1/+1 |
| | | |||||
* | | remove line numbers | frankiebee | 2017-07-26 | 1 | -3/+3 |
| | | |||||
* | | Add stack traces both in errors and as a way to track txMetas | frankiebee | 2017-07-26 | 1 | -8/+22 |
|/ | |||||
* | transactions - block nonce-tracker while updating pending transactions | kumavis | 2017-07-19 | 1 | -0/+3 |
| | |||||
* | transaction - promisify _checkPendingTxs | kumavis | 2017-07-19 | 1 | -27/+41 |
| | |||||
* | Infura Network response tests | tmashuang | 2017-07-15 | 1 | -0/+1 |
| | |||||
* | Merge pull request #1617 from MetaMask/nonce-tracker | Frankie | 2017-07-14 | 1 | -46/+58 |
|\ | | | | | transaction controller - use nonce-tracker | ||||
| * | make publishTransaction and signTransaction async methods | frankiebee | 2017-07-14 | 1 | -19/+12 |
| | | |||||
| * | mv updateAndApproveTx to txController | frankiebee | 2017-07-13 | 1 | -3/+7 |
| | | |||||
| * | Merge branch 'master' into nonce-tracker | frankiebee | 2017-07-12 | 1 | -20/+16 |
| |\ | |||||
| * \ | Merge branch 'nonce-tracker' of https://github.com/MetaMask/metamask-plugin ↵ | frankiebee | 2017-07-12 | 2 | -23/+71 |
| |\ \ | | | | | | | | | | | | | into nonce-tracker | ||||
| | * \ | Merge branch 'master' into nonce-tracker | kumavis | 2017-07-08 | 2 | -23/+71 |
| | |\ \ | |||||
| * | | | | remove irrelevan code | frankiebee | 2017-07-12 | 1 | -1/+0 |
| |/ / / | |||||
| * | | | clean up unused code from old noncelock | frankiebee | 2017-07-06 | 1 | -2/+0 |
| | | | | |||||
| * | | | nonce-tracker: only check transactions that are not supposed to be ignored | frankiebee | 2017-06-28 | 1 | -1/+8 |
| | | | | |||||
| * | | | calculate nonce based on local pending txs w/o error state. | frankiebee | 2017-06-28 | 1 | -1/+10 |
| | | | | |||||
| * | | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-06-28 | 3 | -0/+51 |
| |\ \ \ | |||||
| * | | | | fix nonceTracker | frankiebee | 2017-06-22 | 1 | -38/+13 |
| | | | | | |||||
| * | | | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-06-17 | 1 | -35/+68 |
| |\ \ \ \ | |||||
| * | | | | | transaction controller - use nonce-tracker | kumavis | 2017-06-15 | 1 | -32/+58 |
| | | | | | | |||||
* | | | | | | add "nonce too low" to the ignored errs list for tx retrys | frankiebee | 2017-07-13 | 1 | -0/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #1762 from MetaMask/ImproveRetryLogic | kumavis | 2017-07-12 | 1 | -12/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Improve retry logic | ||||
| * | | | | | Improve insufficient balance checking in retry loop | Dan Finlay | 2017-07-12 | 1 | -4/+1 |
| | | | | | | |||||
| * | | | | | Remove local nonce error setting. | Dan Finlay | 2017-07-12 | 1 | -8/+0 |
| | | | | | | |||||
* | | | | | | use .includes | frankiebee | 2017-07-12 | 1 | -3/+3 |
| | | | | | | |||||
* | | | | | | add "Gateway timeout" to ignored errors when resubmiting and use .includes ↵ | frankiebee | 2017-07-12 | 1 | -1/+3 |
|/ / / / / | | | | | | | | | | | | | | | | over .startsWith | ||||
* | | | | | tx controller - resubmit - correctly set error on bad nonce/balance | kumavis | 2017-07-08 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | tx controller - correctly set error message on resubmit error | kumavis | 2017-07-08 | 1 | -4/+8 |
| | | | | | |||||
* | | | | | tx controller - resubmit - recognize parity known hash message | kumavis | 2017-07-08 | 1 | -0/+1 |
| |_|_|/ |/| | | | |||||
* | | | | fail transactions that fail in resubmit | frankiebee | 2017-07-07 | 1 | -25/+22 |
| | | | | |||||
* | | | | tx controller - clean code | kumavis | 2017-07-07 | 1 | -13/+14 |
| | | | | |||||
* | | | | tx controller - move comments | kumavis | 2017-07-07 | 1 | -3/+7 |
| | | | | |||||
* | | | | add comment | frankiebee | 2017-07-07 | 1 | -5/+11 |
| | | | | |||||
* | | | | if an error happens during a tx publication set tx status to fail | frankiebee | 2017-07-07 | 1 | -1/+10 |
| | | | | |||||
* | | | | Fix failing test | Dan Finlay | 2017-07-06 | 1 | -12/+6 |
| | | | | |||||
* | | | | Fail pending txs with low balance or invalid nonce | Dan Finlay | 2017-07-06 | 1 | -4/+22 |
| | | | | |||||
* | | | | Merge pull request #1620 from MetaMask/i1616-AddTokenAdding | Thomas Huang | 2017-06-29 | 1 | -4/+25 |
|\ \ \ \ | | | | | | | | | | | Add ability to add tokens to token list | ||||
| * \ \ \ | Merge branch 'AddTokenList' into i1616-AddTokenAdding | Dan Finlay | 2017-06-20 | 1 | -35/+68 |
| |\ \ \ \ | |||||
| * | | | | | Add ability to add tokens to token list | Dan Finlay | 2017-06-16 | 1 | -4/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fiex #1616 | ||||
* | | | | | | Merge pull request #1509 from MetaMask/i1473-dappDefaultGasPrice | Dan Finlay | 2017-06-28 | 1 | -7/+9 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | I1473 dapp default gas price | ||||
| * \ \ \ \ \ | Merge branch 'master' into i1473-dappDefaultGasPrice | Thomas Huang | 2017-06-28 | 3 | -1/+51 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Keeps dapp gas price if set | Thomas Huang | 2017-06-20 | 1 | -7/+9 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | dont stop retrying brodcasting txs | frankiebee | 2017-06-28 | 1 | -4/+0 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1663 from MetaMask/infura-status | Thomas Huang | 2017-06-27 | 1 | -0/+42 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Add Infura Status Information to UI State | ||||
| * | | | | Add infura network status to our UI state. | Kevin Serrano | 2017-06-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add infura network status to our UI state. | Kevin Serrano | 2017-06-23 | 1 | -0/+42 |
| |/ / / | |||||
* | | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2017-06-20 | 2 | -1/+9 |
|\ \ \ \ | |/ / / |/| / / | |/ / | AddTokenList | ||||
| * | | Merge remote-tracking branch 'origin/master' into AddTokenList | Dan Finlay | 2017-06-16 | 1 | -10/+5 |
| |\| | |||||
| * | | Refresh token balance on network change | Dan Finlay | 2017-06-15 | 1 | -1/+0 |
| | | | |||||
| * | | Persist selected account tab | Dan Finlay | 2017-06-15 | 1 | -0/+8 |
| | | | | | | | | | | | | Also improve error handling with token balances. | ||||
| * | | Merge branch 'master' into AddTokenList | Dan Finlay | 2017-06-13 | 5 | -14/+596 |
| |\ \ | |||||
* | \ \ | Merge branch 'master' into i1567-FixInaccurateError | Frankie | 2017-06-17 | 1 | -3/+2 |
|\ \ \ \ | |||||
| * | | | | put the block listeners back on the provider | frankiebee | 2017-06-17 | 1 | -3/+2 |
| | | | | | |||||
* | | | | | put event back on the "blockTracker:/provider" | frankiebee | 2017-06-17 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' into i1567-FixInaccurateError | frankiebee | 2017-06-16 | 1 | -16/+52 |
|\| | | | | |||||
| * | | | | Merge pull request #1611 from MetaMask/checkTxsOnSync | kumavis | 2017-06-16 | 1 | -0/+46 |
| |\ \ \ \ | | | | | | | | | | | | | add a check for weather a tx is included in a block when jumping blocks | ||||
| | * | | | | transactions controller - add comments | kumavis | 2017-06-16 | 1 | -0/+5 |
| | | | | | | |||||
| | * | | | | add a check for weather a tx is included in a block when jumping blocks | frankiebee | 2017-06-15 | 1 | -0/+41 |
| | | |_|/ | | |/| | | |||||
| * / | | | check for the tx in the block that provider engine gives us | frankiebee | 2017-06-15 | 1 | -15/+5 |
| |/ / / | |||||
* | | | | check nonce and balance when resubmiting tx | frankiebee | 2017-06-16 | 1 | -11/+16 |
| | | | | |||||
* | | | | remove unnecessary log | frankiebee | 2017-06-15 | 1 | -4/+1 |
| | | | | |||||
* | | | | Do not mark slowly mined txs as failed. | Dan Finlay | 2017-06-15 | 1 | -8/+4 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | Fixes #1567 Also seems to fix #1556 Also improves resubmit performance by only resubmitting on `latest`. | ||||
* | | | Merge pull request #1598 from MetaMask/txRetry | Dan Finlay | 2017-06-14 | 1 | -9/+4 |
|\ \ \ | | | | | | | | | put tx resubmission on the block event | ||||
| * | | | rename continuallyResubmitPendingTxs to resubmitPendingTxs | frankiebee | 2017-06-14 | 1 | -2/+2 |
| | | | | |||||
| * | | | put tx resubmission on the block event | frankiebee | 2017-06-13 | 1 | -8/+3 |
| | |/ | |/| | |||||
* / | | Fix networkState in chain id | Thomas Huang | 2017-06-13 | 1 | -1/+1 |
|/ / | |||||
* | | Use new URL for currency API from cryptonator. | Kevin Serrano | 2017-06-06 | 1 | -1/+1 |
| | | |||||
* | | stop polling when switching networks | frankiebee | 2017-05-24 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into networkController | Frankie | 2017-05-24 | 1 | -4/+55 |
|\ \ | |||||
| * | | Cleanup | Dan Finlay | 2017-05-24 | 1 | -2/+3 |
| | | | |||||
| * | | Continually resubmit pending txs | Dan Finlay | 2017-05-24 | 1 | -2/+52 |
| | | | |||||
* | | | Fix for tests | frankiebee | 2017-05-24 | 2 | -52/+36 |
| | | | |||||
* | | | Wrap the provider in a proxy | frankiebee | 2017-05-23 | 2 | -80/+57 |
| | | | |||||
* | | | Merge branch 'master' into networkController | frankiebee | 2017-05-23 | 1 | -0/+418 |
|\| | | |||||
| * | | Fix path references | Dan Finlay | 2017-05-17 | 1 | -2/+2 |
| | | | |||||
| * | | Rename tx manager to tx controller | Dan Finlay | 2017-05-17 | 1 | -0/+404 |
| | | | |||||
* | | | Create a network controller to manage switcing networks an updating the provider | frankiebee | 2017-05-19 | 1 | -0/+152 |
|/ / | |||||
* / | Fix linting warnings | Thomas Huang | 2017-04-27 | 3 | -13/+11 |
|/ | |||||
* | Limit the number of addresses stored in our book. | Kevin Serrano | 2017-03-14 | 1 | -0/+4 |
| | |||||
* | Connect keyring controller to address book to prevent additional duplicates. | Kevin Serrano | 2017-03-11 | 1 | -4/+18 |
| | |||||
* | Improve duplicate checking in address book. | Kevin Serrano | 2017-03-11 | 1 | -2/+2 |
| | |||||
* | Add comments. | Kevin Serrano | 2017-03-11 | 1 | -4/+19 |
| | |||||
* | Rename functions for consistency. | Kevin Serrano | 2017-03-10 | 1 | -6/+6 |
| | |||||
* | Create persistence address book. | Kevin Serrano | 2017-03-10 | 1 | -0/+46 |
| | |||||
* | Create distinct labels and names for addresses. | Kevin Serrano | 2017-03-10 | 1 | -1/+3 |
| | |||||
* | Refactor of code into separate reducers and actions. | Kevin Serrano | 2017-03-08 | 1 | -1/+1 |
| | |||||
* | More conflict resolution. | Kevin Serrano | 2017-03-02 | 1 | -1/+0 |
| | |||||
* | add controllers to root scripts folder | Dan Finlay | 2017-02-28 | 3 | -0/+238 |