Commit Graph

1270 Commits

Author SHA1 Message Date
frankiebee ac9e84ff40 add deprecation warning for web3 2017-08-11 15:52:03 -07:00
kumavis 2b409fb60b 3.9.6 2017-08-09 23:05:50 -07:00
Thomas Huang 1071a35f7b Merge pull request #1883 from MetaMask/estimateGas-fix
tx utils - detect estimateGas err and set simulationFailed
2017-08-09 14:03:02 -07:00
kumavis 245125eb18 ui - buy eth - formatting and moved network names to config 2017-08-09 12:25:38 -07:00
kumavis b4052cd5e6 tx utils - detect estimateGas err and set simulationFailed 2017-08-08 23:34:18 -07:00
kumavis 25f9746dab tx controller - fix error serialization 2017-08-08 21:09:28 -07:00
kumavis 5e6962342d tx controller - fix getBalance fn 2017-08-08 21:08:30 -07:00
kumavis 5418813ed1 util - sufficientBalance - validate input 2017-08-08 21:05:59 -07:00
Frankie d40bd9a726 Merge pull request #1880 from MetaMask/pendingFix
fix getPendingTransactions function for pendingTxTracker
2017-08-08 22:00:17 -04:00
frankiebee 9c9165e930 filter by network for pending txs 2017-08-08 21:54:26 -04:00
frankiebee 5bb84f6e21 fix getPendingTransactions function for pendingTxTracker 2017-08-08 21:49:48 -04:00
kumavis 922ecb9149 Merge branch 'master' into greenkeeper/initial 2017-08-08 16:23:14 -07:00
frankiebee a13643bdb5 fix class names 2017-08-08 18:30:49 -04:00
frankiebee 3a2190ec3c fix the bind on pending tx watchers 2017-08-07 16:58:38 -04:00
frankiebee f3b42f1e33 Merge branch 'master' into transactionControllerRefractor 2017-08-07 16:24:58 -04:00
frankiebee 59124eb6fd remove logging of the message and log the error 2017-08-07 14:45:43 -04:00
frankiebee a54c26382e remove unnecessary if statment for error message 2017-08-07 14:40:07 -04:00
frankiebee fb9866b4e1 fix spelling 2017-08-07 14:37:20 -04:00
kumavis 78aa957e5a Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-07 10:52:08 -07:00
kumavis a456baea8b Merge branch 'master' into NewUI 2017-08-05 00:29:10 -07:00
kumavis c82908e843 v3.9.5 2017-08-04 14:16:19 -07:00
kumavis 1be8053cca blacklist - update phishing on boot and speed up polling to 4 min 2017-08-04 13:51:48 -07:00
frankiebee 08f49ab35f rename PendingTransactionUtils -> PendingTransactionWatchers 2017-08-04 14:50:34 -04:00
frankiebee 89a4fef1e4 Merge branch 'master' into transactionControllerRefractor 2017-08-04 14:45:22 -04:00
frankiebee 087cd9fb1a break out tx status pendding watchers 2017-08-04 14:41:35 -04:00
frankiebee caee2a9e35 move util functions to util.js 2017-08-04 13:55:00 -04:00
kumavis 75b397b158 Merge branch 'master' into NewUI 2017-08-03 22:21:13 -07:00
kumavis a444326a1e v3.9.4 2017-08-03 22:06:26 -07:00
kumavis 5a9257208c Merge branch 'master' into NewUI 2017-08-03 21:02:01 -07:00
kumavis c4cb371ce8 Merge pull request #1857 from MetaMask/hotFixCancleTx
fix cancelTransaction not receiving a callback
2017-08-03 21:01:13 -07:00
frankiebee 7de58c8709 fix cancelTransaction not reciving a callback 2017-08-03 21:22:08 -04:00
kumavis 10c6aeb2f8 v3.9.3 2017-08-03 17:01:09 -07:00
kumavis da16f39626 Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial 2017-08-03 15:05:32 -07:00
kumavis da7471e095 lint fixes 2017-08-03 14:48:19 -07:00
kumavis 34b1e80088 Merge branch 'master' of github.com:MetaMask/metamask-plugin into blacklist-refactor2 2017-08-03 14:28:48 -07:00
kumavis d4877cb4e2 blacklist - use module eth-phishing-detect 2017-08-03 14:25:02 -07:00
Kevin Serrano 81982d01c0
Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUI 2017-08-03 13:10:46 -07:00
frankiebee dce593fd7b remove stack from txs 2017-08-03 15:39:55 -04:00
kumavis 8a9d0073b1 Merge pull request #1848 from MetaMask/transactionControllerRefractor
Transaction controller refractor part 1: promises for everyone and more tests!
2017-08-02 19:57:16 -07:00
frankiebee b471afcdb3 use error for #approveTransaction when setting failed 2017-08-02 19:24:34 -04:00
frankiebee 340dbe75fc use async with #publishTransaction 2017-08-02 19:09:37 -04:00
frankiebee b80c7e417b move newUnapprovedTransaction to transactions.js 2017-08-02 18:59:34 -04:00
kumavis 8c6f01b910 blacklist controller - breakout from metamask and infura controllers 2017-08-02 15:54:59 -07:00
kumavis ecaa235b5e phishing detection - move phishing detection into contentscript and metamask controller 2017-08-02 14:26:10 -07:00
kumavis aea5735b29 obj-multiplex - missing name error + prefer const over var 2017-08-02 14:25:28 -07:00
frankiebee 25bc15ba17 lint fixes 2017-08-02 11:47:13 -04:00
frankiebee 25cffd21f8 Merge branch 'master' into transactionControllerRefractor 2017-08-02 11:41:29 -04:00
frankiebee ece9200c72 fix spelling mistake 2017-08-02 11:36:07 -04:00
frankiebee 3a4726018e fix addTxDefaults 2017-08-02 11:35:35 -04:00
frankiebee 432f516ab0 make addUnapprovedTransaction async function and use promise based ethQuery 2017-08-02 10:26:25 -04:00