Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Improve styling in Confirmation Screen; Show decoded send token data | Chi Kei Chan | 2017-09-13 | 1 | -1/+0 |
| | |||||
* | Added signTokenTx; Adding token confirmation screen | Chi Kei Chan | 2017-09-12 | 1 | -0/+3 |
| | |||||
* | Merge remote-tracking branch 'mm/master' into NewUI-flat | sdtsui | 2017-08-14 | 3 | -4/+20 |
|\ | |||||
| * | 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 |
| |/ | |||||
* | | Merge branch 'master' into NewUI-flat | kumavis | 2017-08-09 | 5 | -189/+253 |
|\| | |||||
| * | 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 | ||||
| * | | | | 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 |
| | | | | | |||||
* | | | | | Merge branch 'master' into feat/mm-ui-5 | sdtsui | 2017-08-07 | 12 | -360/+307 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | 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 |
| | |/ / | |/| | | |||||
* | | | | Adjust sidebar transition using @cjeria\'s feedback | sdtsui | 2017-08-03 | 1 | -0/+10 |
| | | | | |||||
* | | | | Ensure app-header is rendered in responsive layout | sdtsui | 2017-08-03 | 1 | -1/+1 |
|/ / / | |||||
* | | | 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 |
|/ | |||||
* | 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 |
| | | | | | | |||||
| * | | | | | Use filter subprovider in-page to avoid filter leaks | Dan Finlay | 2017-05-23 | 1 | -2/+6 |
| | | | | | | |||||
| * | | | | | Use stream-provider v3 api | Dan Finlay | 2017-05-23 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Add new streaming subprovider but getting a loop | Dan Finlay | 2017-05-21 | 1 | -5/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regarding #1458 Uses a new streaming subprovider architecture on an experimental branch of StreamProvider: https://github.com/flyswatter/web3-stream-provider/tree/StreamSubprovider | ||||
* | | | | | | include ethQuery in txController | frankiebee | 2017-05-24 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Fix for tests | frankiebee | 2017-05-24 | 5 | -55/+68 |
| | | | | | | |||||
* | | | | | | Wrap the provider in a proxy | frankiebee | 2017-05-23 | 5 | -126/+64 |
| | | | | | | |||||
* | | | | | | Add a migration for the network controller | frankiebee | 2017-05-23 | 2 | -0/+35 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into networkController | frankiebee | 2017-05-23 | 9 | -68/+122 |
|\| | | | | | |||||
| * | | | | | Fix path references | Dan Finlay | 2017-05-17 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Rename tx manager to tx controller | Dan Finlay | 2017-05-17 | 3 | -18/+18 |
| | | | | | | |||||
| * | | | | | migration 13 - change provider from testnet to ropsten | kumavis | 2017-05-16 | 2 | -0/+35 |
| | | | | | | |||||
| * | | | | | Remove all traces of testnet | Thomas Huang | 2017-05-16 | 3 | -18/+10 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into i1419-rinkebydefaultnetwork | Thomas Huang | 2017-05-16 | 1 | -22/+16 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge pull request #1422 from MetaMask/drop-asyncq | Dan Finlay | 2017-05-16 | 1 | -22/+16 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | background - drop async-q in favor of async/await | ||||
| | | * | | | | | background - drop async-q in favor of async/await | kumavis | 2017-05-13 | 1 | -22/+16 |
| | | | | | | | | |||||
| * | | | | | | | Change default network to rinkeby | Thomas Huang | 2017-05-16 | 2 | -8/+8 |
| |/ / / / / / | |||||
| * | | | | | | migrator - fix typo | kumavis | 2017-05-13 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | migrator - cleaner migration runner with es7 | kumavis | 2017-05-12 | 1 | -25/+13 |
| | | | | | | | |||||
| * | | | | | | use asyncQ.waterfall instead of asyncQ.eachSeries | frankiebee | 2017-05-12 | 1 | -4/+10 |
| | | | | | | | |||||
| * | | | | | | fix migrator | frankiebee | 2017-05-11 | 1 | -9/+8 |
| |/ / / / / | |||||
* / / / / / | Create a network controller to manage switcing networks an updating the provider | frankiebee | 2017-05-19 | 6 | -150/+232 |
|/ / / / / | |||||
* | | | | | ui - remove web3, use eth-query | kumavis | 2017-05-09 | 1 | -2/+3 |
| | | | | | |||||
* | | | | | metamask - publicConfig - fix init state | kumavis | 2017-05-05 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | metamask - selected accounts - dont reveal when locked | kumavis | 2017-05-05 | 1 | -15/+17 |
| | | | | | |||||
* | | | | | Minor lint | Kevin Serrano | 2017-05-03 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Use loglevel for more logs | Dan Finlay | 2017-05-01 | 1 | -9/+3 |
| | | | | | |||||
* | | | | | notification-manager - remove promise listener | kumavis | 2017-04-29 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seems chrome changed their API? MDN suggests that a Promise should be returned but getting `undefined` https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/windows/create Chrome docs suggest its a callback API lolwut https://developer.chrome.com/extensions/windows#method-create | ||||
* | | | | | Merge branch 'master' into rinkeby | Dan Finlay | 2017-04-28 | 32 | -118/+111 |
|\ \ \ \ \ | |||||
| * | | | | | Fix linting warnings | Thomas Huang | 2017-04-27 | 32 | -119/+112 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Add missing changes. Create unique style for rinkeby icon. | Kevin Serrano | 2017-04-26 | 2 | -2/+6 |
| | | | | | |||||
* | | | | | add rinkeby network | Nickyg | 2017-04-26 | 2 | -0/+7 |
|/ / / / | |||||
* | | | | auto-faucet - only skip faucet on explicit test environment | kumavis | 2017-04-05 | 1 | -1/+1 |
| | | | | |||||
* | | | | add platforms to mascara + move buyEther window open to ui | kumavis | 2017-04-05 | 5 | -20/+72 |
| | | | | |||||
* | | | | Merge pull request #1307 from MetaMask/mascara | kumavis | 2017-04-05 | 1 | -1/+0 |
|\ \ \ \ | | | | | | | | | | | Proof of Concept: Mascara | ||||
| * | | | | clean - metamask controller - remove log | kumavis | 2017-04-05 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Merge branch 'master' into mascara | frankiebee | 2017-04-03 | 10 | -193/+160 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into mascara | frankiebee | 2017-04-03 | 5 | -9/+28 |
| |\ \ \ \ \ | |||||
| * | | | | | | Clean up | frankiebee | 2017-03-31 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | WIP: lost enital call from dapp to getAccounts | frankiebee | 2017-03-30 | 2 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into mascara | frankiebee | 2017-03-29 | 7 | -58/+125 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into mascara | frankiebee | 2017-03-24 | 13 | -569/+127 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | WIP: indexdb is at an err state "provider is undefined" | frankiebee | 2017-03-24 | 1 | -1/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | WIP: streams->indexdb | frankiebee | 2017-03-24 | 2 | -1/+1 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1308 from MetaMask/FixFaucet | Kevin Serrano | 2017-04-05 | 2 | -0/+3 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix faucet to only autoFaucet first account | ||||
| * | | | | | | | | Fix faucet to only autoFaucet first account | frankiebee | 2017-04-05 | 2 | -0/+3 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* / | | | | | | | Switch auto-faucet from XMLHttpRequest to fetch | frankiebee | 2017-04-04 | 1 | -5/+11 |
|/ / / / / / / | |||||
* | | | | | | | notification-manager - rename show -> showPoup + make getPopup private | kumavis | 2017-04-01 | 2 | -11/+11 |
| | | | | | | | |||||
* | | | | | | | ui - use global.platform for extension interaction | kumavis | 2017-04-01 | 2 | -0/+8 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into platform | kumavis | 2017-04-01 | 1 | -4/+16 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | tx-manager - add eip155 support | kumavis | 2017-03-31 | 1 | -4/+16 |
| | | | | | | | |||||
* | | | | | | | ui - move popup auto-close after tx conf to ui entrypoint | kumavis | 2017-04-01 | 1 | -1/+5 |
| | | | | | | | |||||
* | | | | | | | ui - startPopup returns store after boot | kumavis | 2017-04-01 | 2 | -29/+32 |
| | | | | | | | |||||
* | | | | | | | extension - remove local extension files, we use extensionizer | kumavis | 2017-03-31 | 2 | -85/+0 |
| | | | | | | | |||||
* | | | | | | | introduce platform api and rename notifications to notification-manager | kumavis | 2017-03-31 | 6 | -79/+116 |
| | | | | | | | |||||
* | | | | | | | extension - prefer extensionizer module | kumavis | 2017-03-31 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1293 from MetaMask/ImproveGasEstimates | Kevin Serrano | 2017-03-30 | 1 | -3/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | tx-utils - gas buffer ceiling at 90% of block gas limit | ||||
| * | | | | | | tx-utils - gas buffer ceiling at 90% of block gas limit | kumavis | 2017-03-30 | 1 | -3/+4 |
| | | | | | | | |||||
* | | | | | | | Linted | Dan Finlay | 2017-03-30 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Fix popup behavior for Firefox | Dan Finlay | 2017-03-30 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firefox does not support the `focused` parameter when opening a new window, and we don't actually require it for Chrome either, new popups are at the foreground by default already. | ||||
* | | | | | | | Add missing migration. | Kevin Serrano | 2017-03-29 | 1 | -0/+1 |
| |_|_|/ / / |/| | | | | |