| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into uat | Dan | 2018-02-08 | 1 | -0/+4 |
| |\ | |||||
| | * | wipe only transactions for current account | Bruno Barbieri | 2018-01-31 | 1 | -2/+2 |
| | | | |||||
| | * | added reset account feature | Bruno Barbieri | 2018-01-31 | 1 | -0/+4 |
| | | | |||||
| * | | Merge branch 'uat' into newmaster | Chi Kei Chan | 2018-01-20 | 1 | -0/+4 |
| |\ \ | |/ |/| | |||||
| | * | Merge branch 'uat' into uat-master-011618 | Alexander Tseung | 2018-01-17 | 1 | -0/+4 |
| | |\ | |||||
| | | * | Merge branch 'NewUI-flat' into merge-master | Alexander Tseung | 2017-12-23 | 1 | -0/+4 |
| | | |\ | |||||
| | | | * | Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 | Chi Kei Chan | 2017-12-21 | 1 | -0/+4 |
| | | | |\ | |||||
| | | | | * | Adds updateTransaction to background and used it to update after editing in ↵ | Dan | 2017-12-21 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | | | | | | | send-v2. | ||||
| | | | | * | Canceled, edited transactions show edited amount. | Dan | 2017-12-21 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Update transactions.js | kumavis | 2018-01-18 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | transactions - transtion approved transactions to failed transactions on boot | frankiebee | 2018-01-18 | 1 | -0/+8 |
| | | | | | | |||||
| * | | | | | transactions - fail txs on boot who fail addTxDefaults | frankiebee | 2018-01-18 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | transactions - wrap addTxDefaults in a try catch and re try addTxDefaults on ↵ | frankiebee | 2018-01-18 | 1 | -2/+20 |
| |/ / / / | | | | | | | | | | | | | boot if they did not complete | ||||
| * | | | | transactions - emit 'newUnapprovedTx' before estimateGas finishes | frankiebee | 2018-01-15 | 1 | -2/+6 |
| | | | | | |||||
| * | | | | bugfix - transactions controller - breakout logic and fix order of ↵ | kumavis | 2018-01-09 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | operations bug | ||||
| * | | | | Fix feature to work | Dan Finlay | 2018-01-06 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Derive gas price estimate from previous transactions | Dan Finlay | 2018-01-06 | 1 | -1/+2 |
| |/ / / | | | | | | | | | | Return the 50th percentile lowest gas price of the previous 20 blocks. | ||||
| * / / | Remove retryTimePeriod from tx controller | Dan Finlay | 2017-12-22 | 1 | -1/+0 |
| |/ / | |||||
| * | | tx-controller - failed state is a finished state | kumavis | 2017-12-08 | 1 | -6/+8 |
| | | | |||||
| * | | Do not allow nonces larger than the next valid nonce | Dan Finlay | 2017-12-08 | 1 | -0/+4 |
| | | | | | | | | | | | To avoid situations where a user signs a transaction that will become surprisingly valid in the future. | ||||
| * | | Merge branch 'master' into patch-2 | Dan Finlay | 2017-12-08 | 1 | -0/+7 |
| |\ \ | |||||
| | * | | Enforce retry tx at minimum gas of previous tx | Dan Finlay | 2017-12-07 | 1 | -1/+4 |
| | | | | |||||
| | * | | Add retry background method and action | Dan Finlay | 2017-12-07 | 1 | -0/+4 |
| | |/ | |||||
| * | | A more expressive way | vicnaum | 2017-12-07 | 1 | -5/+2 |
| | | | | | | | replaced ifs with ? : | ||||
| * | | Fix for #2644 - Specified Nonce isn't used | vicnaum | 2017-12-07 | 1 | -1/+6 |
| |/ | | | | Added nonceSpecified. And a check if nonce was specified - then we should use the specified nonce instead of generating a new one. | ||||
| * | Correct note for updateTx after block-update event in transaction.js | Dan | 2017-12-07 | 1 | -1/+1 |
| | | |||||
| * | Exponentional backoff on transaction retry in pending-tx-tracker | Dan | 2017-12-06 | 1 | -0/+6 |
| | | |||||
| * | newUnaprovedTx => newUnapprovedTx | Dora E. Mondrian | 2017-11-06 | 1 | -1/+1 |
| | | | | | This typo tripped me up when I was reading through the code and trying to understand what's going on. | ||||
| * | Merge pull request #2291 from MetaMask/gasPriceSpecified | Kevin Serrano | 2017-10-28 | 1 | -0/+1 |
| |\ | | | | | Add boolean for specified gas price | ||||
| | * | Add indicator for specified gas price | Kevin Serrano | 2017-10-06 | 1 | -0/+1 |
| | | | |||||
| * | | Revert "NetworkController refactor for new EthClient interface" | kumavis | 2017-10-19 | 1 | -1/+0 |
| | | | |||||
| * | | nonce-tracker - use blockTracker directly | kumavis | 2017-10-12 | 1 | -0/+1 |
| | | | |||||
| * | | Provide method for tx tracker to refer to all txs | Dan Finlay | 2017-10-07 | 1 | -0/+1 |
| | | | |||||
| * | | pending-tx - check time stamp instead of block number for resubmit | frankiebee | 2017-10-06 | 1 | -1/+1 |
| |/ | |||||
| * | transaction - provide notes for history | frankiebee | 2017-10-03 | 1 | -7/+9 |
| | | |||||
| * | pending-tx - dont check the balance to rebrodcast | frankiebee | 2017-09-30 | 1 | -10/+1 |
| | | |||||
| * | Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3 | kumavis | 2017-09-28 | 1 | -279/+86 |
| |\ | | | | | Transaction controller refractor pt3 | ||||
| | * | pending-tx - move incrementing of the retryCount on the txMeta outside ↵ | frankiebee | 2017-09-27 | 1 | -0/+5 |
| | | | | | | | | | pending-tx-tracker | ||||
| | * | transactions: reveal #getFilteredTxList from txStateManage and fix ↵ | frankiebee | 2017-09-27 | 1 | -1/+5 |
| | | | | | | | | | accountTracker.store reference | ||||
| | * | transactions: make evnt names pretty and eaiser to read | frankiebee | 2017-09-27 | 1 | -3/+3 |
| | | | |||||
| | * | transactions: lint fixes and reveal status-update event for balance controller | frankiebee | 2017-09-27 | 1 | -2/+3 |
| | | | |||||
| | * | Merge branch 'master' into transactionControllerRefractorPt3 | frankiebee | 2017-09-27 | 1 | -3/+3 |
| | |\ | |||||
| | * | | ensure that values written to txParams are hex strings | frankiebee | 2017-09-14 | 1 | -1/+1 |
| | | | | |||||
| | * | | linting && format fixing | frankiebee | 2017-09-13 | 1 | -7/+3 |
| | | | | |||||
| | * | | match other controller patterns | frankiebee | 2017-09-13 | 1 | -14/+8 |
| | | | | |||||
| | * | | more tests and craete a getPendingTransactions function | frankiebee | 2017-09-09 | 1 | -11/+4 |
| | | | | |||||
| | * | | fix messy merge | frankiebee | 2017-09-07 | 1 | -4/+4 |
| | | | | |||||
| | * | | fix merge and errors disaperaing on update | frankiebee | 2017-09-07 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' into transactionControllerRefractorPt3 | frankiebee | 2017-09-07 | 1 | -1/+12 |
| | |\ \ | |||||
| | * | | | add better comments | frankiebee | 2017-09-06 | 1 | -31/+41 |
| | | | | | |||||
| | * | | | Merge branch 'master' into transactionControllerRefractorPt3 | frankiebee | 2017-08-22 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * | | | | Create TxStateManager | frankiebee | 2017-08-22 | 1 | -45/+28 |
| | | | | | | |||||
| | * | | | | Create tests for TxStateManager | frankiebee | 2017-08-19 | 1 | -192/+17 |
| | | | | | | |||||
| * | | | | | Fix accountTracker store references | Dan Finlay | 2017-09-28 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into filter-fixes-moar | Dan Finlay | 2017-09-28 | 1 | -3/+4 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | Refactor eth-store into account-tracker | Dan Finlay | 2017-09-23 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | EthStore was only being used for tracking account balances and nonces now, so I removed its block-tracking duties, renamed it account-tracker, and removed it as a dependency from `KeyringController`, so that KRC can go live on without a hard dep on it. | ||||
| | * | | | | Add state-labeled events to allow subscribing to any transaction's state change | Dan Finlay | 2017-09-14 | 1 | -0/+1 |
| | | |_|/ | |/| | | |||||
| * / | | | listen for the blocke event on the block tracker instead of rawBlock on the ↵ | frankiebee | 2017-09-27 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | provider | ||||
| * | | | Fail transactions after a day of retries | Dan Finlay | 2017-08-24 | 1 | -1/+5 |
| | | | | |||||
| * | | | Merge branch 'master' into useLocalNonce | Dan Finlay | 2017-08-24 | 1 | -16/+19 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | tx controller - tx state history various small fixes | kumavis | 2017-08-15 | 1 | -1/+0 |
| | | | | |||||
| | * | | introduce tx-state-history-helper and diff-based history | kumavis | 2017-08-15 | 1 | -15/+19 |
| | |/ | |||||
| * / | use "localNonce" when the network returns a nonce that is lower then a known ↵ | frankiebee | 2017-08-19 | 1 | -0/+7 |
| |/ | | | | confirmed tx | ||||
| * | 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 |
| | | |||||
| * | 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 | 1 | -3/+0 |
| |\ | |||||
| | * | remove stack from txs | frankiebee | 2017-08-04 | 1 | -3/+0 |
| | | | |||||
| * | | 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 | 1 | -1/+12 |
| |\ | |||||
| | * | nonce-tracker - hotfix for provider proxying | kumavis | 2017-07-27 | 1 | -1/+0 |
| | | | |||||
| | * | 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 | 1 | -5/+5 |
| |\| | | | | | | | https://github.com/MetaMask/metamask-extension into betterErrorsOnTx | ||||
| | * | Merge branch 'master' into betterErrorsOnTx | Frankie | 2017-07-26 | 1 | -5/+5 |
| | |\ | |||||
| | | * | 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 |
| | | |||||
| * | 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 | 1 | -19/+46 |
| | |\ \ | | | | | | | | | | | | | into nonce-tracker | ||||
| | | * \ | Merge branch 'master' into nonce-tracker | kumavis | 2017-07-08 | 1 | -19/+46 |
| | | |\ \ | |||||
| | * | | | | 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 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | * | | | | 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 #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 | 1 | -1/+1 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | | 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 branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2017-06-20 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | | | | 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 |
| | | | | |||||
| | * | | Merge branch 'master' into AddTokenList | Dan Finlay | 2017-06-13 | 1 | -0/+1 |
| | | | | |||||
| * | | | 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 |
| |/ | |||||
| * | 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 | 1 | -3/+1 |
| | | | |||||
| * | | Wrap the provider in a proxy | frankiebee | 2017-05-23 | 1 | -20/+7 |
| | | | |||||
| * | | Merge branch 'master' into networkController | frankiebee | 2017-05-23 | 1 | -5/+19 |
| |/ | |||||
| * | 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 |
 |
index : tangerine-wallet-browser | |
| Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser) | LAN-TW |
| aboutsummaryrefslogtreecommitdiffstats |