Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into AddBalanceController | Dan Finlay | 2017-09-26 | 2 | -0/+2 |
|\ | |||||
| * | 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. | ||||
* | | Made some requested changes | Dan Finlay | 2017-09-26 | 1 | -7/+7 |
| | | |||||
* | | Fix accont-tracker merge bug | Dan Finlay | 2017-09-23 | 1 | -0/+4 |
| | | |||||
* | | Fix account-tracker references | Dan Finlay | 2017-09-23 | 3 | -13/+13 |
| | | |||||
* | | Merge branch 'master' into AddBalanceController | Dan Finlay | 2017-09-23 | 12 | -172/+178 |
|\| | |||||
| * | v3.10.2 | kumavis | 2017-09-19 | 1 | -1/+1 |
| | | | | | | published `v3.10.2` as an emergency rollback to `v3.10.0` | ||||
| * | 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. | ||||
| * | Version 3.10.1v3.10.1 | Dan Finlay | 2017-09-19 | 1 | -1/+1 |
| | | |||||
| * | 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 |
| | | |||||
| * | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2017-09-13 | 1 | -1/+1 |
| |\ | | | | | | | | | | filter-leak-fix3 | ||||
| * | | 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 | 2 | -12/+15 |
| |\ \ | | | | | | | | | | | | | filter-leak-fix | ||||
| * | | | 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 | 4 | -26/+47 |
| |\ \ \ | | | | | | | | | | | | | | | | filter-leak-fix | ||||
| * | | | | 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 |
| | | | | | |||||
* | | | | | Fix computed-balances controller reference | Dan Finlay | 2017-09-23 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Refactor eth-store into account-tracker | Dan Finlay | 2017-09-23 | 4 | -16/+22 |
| | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | Remove dead code from eth-store | Dan Finlay | 2017-09-23 | 1 | -43/+1 |
| | | | | | |||||
* | | | | | Add computed balance to account detail view | Dan Finlay | 2017-09-14 | 4 | -7/+17 |
| | | | | | |||||
* | | | | | Got pending balance updating correctly | Dan Finlay | 2017-09-14 | 3 | -81/+69 |
| | | | | | |||||
* | | | | | Add state-labeled events to allow subscribing to any transaction's state change | Dan Finlay | 2017-09-14 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Some progress | Dan Finlay | 2017-09-13 | 3 | -1/+143 |
| | | | | | |||||
* | | | | | Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController | Dan Finlay | 2017-09-12 | 1 | -0/+51 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Linted | Dan Finlay | 2017-09-08 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Make tx calculations account for gas prices | Dan Finlay | 2017-09-08 | 1 | -2/+8 |
| | | | | | |||||
| * | | | | Remove logs | Dan Finlay | 2017-09-08 | 1 | -8/+0 |
| | | | | | |||||
| * | | | | Fix balance calc test | Dan Finlay | 2017-09-08 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Add constructor comment | Dan Finlay | 2017-09-08 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Fix valueFor test | Dan Finlay | 2017-09-08 | 1 | -7/+8 |
| | | | | | |||||
| * | | | | Add basic test for valueFor | Dan Finlay | 2017-09-08 | 1 | -4/+9 |
| | | | | | |||||
| * | | | | test not passing | Dan Finlay | 2017-09-08 | 1 | -1/+17 |
| | | | | | |||||
| * | | | | Check balances in parallel | Dan Finlay | 2017-09-07 | 1 | -1/+8 |
| | | | | | |||||
| * | | | | Add first passing balance calc test | Dan Finlay | 2017-09-07 | 1 | -0/+18 |
| | | | | | |||||
* | | | | | Version 3.10.0v3.10.0 | Dan Finlay | 2017-09-12 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #2049 from MetaMask/i1938-removecryptopermissions | Kevin Serrano | 2017-09-11 | 1 | -3/+2 |
|\ \ \ \ | | | | | | | | | | | Remove cryptonator from chrome manifest file | ||||
| * | | | | Remove cryptonator from chrome permissions. | Kevin Serrano | 2017-09-08 | 1 | -3/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #2057 from MetaMask/Version-3.9.13 | kumavis | 2017-09-09 | 2 | -26/+28 |
|\ \ \ \ | |/ / / |/| | | | Version 3.9.13 | ||||
| * | | | Version 3.9.13v3.9.13 | Dan Finlay | 2017-09-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | inpage provider - define sendAsync on the prototype | kumavis | 2017-09-09 | 1 | -25/+27 |
| |/ / | |||||
* | | | Merge branch 'master' into readd-loose | Kevin Serrano | 2017-09-07 | 2 | -3/+4 |
|\| | | |||||
| * | | Version 3.9.12v3.9.12 | Dan Finlay | 2017-09-07 | 1 | -1/+1 |
| | | | |||||
| * | | 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 | 6 | -34/+140 |
|\| | |||||
| * | Version 3.9.11v3.9.11 | Dan Finlay | 2017-08-24 | 1 | -1/+1 |
| | | |||||
| * | 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 |
| | | |||||
* | | 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 |
|/ | |||||
* | Version 3.9.10 | Dan Finlay | 2017-08-24 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into useLocalNonce | Dan Finlay | 2017-08-24 | 5 | -17/+110 |
|\ | |||||
| * | Version 3.9.9v3.9.9 | Dan Finlay | 2017-08-19 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #1914 from MetaMask/history-diff | Dan Finlay | 2017-08-19 | 4 | -16/+109 |
| |\ | | | | | | | Move Tx State History to diff-based format | ||||
| | * | 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 | ||||
* | | Version 3.9.8v3.9.8 | Dan Finlay | 2017-08-17 | 1 | -1/+1 |
| | | |||||
* | | v3.9.7 | kumavis | 2017-08-16 | 1 | -1/+1 |
|/ | |||||
* | fix wording | frankiebee | 2017-08-12 | 1 | -1/+1 |
| | |||||
* | add deprecation warning for web3 | frankiebee | 2017-08-12 | 1 | -1/+4 |
| | |||||
* | 3.9.6 | kumavis | 2017-08-10 | 1 | -1/+1 |
| | |||||
* | 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 | 4 | -5/+19 |
| |\ | |||||
| * | | 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 | 12 | -125/+118 |
| |\ \ | |||||
| * | | | 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 | 5 | -6/+21 |
|\ \ \ \ | | |_|/ | |/| | | | | | | greenkeeper/initial | ||||
| * | | | Merge branch 'master' into NewUI | kumavis | 2017-08-05 | 2 | -3/+4 |
| |\ \ \ | |||||
| | * | | | v3.9.5 | kumavis | 2017-08-05 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | blacklist - update phishing on boot and speed up polling to 4 min | kumavis | 2017-08-05 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Merge branch 'master' into NewUI | kumavis | 2017-08-04 | 1 | -1/+1 |
| |\| | | | |||||
| | * | | | v3.9.4 | kumavis | 2017-08-04 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
| * | | | Merge branch 'master' into NewUI | kumavis | 2017-08-04 | 4 | -35/+21 |
| |\| | | |||||
| | * | | 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 |
| | | | | | |||||
| | * | | | v3.9.3 | kumavis | 2017-08-04 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵ | kumavis | 2017-08-04 | 1 | -3/+0 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | blacklist-refactor2 | ||||
| | * | | | | blacklist - use module eth-phishing-detect | kumavis | 2017-08-04 | 2 | -33/+18 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUI | Kevin Serrano | 2017-08-04 | 2 | -2/+15 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Create distinct responsive 'home.html' file, hard-code popup.html size | Dan Finlay | 2017-07-29 | 2 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | Because firefox was having inconsistent sizing, made a second html file for forcing the view to a certain size. Still allows us to develop a responsive interface via the `home.html` file, which shares all the same react JS & CSS as popup.html. | ||||
| | * | | | Correct viewport param | Dan Finlay | 2017-07-28 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'master' into NewUI | Dan Finlay | 2017-07-28 | 6 | -40/+95 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into NewUI | Dan Finlay | 2017-07-28 | 6 | -34/+104 |
| | |\ \ \ \ | |||||
| | * | | | | | Disable user zoom in mobile mode | Dan Finlay | 2017-07-28 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Fix viewport width to 1 | Dan Finlay | 2017-07-28 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Adjust mobile scale for smaller devices | Dan Finlay | 2017-07-27 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Set initial scale for mobile. | Dan Finlay | 2017-07-27 | 1 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | Replace ui with responsive-ui | Dan Finlay | 2017-07-25 | 3 | -95/+0 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into NewUI | Dan Finlay | 2017-07-21 | 12 | -156/+364 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Move responsive ui into its own folder for easier merges | Dan Finlay | 2017-07-21 | 4 | -4/+4 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' into NewUI | Dan Finlay | 2017-07-06 | 2 | -3/+10 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Get duplicate UI template working | Dan Finlay | 2017-07-04 | 2 | -6/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Make folder for responsive UI | Dan Finlay | 2017-07-04 | 4 | -3/+57 |
| | | | | | | | | | |||||
| | * | | | | | | | Began creating new UI template | Dan Finlay | 2017-07-04 | 3 | -1/+46 |
| | | | | | | | | | |||||
| * | | | | | | | | remove stack from txs | frankiebee | 2017-08-04 | 1 | -3/+0 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | 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 | 8 | -21/+126 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | * | | | | | | 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 | 7 | -64/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | controller | ||||
| * | | | | | | | obj-multiplex - missing name error + prefer const over var | kumavis | 2017-08-03 | 1 | -6/+10 |
| | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Do not blacklist files | Dan Finlay | 2017-07-28 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into i1805-LiveBlacklistUpdating | Dan Finlay | 2017-07-27 | 2 | -2/+41 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Merge pull request #1837 from MetaMask/i1833-levencheck | Dan Finlay | 2017-07-27 | 1 | -8/+36 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Levenshtein Checking Logic Added To Blacklist | ||||
| | | * | | | | | 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 | 4 | -13/+15 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into i1805-LiveBlacklistUpdating | Dan Finlay | 2017-07-27 | 3 | -7/+13 |
| |\| | | | | | | |||||
| | * | | | | | | Version 3.9.2v3.9.2 | Dan Finlay | 2017-07-27 | 1 | -1/+1 |
| | |/ / / / / | |||||
| | * | | | | | 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 |
| |/ / / | |||||
| * | | | Version 3.9.1v3.9.1 | Dan Finlay | 2017-07-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2017-08-04 | 15 | -289/+351 |
| | | | | | | | | | | | | | | | | 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 | 2 | -2/+2 |
| |\ \ \ | |||||
| * | | | | 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 | 5 | -21/+68 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'nonce-tracker' of https://github.com/MetaMask/metamask-plugin ↵ | frankiebee | 2017-07-12 | 6 | -26/+121 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into nonce-tracker | ||||
| | * \ \ \ \ | Merge branch 'master' into nonce-tracker | kumavis | 2017-07-08 | 6 | -26/+121 |
| | |\ \ \ \ \ | |||||
| * | | | | | | | 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 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Redirect from malicious sites faster | Dan Finlay | 2017-07-14 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | 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 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Remove css referencev3.9.0 | Dan Finlay | 2017-07-13 | 1 | -2/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Version 3.9.0 | Dan Finlay | 2017-07-13 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' into Version-3.8.6 | Dan Finlay | 2017-07-13 | 2 | -0/+19 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add first version of phishing site warning | Dan Finlay | 2017-07-13 | 2 | -0/+19 |
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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). | ||||
* / / / / / / / / / | Version 3.8.6v3.8.6 | Dan Finlay | 2017-07-12 | 1 | -1/+1 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'master' into 3.8.5 | Dan Finlay | 2017-07-12 | 5 | -21/+68 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 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 |
| | | | | | | | | | |||||
* | | | | | | | | | 3.8.5 | kumavis | 2017-07-08 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | | / / / | Version 3.8.4v3.8.4 | Dan Finlay | 2017-07-08 | 1 | -1/+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 |
| | | | | | | |