Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Define encryptor in constructor params instead of platform object | Dan Finlay | 2017-09-23 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into ConfigurableEncryption | Dan Finlay | 2017-09-22 | 1 | -1/+1 |
|\ | |||||
* | | Allow custom encryptor to be passed to MetaMaskController and ↵ | Dan Finlay | 2017-09-22 | 2 | -2/+3 |
|/ | | | | KeyringControllers. | ||||
* | Do not mark a retry tx failed that has been broadcast successfully | Dan Finlay | 2017-09-19 | 1 | -3/+9 |
| | | | | | | | | | | | | Fixes #2115 If a tx has been braodcast, the only failures we should accept are: - Never mined - On chain failure We had a section of code that would mark a tx failed during any unknown error during a retry. Now no retry > 1 will ever mark a tx failed, since it has been broadcast, and may be mined. | ||||
* | createOriginMiddleware - fix var name | kumavis | 2017-09-14 | 1 | -1/+1 |
| | |||||
* | metamask controller - destroy filter polyfill on disconnect | kumavis | 2017-09-14 | 1 | -4/+10 |
| | |||||
* | metamask controller - move middleware into seperate files | kumavis | 2017-09-14 | 4 | -34/+44 |
| | |||||
* | debug - prefer logger over console | kumavis | 2017-09-14 | 2 | -9/+9 |
| | |||||
* | metamask cont - standardize multiplex stream naming | kumavis | 2017-09-14 | 1 | -8/+8 |
| | |||||
* | contentscript - fix obj-multiplex instantiation and use pump for streams | kumavis | 2017-09-12 | 1 | -12/+33 |
| | |||||
* | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2017-09-12 | 1 | -8/+12 |
|\ | | | | | | | filter-leak-fix | ||||
| * | Merge pull request #2057 from MetaMask/Version-3.9.13 | kumavis | 2017-09-09 | 1 | -25/+27 |
| |\ | | | | | | | Version 3.9.13 | ||||
| | * | inpage provider - define sendAsync on the prototype | kumavis | 2017-09-09 | 1 | -25/+27 |
| | | | |||||
* | | | inpage - use obj-multiplex module | kumavis | 2017-09-08 | 1 | -6/+6 |
| | | | |||||
* | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2017-09-08 | 3 | -25/+46 |
|\| | | | | | | | | | | | filter-leak-fix | ||||
| * | | Merge branch 'master' into readd-loose | Kevin Serrano | 2017-09-07 | 1 | -2/+3 |
| |\| | |||||
| | * | inpage - bug fix | kumavis | 2017-09-06 | 1 | -2/+3 |
| | | | | | | | | | prevents mutation of original message object which causes problems with web3 1.0 | ||||
| * | | Properly update keyring state on new account addition. | Kevin Serrano | 2017-09-07 | 1 | -1/+2 |
| |/ | |||||
| * | Make web3 deprecation notice more useful | Dan Finlay | 2017-09-06 | 1 | -1/+1 |
| | | | | | | | | Linking to a descriptive & precriptive article on a path forward. | ||||
| * | Merge branch 'master' into inpage-provider-fixes | kumavis | 2017-08-29 | 5 | -33/+139 |
| |\ | |||||
| * | | inpage - lint fix | kumavis | 2017-08-29 | 1 | -1/+1 |
| | | | |||||
| * | | inpage provider - autoreload - improve readability | kumavis | 2017-08-24 | 1 | -15/+32 |
| | | | |||||
| * | | inpage provider - only warn web3 usage once per session | kumavis | 2017-08-24 | 1 | -6/+11 |
| | | | |||||
| * | | inpage provider - sync rpc - default to null values | kumavis | 2017-08-24 | 1 | -3/+3 |
| | | | |||||
* | | | lint - remove dead code | kumavis | 2017-09-08 | 1 | -1/+0 |
| | | | |||||
* | | | metamask - add jsonrpc filter middleware on per-connection engine | kumavis | 2017-09-08 | 1 | -2/+8 |
| | | | |||||
* | | | inpage - distinguish pump vs pipe | kumavis | 2017-09-08 | 1 | -4/+4 |
| | | | |||||
* | | | streams - use pump and published obj-multiplex | kumavis | 2017-09-08 | 4 | -80/+41 |
| | | | |||||
* | | | inpage - add idRemapMiddleware | kumavis | 2017-09-08 | 1 | -1/+3 |
| | | | |||||
* | | | inpage - use json-rpc-engine for inpage-provider | kumavis | 2017-08-25 | 2 | -46/+42 |
| |/ |/| | |||||
* | | Merge pull request #1973 from MetaMask/hotfix-migration019 | kumavis | 2017-08-24 | 3 | -1/+85 |
|\ \ | | | | | | | hotfix - fail submitted txs whos nonce is out of bound | ||||
| * | | fall back to `latest` if blockNumber is null | frankiebee | 2017-08-24 | 1 | -1/+1 |
| | | | |||||
| * | | Make method return a number | Dan Finlay | 2017-08-24 | 1 | -1/+1 |
| | | | |||||
| * | | Only cancel pending txs with non continuously high nonces | Dan Finlay | 2017-08-24 | 1 | -1/+24 |
| | | | |||||
| * | | fix description | frankiebee | 2017-08-24 | 1 | -2/+2 |
| | | | |||||
| * | | hotfix - fail submitted txs whos nonce is out of bound | frankiebee | 2017-08-24 | 2 | -0/+61 |
| | | | |||||
* | | | Fail transactions after a day of retries | Dan Finlay | 2017-08-24 | 2 | -2/+12 |
|/ / | |||||
* | | Enforce nonces as type string | Dan Finlay | 2017-08-24 | 1 | -2/+10 |
| | | |||||
* | | Use toNumber method | Dan Finlay | 2017-08-24 | 1 | -2/+1 |
| | | |||||
* | | Fix network nonce parsing | Dan Finlay | 2017-08-24 | 1 | -4/+11 |
| | | |||||
* | | Pass nonce tests | Dan Finlay | 2017-08-24 | 1 | -8/+7 |
| | | |||||
* | | Got all tests but one passing | Dan Finlay | 2017-08-24 | 1 | -0/+1 |
| | | |||||
* | | Fix new test, break an older maybe wrong one | Dan Finlay | 2017-08-24 | 1 | -26/+24 |
| | | |||||
* | | Linted | Dan Finlay | 2017-08-24 | 1 | -1/+0 |
| | | |||||
* | | Simplify nonce calculation | Dan Finlay | 2017-08-24 | 1 | -4/+5 |
|/ | |||||
* | Merge branch 'master' into useLocalNonce | Dan Finlay | 2017-08-24 | 4 | -16/+109 |
|\ | |||||
| * | migration 18 - activate | kumavis | 2017-08-15 | 1 | -0/+1 |
| | | |||||
| * | migration 18 - fix an oops | kumavis | 2017-08-15 | 1 | -1/+1 |
| | | |||||
| * | tx controller - tx state history various small fixes | kumavis | 2017-08-15 | 3 | -3/+2 |
| | | |||||
| * | migration 18 - move to diff-based history | kumavis | 2017-08-15 | 1 | -0/+52 |
| | | |||||
| * | introduce tx-state-history-helper and diff-based history | kumavis | 2017-08-15 | 2 | -15/+56 |
| | | |||||
* | | nonce-tracker - more debugging numbers for nonceDetails | kumavis | 2017-08-23 | 1 | -10/+8 |
| | | |||||
* | | remove unused code | kumavis | 2017-08-23 | 1 | -15/+0 |
| | | |||||
* | | nonce-tracker - use ethjs-query | kumavis | 2017-08-23 | 1 | -11/+2 |
| | | |||||
* | | nonce-tracker - fix var name | kumavis | 2017-08-23 | 1 | -4/+4 |
| | | |||||
* | | nonce-tracker - getlocalNextNonce - add entry to nonceDetails | kumavis | 2017-08-23 | 1 | -1/+1 |
| | | |||||
* | | nonce-tracker - simplify _getlocalNextNonce | kumavis | 2017-08-23 | 1 | -20/+29 |
| | | |||||
* | | nonce-tracker - simplify getHighestNonce | kumavis | 2017-08-23 | 1 | -5/+3 |
| | | |||||
* | | nonce-tracker - getHighestNonce doesnt need uniqued input | kumavis | 2017-08-23 | 1 | -4/+4 |
| | | |||||
* | | nonce-tracker - make nonce strategy api and naming more symmetical | kumavis | 2017-08-23 | 1 | -19/+21 |
| | | |||||
* | | nonce-tracker - pass tests | frankiebee | 2017-08-22 | 1 | -5/+4 |
| | | |||||
* | | clean up code | frankiebee | 2017-08-22 | 1 | -39/+43 |
| | | |||||
* | | nonce-tracker - pass tests | frankiebee | 2017-08-22 | 1 | -11/+38 |
| | | |||||
* | | break out network nonce calc. | frankiebee | 2017-08-19 | 1 | -17/+21 |
| | | |||||
* | | fix 0x0 nonce calc. | frankiebee | 2017-08-19 | 1 | -8/+18 |
| | | |||||
* | | include pendingTxs in localNonce | frankiebee | 2017-08-19 | 1 | -10/+9 |
| | | |||||
* | | use "localNonce" when the network returns a nonce that is lower then a known ↵ | frankiebee | 2017-08-19 | 2 | -3/+27 |
|/ | | | | confirmed tx | ||||
* | fix wording | frankiebee | 2017-08-12 | 1 | -1/+1 |
| | |||||
* | add deprecation warning for web3 | frankiebee | 2017-08-12 | 1 | -1/+4 |
| | |||||
* | Merge pull request #1883 from MetaMask/estimateGas-fix | Thomas Huang | 2017-08-10 | 1 | -3/+11 |
|\ | | | | | tx utils - detect estimateGas err and set simulationFailed | ||||
| * | tx utils - detect estimateGas err and set simulationFailed | kumavis | 2017-08-09 | 1 | -3/+11 |
| | | |||||
* | | ui - buy eth - formatting and moved network names to config | kumavis | 2017-08-10 | 1 | -0/+5 |
|/ | |||||
* | tx controller - fix error serialization | kumavis | 2017-08-09 | 1 | -2/+5 |
| | |||||
* | tx controller - fix getBalance fn | kumavis | 2017-08-09 | 1 | -1/+1 |
| | |||||
* | util - sufficientBalance - validate input | kumavis | 2017-08-09 | 1 | -1/+6 |
| | |||||
* | Merge pull request #1880 from MetaMask/pendingFix | Frankie | 2017-08-09 | 2 | -3/+4 |
|\ | | | | | fix getPendingTransactions function for pendingTxTracker | ||||
| * | filter by network for pending txs | frankiebee | 2017-08-09 | 1 | -0/+2 |
| | | |||||
| * | fix getPendingTransactions function for pendingTxTracker | frankiebee | 2017-08-09 | 2 | -3/+2 |
| | | |||||
* | | Merge branch 'master' into greenkeeper/initial | kumavis | 2017-08-09 | 4 | -186/+241 |
|\| | |||||
| * | fix class names | frankiebee | 2017-08-09 | 3 | -18/+25 |
| | | |||||
| * | 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 |
| |\ | |||||
| * | | remove logging of the message and log the error | frankiebee | 2017-08-08 | 1 | -1/+1 |
| | | | |||||
| * | | remove unnecessary if statment for error message | frankiebee | 2017-08-08 | 1 | -1/+0 |
| | | | |||||
| * | | fix spelling | frankiebee | 2017-08-08 | 2 | -15/+12 |
| | | | |||||
| * | | rename PendingTransactionUtils -> PendingTransactionWatchers | frankiebee | 2017-08-05 | 1 | -8/+8 |
| | | | |||||
| * | | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-05 | 11 | -115/+117 |
| |\ \ | |||||
| * | | | break out tx status pendding watchers | frankiebee | 2017-08-05 | 2 | -145/+192 |
| | | | | |||||
| * | | | move util functions to util.js | frankiebee | 2017-08-05 | 2 | -32/+40 |
| | | | | |||||
| * | | | use error for #approveTransaction when setting failed | frankiebee | 2017-08-03 | 1 | -5/+2 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2017-08-08 | 2 | -3/+5 |
|\ \ \ \ | | |_|/ | |/| | | | | | | greenkeeper/initial | ||||
| * | | | blacklist - update phishing on boot and speed up polling to 4 min | kumavis | 2017-08-05 | 1 | -2/+3 |
| | |/ | |/| | |||||
| * | | Merge pull request #1857 from MetaMask/hotFixCancleTx | kumavis | 2017-08-04 | 1 | -1/+2 |
| |\ \ | | | | | | | | | fix cancelTransaction not receiving a callback | ||||
| | * | | fix cancelTransaction not reciving a callback | frankiebee | 2017-08-04 | 1 | -1/+2 |
| | | | | |||||
| * | | | 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 | 2 | -33/+18 |
| |/ / | |||||
| * | | Merge pull request #1848 from MetaMask/transactionControllerRefractor | kumavis | 2017-08-03 | 4 | -247/+191 |
| |\| | | | | | | | Transaction controller refractor part 1: promises for everyone and more tests! | ||||
| | * | use async with #publishTransaction | frankiebee | 2017-08-03 | 1 | -2/+2 |
| | | | |||||
| | * | move newUnapprovedTransaction to transactions.js | frankiebee | 2017-08-03 | 4 | -51/+49 |
| | | | |||||
| | * | lint fixes | frankiebee | 2017-08-02 | 3 | -11/+4 |
| | | | |||||
| | * | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-02 | 7 | -18/+119 |
| | |\ | |||||
| | * | | fix spelling mistake | frankiebee | 2017-08-02 | 1 | -1/+1 |
| | | | | |||||
| | * | | fix addTxDefaults | frankiebee | 2017-08-02 | 2 | -2/+3 |
| | | | | |||||
| | * | | make addUnapprovedTransaction async function and use promise based ethQuery | frankiebee | 2017-08-02 | 3 | -218/+168 |
| | | | | |||||
| * | | | blacklist controller - breakout from metamask and infura controllers | kumavis | 2017-08-03 | 4 | -47/+67 |
| | | | | |||||
| * | | | phishing detection - move phishing detection into contentscript and metamask ↵ | kumavis | 2017-08-03 | 6 | -55/+50 |
| | | | | | | | | | | | | | | | | controller | ||||
| * | | | obj-multiplex - missing name error + prefer const over var | kumavis | 2017-08-03 | 1 | -6/+10 |
| | |/ | |/| | |||||
| * | | Merge branch 'master' into i1805-LiveBlacklistUpdating | Dan Finlay | 2017-07-27 | 2 | -2/+41 |
| |\ \ | |||||
| | * | | Give credit where it is due | Kevin Serrano | 2017-07-27 | 1 | -0/+4 |
| | | | | |||||
| | * | | Add levenshtein logic to blacklister. | Kevin Serrano | 2017-07-27 | 1 | -8/+32 |
| | | | | |||||
| * | | | Live update blacklist from Infura | Dan Finlay | 2017-07-27 | 3 | -11/+8 |
| | | | | |||||
| * | | | Merge branch 'master' into i1805-LiveBlacklistUpdating | Dan Finlay | 2017-07-27 | 2 | -6/+12 |
| |\| | | |||||
| | * | | nonce-tracker - hotfix for provider proxying | kumavis | 2017-07-27 | 2 | -5/+11 |
| | | | | |||||
| | * | | nonce-tracker - add raw baseNonceHex to nonceDetails | kumavis | 2017-07-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | Begin implementing live-updating blacklist, not working yet | Dan Finlay | 2017-07-27 | 3 | -8/+52 |
| |/ / | |||||
| * | | 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 | ||||
| | * | Merge branch 'betterErrorsOnTx' of ↵ | frankiebee | 2017-07-26 | 2 | -7/+8 |
| | |\ | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into betterErrorsOnTx | ||||
| | * | | fix typo | frankiebee | 2017-07-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | tx controller + nonce tracker - record nonce components on txMeta | kumavis | 2017-07-27 | 2 | -2/+9 |
| | | | | |||||
| * | | | nonce-tracker - validation - add validation failing value type to error message | kumavis | 2017-07-27 | 1 | -3/+3 |
| | | | | |||||
| * | | | nonce-tracker - validation - add validation failing value to error message | kumavis | 2017-07-27 | 1 | -3/+3 |
| | |/ | |/| | |||||
| * | | 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 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 | 2 | -8/+30 |
| |/ | |||||
* | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2017-08-04 | 14 | -283/+350 |
| | | | | | | | | greenkeeper/initial | ||||
* | | lint fixes | kumavis | 2017-08-04 | 1 | -1/+1 |
|/ | |||||
* | transactions - block nonce-tracker while updating pending transactions | kumavis | 2017-07-19 | 2 | -14/+32 |
| | |||||
* | nonce-tracker - fix lock mechanism to be a real mutex | kumavis | 2017-07-19 | 1 | -11/+15 |
| | |||||
* | transaction - promisify _checkPendingTxs | kumavis | 2017-07-19 | 1 | -27/+41 |
| | |||||
* | nonce-tracker - return nonce as integer | kumavis | 2017-07-19 | 1 | -1/+1 |
| | |||||
* | nonce-tracker - validate nonce calc components | kumavis | 2017-07-19 | 1 | -3/+9 |
| | |||||
* | turn off auto faucet and remove file | frankiebee | 2017-07-18 | 2 | -24/+0 |
| | |||||
* | Infura Network response tests | tmashuang | 2017-07-15 | 1 | -0/+1 |
| | |||||
* | Merge pull request #1617 from MetaMask/nonce-tracker | Frankie | 2017-07-14 | 5 | -96/+149 |
|\ | | | | | transaction controller - use nonce-tracker | ||||
| * | make publishTransaction and signTransaction async methods | frankiebee | 2017-07-14 | 2 | -21/+19 |
| | | |||||
| * | Merge branch 'master' into nonce-tracker | frankiebee | 2017-07-13 | 1 | -1/+1 |
| |\ | |||||
| * | | Fix test to match behavior | frankiebee | 2017-07-13 | 1 | -1/+1 |
| | | | |||||
| * | | mv updateAndApproveTx to txController | frankiebee | 2017-07-13 | 1 | -3/+7 |
| | | | |||||
| * | | use new nodeify | frankiebee | 2017-07-13 | 2 | -44/+21 |
| | | | |||||
| * | | Use txParams | frankiebee | 2017-07-12 | 1 | -4/+4 |
| | | | |||||
| * | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-07-12 | 4 | -20/+67 |
| |\ \ | |||||
| * \ \ | Merge branch 'nonce-tracker' of https://github.com/MetaMask/metamask-plugin ↵ | frankiebee | 2017-07-12 | 5 | -25/+120 |
| |\ \ \ | | | | | | | | | | | | | | | | into nonce-tracker | ||||
| | * \ \ | Merge branch 'master' into nonce-tracker | kumavis | 2017-07-08 | 5 | -25/+120 |
| | |\ \ \ | |||||
| * | | | | | remove irrelevan code | frankiebee | 2017-07-12 | 1 | -1/+0 |
| |/ / / / | |||||
| * | | | | clean up unused code from old noncelock | frankiebee | 2017-07-06 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | fix nonce calculation order | frankiebee | 2017-07-06 | 1 | -6/+7 |
| | | | | | |||||
| * | | | | nonce-tracker: only check transactions that are not supposed to be ignored | frankiebee | 2017-06-28 | 2 | -7/+15 |
| | | | | | |||||
| * | | | | 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 | 5 | -2/+67 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into nonce-tracker | frankiebee | 2017-06-22 | 1 | -1/+3 |
| |\ \ \ \ \ | |||||
| * | | | | | | fix nonceTracker | frankiebee | 2017-06-22 | 2 | -46/+19 |
| | | | | | | | |||||
| * | | | | | | add a test for #getNonceLock | frankiebee | 2017-06-22 | 1 | -6/+16 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-06-17 | 2 | -36/+74 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | transaction controller - use nonce-tracker | kumavis | 2017-06-15 | 2 | -33/+59 |
| | | | | | | | | |||||
| * | | | | | | | introduce nonce-tracker | kumavis | 2017-06-15 | 1 | -0/+49 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1771 from MetaMask/addNonceErrToErrLIst | kumavis | 2017-07-13 | 3 | -0/+42 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add nonce err to err list | ||||
| * | | | | | | | | limit the range for retryCount | frankiebee | 2017-07-13 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | write a migration for resubmit tx's to get put back into a submitted state | frankiebee | 2017-07-13 | 2 | -0/+41 |
| | | | | | | | | | |||||
| * | | | | | | | | add "nonce too low" to the ignored errs list for tx retrys | frankiebee | 2017-07-13 | 1 | -0/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* / | | | | | | | Add first version of phishing site warning | Dan Finlay | 2017-07-13 | 1 | -0/+13 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Links to my own blacklist for now, since I added a package.json for easy importing. We can point at the main 408H repository once this is merged: https://github.com/409H/EtherAddressLookup/pull/24 Redirects detected phishing sites [here](https://metamask.io/phishing.html). | ||||
* | | | | | / | metamask - on rpc err show whole error body | kumavis | 2017-07-12 | 1 | -1/+1 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge pull request #1762 from MetaMask/ImproveRetryLogic | kumavis | 2017-07-12 | 2 | -12/+10 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Improve retry logic | ||||
| * | | | | | | Improve insufficient balance checking in retry loop | Dan Finlay | 2017-07-12 | 2 | -4/+10 |
| | | | | | | | |||||
| * | | | | | | 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 | ||||
* | | | | | | migration 16 - move resubmit warning back to submitted state | kumavis | 2017-07-08 | 2 | -0/+42 |
| | | | | | | |||||
* | | | | | | 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 |
| | | | | | |||||
* | | | | | metamask - append dapp origin domain to rpc request | kumavis | 2017-07-05 | 1 | -2/+9 |
| | | | | | |||||
* | | | | | Merge pull request #1620 from MetaMask/i1616-AddTokenAdding | Thomas Huang | 2017-06-29 | 2 | -4/+26 |
|\ \ \ \ \ | | | | | | | | | | | | | Add ability to add tokens to token list | ||||
| * \ \ \ \ | Merge branch 'master' into i1616-AddTokenAdding | Dan Finlay | 2017-06-23 | 1 | -1/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'AddTokenList' into i1616-AddTokenAdding | Dan Finlay | 2017-06-20 | 2 | -36/+74 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Add ability to add tokens to token list | Dan Finlay | 2017-06-16 | 2 | -4/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 6 | -4/+70 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Keeps dapp gas price if set | Thomas Huang | 2017-06-20 | 1 | -7/+9 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1685 from MetaMask/setFailed | Dan Finlay | 2017-06-28 | 2 | -0/+39 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Migration #015 set txs Failed | ||||
| * | | | | | | | | Create a migration for setting tx's with the message 'Gave up submitting ↵ | frankiebee | 2017-06-28 | 2 | -0/+39 |
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | tx.' as failed | ||||
* / | | | | | | | dont stop retrying brodcasting txs | frankiebee | 2017-06-28 | 1 | -4/+0 |
|/ / / / / / / | |||||
* | | | | | | | Fix error message for invalid seed words. | Kevin Serrano | 2017-06-27 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1663 from MetaMask/infura-status | Thomas Huang | 2017-06-27 | 2 | -1/+56 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | 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 | 2 | -1/+56 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #1603 from MetaMask/AddTokenList | Kevin Serrano | 2017-06-23 | 3 | -1/+10 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | Add popular token list | ||||
| * | | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2017-06-20 | 3 | -1/+10 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | 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 | 2 | -0/+9 |
| | | | | | | | | | | | | | | | | Also improve error handling with token balances. | ||||
| | * | | Merge branch 'master' into AddTokenList | Dan Finlay | 2017-06-13 | 40 | -376/+550 |
| | |\ \ | |||||
| | * | | | Add missing tx manager state | Dan Finlay | 2017-04-25 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Fix badge number to include personal_sign | Kevin Serrano | 2017-06-21 | 1 | -1/+3 |
|/ / / / | |||||
* | | | | Merge branch 'master' into i1567-FixInaccurateError | Frankie | 2017-06-17 | 1 | -3/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #1623 from MetaMask/checkTxs | Frankie | 2017-06-17 | 1 | -3/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Check txs | ||||
| | * | | | | 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-17 | 1 | -1/+5 |
|\| | | | | | |||||
| * | | | | | Debounce background updates | Dan Finlay | 2017-06-16 | 1 | -1/+5 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our background sometimes emits absurd quantities of updates very quickly. This PR reduces the amount of inter-process traffic by ensuring the `sendUpdate` method does not fire more than every 200 ms. Fixes #1621 | ||||
* | | | | | 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 | 2 | -11/+17 |
| | | | | |||||
* | | | | 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 pull request #1208 from MetaMask/i#1203MainNetSwitch | kumavis | 2017-06-13 | 1 | -2/+5 |
|\ \ | | | | | | | Change default to mainnet | ||||
| * | | default testnet - fix typo | kumavis | 2017-06-13 | 1 | -1/+0 |
| | | | |||||
| * | | Merge branch 'master' into i#1203MainNetSwitch | kumavis | 2017-06-13 | 52 | -1178/+925 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into i#1203MainNetSwitch | Frankie | 2017-03-17 | 3 | -1/+97 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into i#1203MainNetSwitch | kumavis | 2017-03-15 | 3 | -3/+3 |
| |\ \ \ \ | |||||
| * | | | | | Swithch the default network to mainnet | frankiebee | 2017-03-14 | 1 | -3/+6 |
| | | | | | | |||||
* | | | | | | Linting | Thomas Huang | 2017-06-13 | 2 | -3/+3 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch 'master' into currency-fix | Dan Finlay | 2017-06-13 | 2 | -9/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Update gasblocklimit params with every block. | Kevin Serrano | 2017-06-03 | 2 | -9/+2 |
| | | | | | | |||||
* | | | | | | Use new URL for currency API from cryptonator. | Kevin Serrano | 2017-06-06 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Convert gasLimit to not use muln in BN | Kevin Serrano | 2017-06-02 | 1 | -2/+8 |
| | | | | | |||||
* | | | | | Merge pull request #1500 from MetaMask/RemoveStreamingSubprovider | Thomas Huang | 2017-05-26 | 1 | -17/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove streaming subprovider | ||||
| * | | | | | Remove stream subprovider | Dan Finlay | 2017-05-26 | 1 | -17/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Since the polling leak seems to be coming from elsewhere, and new bugs came from this, I'm rolling back this change so that we can push the other improvements sooner and fix the bug at its true root. | ||||
* | | | | | | fix spelling | frankiebee | 2017-05-25 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into reloadDapp | frankiebee | 2017-05-25 | 2 | -2/+14 |
|\| | | | | | |||||
| * | | | | | Merge pull request #1494 from MetaMask/1472-gasceiling | Dan Finlay | 2017-05-25 | 1 | -1/+12 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add Max GasLimit Ceiling | ||||
| | * | | | | | Add new blockGasLimit property to txMeta object. | Kevin Serrano | 2017-05-25 | 1 | -1/+12 |
| | | | | | | | |||||
| * | | | | | | inpage-provider - disable polling after first block | kumavis | 2017-05-25 | 1 | -1/+2 |
| |/ / / / / | |||||
* / / / / / | Reload the page when switching networks for sites that use web3 | frankiebee | 2017-05-25 | 3 | -41/+28 |
|/ / / / / | |||||
* | | | | | stop polling when switching networks | frankiebee | 2017-05-24 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' into networkController | Frankie | 2017-05-24 | 2 | -9/+72 |
|\ \ \ \ \ | |||||
| * | | | | | Cleanup | Dan Finlay | 2017-05-24 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | Continually resubmit pending txs | Dan Finlay | 2017-05-24 | 1 | -2/+52 |
| | | | | | | |||||
| * | | | | | clean - remove console logs | kumavis | 2017-05-23 | 1 | -2/+0 |
| | | | | | | |||||
| * | | | | | deps - use stream-subprovider from provider-engine | kumavis | 2017-05-23 | 2 | -3/+3 |
| | | | | | | |||||
| * | | | | | Rename stream to streamSubprovider | Dan Finlay | 2017-05-23 | 1 | -4/+4 |
| | | | | | |