1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Commit Graph

1376 Commits

Author SHA1 Message Date
kumavis
247965ebbe nonce-tracker - more debugging numbers for nonceDetails 2017-08-22 15:34:30 -07:00
kumavis
0a93b65a3d remove unused code 2017-08-22 15:06:54 -07:00
kumavis
fb2c6cc8ac nonce-tracker - use ethjs-query 2017-08-22 14:33:54 -07:00
kumavis
dc3e8d60ef nonce-tracker - fix var name 2017-08-22 14:24:09 -07:00
kumavis
6d596bd9e6 nonce-tracker - getlocalNextNonce - add entry to nonceDetails 2017-08-22 14:17:00 -07:00
kumavis
a7e3dc8327 nonce-tracker - simplify _getlocalNextNonce 2017-08-22 14:15:56 -07:00
kumavis
e43da3e4aa nonce-tracker - simplify getHighestNonce 2017-08-22 14:04:31 -07:00
kumavis
b191649ef5 nonce-tracker - getHighestNonce doesnt need uniqued input 2017-08-22 13:58:26 -07:00
kumavis
98bc9b6656 nonce-tracker - make nonce strategy api and naming more symmetical 2017-08-22 13:52:15 -07:00
frankiebee
604c91f7b2 nonce-tracker - pass tests 2017-08-21 18:04:05 -07:00
frankiebee
7d34b22d78 clean up code 2017-08-21 17:04:47 -07:00
frankiebee
5c74f316a8 nonce-tracker - pass tests 2017-08-21 16:45:10 -07:00
frankiebee
fbba3a1ac8 Merge branch 'master' into transactionControllerRefractorPt3 2017-08-21 11:35:22 -07:00
frankiebee
7ea83b6bae Create TxStateManager 2017-08-21 10:29:10 -07:00
frankiebee
1ffb406480 break out network nonce calc. 2017-08-18 16:05:21 -07:00
frankiebee
37f86e874f fix 0x0 nonce calc. 2017-08-18 15:44:32 -07:00
frankiebee
f8eca95ca5 include pendingTxs in localNonce 2017-08-18 15:01:05 -07:00
frankiebee
e9712a13ec Create tests for TxStateManager 2017-08-18 14:11:18 -07:00
frankiebee
a5a32f3d57 use "localNonce" when the network returns a nonce that is lower then a known confirmed tx 2017-08-18 13:54:16 -07:00
kumavis
588b8f0d39 migration 18 - activate 2017-08-14 20:06:15 -07:00
kumavis
ac2b572c34 migration 18 - fix an oops 2017-08-14 20:05:57 -07:00
kumavis
1af797b1b3 tx controller - tx state history various small fixes 2017-08-14 19:15:36 -07:00
kumavis
accd057b1a migration 18 - move to diff-based history 2017-08-14 18:46:18 -07:00
kumavis
fdffb6fedc introduce tx-state-history-helper and diff-based history 2017-08-14 18:46:04 -07:00
frankiebee
66a012550e fix wording 2017-08-11 15:54:52 -07:00
frankiebee
ac9e84ff40 add deprecation warning for web3 2017-08-11 15:52:03 -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
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
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
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
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
Dan Finlay
6675241fa9 Merge branch 'master' into i1805-LiveBlacklistUpdating 2017-07-26 16:46:59 -07:00
Dan Finlay
8b1726cc55 Live update blacklist from Infura 2017-07-26 16:30:54 -07:00
Dan Finlay
f147b928b2 Merge branch 'master' into i1805-LiveBlacklistUpdating 2017-07-26 15:32:19 -07:00
Kevin Serrano
aa282b4e3a
Give credit where it is due 2017-07-26 15:31:16 -07:00
Kevin Serrano
66f6d5a4e0
Add levenshtein logic to blacklister. 2017-07-26 15:25:30 -07:00
Dan Finlay
3d8ebf2265 Begin implementing live-updating blacklist, not working yet 2017-07-26 12:27:16 -07:00
kumavis
35a128db1e nonce-tracker - hotfix for provider proxying 2017-07-26 11:37:00 -07:00
kumavis
b15a2baaf3 nonce-tracker - add raw baseNonceHex to nonceDetails 2017-07-26 11:09:02 -07:00
kumavis
7e2e4948a6 tx cont - dont recursively store history 2017-07-26 10:57:47 -07:00
kumavis
de2cf4e9cd Merge branch 'master' of github.com:MetaMask/metamask-plugin into betterErrorsOnTx 2017-07-26 10:43:36 -07:00
kumavis
0ef90fb1f0 tx controller + nonce tracker - record nonce components on txMeta 2017-07-26 10:40:08 -07:00
kumavis
39d28922de nonce-tracker - validation - add validation failing value type to error message 2017-07-26 10:16:08 -07:00
kumavis
f16802e2d4 nonce-tracker - validation - add validation failing value to error message 2017-07-26 10:15:35 -07:00
frankiebee
30cbe74ba6 Merge branch 'betterErrorsOnTx' of https://github.com/MetaMask/metamask-extension into betterErrorsOnTx 2017-07-25 18:33:52 -04:00
frankiebee
ba88f7b8dd fix typo 2017-07-25 18:29:02 -04:00
Frankie
a929fb2387 Merge branch 'master' into betterErrorsOnTx 2017-07-25 18:26:41 -04:00
frankiebee
b81f883150 fix stack wording 2017-07-25 18:23:26 -04:00
frankiebee
1df833bee8 use clone 2017-07-25 18:21:40 -04:00
frankiebee
e0a626da3b remove line numbers 2017-07-25 18:02:21 -04:00
kumavis
4445ba1569 tx cont - add argument for provider constructor 2017-07-25 14:36:19 -07:00
kumavis
5b9a6bd367 tx cont - remove old cb from async fn 2017-07-25 13:16:46 -07:00
frankiebee
ab01358a48 Add stack traces both in errors and as a way to track txMetas 2017-07-25 16:08:31 -04:00
kumavis
12d6f21627 transactions - block nonce-tracker while updating pending transactions 2017-07-18 15:27:15 -07:00
kumavis
aa48ed34c4 nonce-tracker - fix lock mechanism to be a real mutex 2017-07-18 15:11:29 -07:00
kumavis
67fdba5e42 transaction - promisify _checkPendingTxs 2017-07-18 14:00:43 -07:00
kumavis
d249da77d7 nonce-tracker - return nonce as integer 2017-07-18 13:59:56 -07:00
kumavis
4f9fc8014a nonce-tracker - validate nonce calc components 2017-07-18 12:48:16 -07:00
frankiebee
948f3880a3 turn off auto faucet and remove file 2017-07-17 17:37:01 -04:00
tmashuang
bda52f7cba Infura Network response tests 2017-07-14 10:34:03 -07:00
Frankie
9d3207fb73 Merge pull request #1617 from MetaMask/nonce-tracker
transaction controller - use nonce-tracker
2017-07-13 15:48:50 -04:00
frankiebee
7eccf5905a make publishTransaction and signTransaction async methods 2017-07-13 15:25:43 -04:00
kumavis
3d082203ec Merge pull request #1771 from MetaMask/addNonceErrToErrLIst
Add nonce err to err list
2017-07-12 23:41:26 -07:00
frankiebee
6086bcdf0d limit the range for retryCount 2017-07-12 20:01:07 -07:00
frankiebee
de0cd6e663 write a migration for resubmit tx's to get put back into a submitted state 2017-07-12 19:03:35 -07:00
frankiebee
27cb02bc58 add "nonce too low" to the ignored errs list for tx retrys 2017-07-12 19:03:34 -07:00
frankiebee
751103d948 Merge branch 'master' into nonce-tracker 2017-07-12 15:10:58 -07:00
frankiebee
aeefcbd75b Fix test to match behavior 2017-07-12 15:10:52 -07:00
frankiebee
bd26ec46aa mv updateAndApproveTx to txController 2017-07-12 15:07:56 -07:00
frankiebee
da35f6744e use new nodeify 2017-07-12 15:06:49 -07:00
Dan Finlay
52b92fbe40 Add first version of phishing site warning
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).
2017-07-12 13:09:20 -07:00
kumavis
9f46984fee metamask - on rpc err show whole error body 2017-07-11 14:17:47 -07:00
frankiebee
231ad48564 Use txParams 2017-07-11 12:52:56 -07:00
frankiebee
971d25a8ab Merge branch 'master' into nonce-tracker 2017-07-11 12:41:03 -07:00
kumavis
a1fd9bc6be Merge pull request #1762 from MetaMask/ImproveRetryLogic
Improve retry logic
2017-07-11 12:29:20 -07:00
Dan Finlay
c7b9e3fb18 Improve insufficient balance checking in retry loop 2017-07-11 12:19:01 -07:00
frankiebee
a670e54973 Merge branch 'nonce-tracker' of https://github.com/MetaMask/metamask-plugin into nonce-tracker 2017-07-11 12:18:44 -07:00
frankiebee
c121ac21ec remove irrelevan code 2017-07-11 12:16:08 -07:00
frankiebee
611338c4e0 use .includes 2017-07-11 12:01:59 -07:00
Dan Finlay
d97c6533b8 Remove local nonce error setting. 2017-07-11 12:00:17 -07:00
frankiebee
11d57adc5c add "Gateway timeout" to ignored errors when resubmiting and use .includes over .startsWith 2017-07-11 11:57:42 -07:00
kumavis
512b6cae81 migration 16 - move resubmit warning back to submitted state 2017-07-07 19:31:27 -07:00
kumavis
c425ad4ec7 tx controller - resubmit - correctly set error on bad nonce/balance 2017-07-07 19:13:06 -07:00
kumavis
c53aac398a tx controller - correctly set error message on resubmit error 2017-07-07 19:09:32 -07:00
kumavis
4fa999e4de tx controller - resubmit - recognize parity known hash message 2017-07-07 19:02:34 -07:00
kumavis
d228f46254 Merge branch 'master' into nonce-tracker 2017-07-07 14:21:43 -07:00
frankiebee
092a9c9def fail transactions that fail in resubmit 2017-07-07 03:05:39 -07:00
kumavis
34e2f6650d tx controller - clean code 2017-07-07 01:50:48 -07:00
kumavis
8661989f51 tx controller - move comments 2017-07-07 01:37:45 -07:00
frankiebee
9955668409 add comment 2017-07-06 23:10:04 -07:00
frankiebee
11b744bb87 if an error happens during a tx publication set tx status to fail 2017-07-06 22:30:25 -07:00
Dan Finlay
07d4e4fe6f Fix failing test 2017-07-05 23:24:33 -07:00
Dan Finlay
3abceac55d Fail pending txs with low balance or invalid nonce 2017-07-05 22:43:31 -07:00
frankiebee
51ff6d74e8 clean up unused code from old noncelock 2017-07-05 12:07:34 -07:00
frankiebee
6d2cddaac9 fix nonce calculation order 2017-07-05 12:00:42 -07:00
kumavis
68fc3603df metamask - append dapp origin domain to rpc request 2017-07-04 12:48:00 -07:00
Thomas Huang
ffd3773ef3 Merge pull request #1620 from MetaMask/i1616-AddTokenAdding
Add ability to add tokens to token list
2017-06-28 10:07:49 -07:00
Dan Finlay
ddba2af415 Merge pull request #1509 from MetaMask/i1473-dappDefaultGasPrice
I1473 dapp default gas price
2017-06-27 21:00:08 -07:00
frankiebee
690685d20d nonce-tracker: only check transactions that are not supposed to be ignored 2017-06-27 16:46:33 -07:00
Dan Finlay
b9f220c90d Merge pull request #1685 from MetaMask/setFailed
Migration #015 set txs Failed
2017-06-27 15:33:32 -07:00
frankiebee
0ee4502d71 calculate nonce based on local pending txs w/o error state. 2017-06-27 15:26:04 -07:00
frankiebee
4e0ec74bb7 Create a migration for setting tx's with the message 'Gave up submitting tx.' as failed 2017-06-27 15:09:07 -07:00
frankiebee
db2836a1ae dont stop retrying brodcasting txs 2017-06-27 14:19:28 -07:00
frankiebee
847a4282a2 Merge branch 'master' into nonce-tracker 2017-06-27 13:10:56 -07:00
Thomas Huang
1977417017 Merge branch 'master' into i1473-dappDefaultGasPrice 2017-06-27 10:32:28 -07:00
Kevin Serrano
92da8bc578
Fix error message for invalid seed words. 2017-06-26 16:14:35 -07:00
Thomas Huang
8b5b2d8329 Merge pull request #1663 from MetaMask/infura-status
Add Infura Status Information to UI State
2017-06-26 12:06:23 -07:00
Dan Finlay
06706f6e1b Merge branch 'master' into i1616-AddTokenAdding 2017-06-23 08:50:44 -04:00
Kevin Serrano
f022c7c714 Merge pull request #1603 from MetaMask/AddTokenList
Add popular token list
2017-06-22 17:28:10 -07:00
Kevin Serrano
f9f0f6f9ef
Add infura network status to our UI state. 2017-06-22 12:32:34 -07:00
Kevin Serrano
b7f8657ab5
Add infura network status to our UI state. 2017-06-22 12:32:08 -07:00
frankiebee
abbbe1156c Merge branch 'master' into nonce-tracker 2017-06-21 19:52:28 -07:00
frankiebee
92df9965eb fix nonceTracker 2017-06-21 19:51:00 -07:00
frankiebee
fa8c74fe9b add a test for #getNonceLock 2017-06-21 17:28:19 -07:00
Kevin Serrano
044c16219b
Fix badge number to include personal_sign 2017-06-20 15:38:23 -07:00
Dan Finlay
41d992cca9 Merge branch 'AddTokenList' into i1616-AddTokenAdding 2017-06-19 19:03:49 -07:00
Thomas Huang
235cb1f2d7 Keeps dapp gas price if set 2017-06-19 17:50:06 -07:00
Kevin Serrano
9da243f42d
Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTokenList 2017-06-19 13:51:38 -07:00
frankiebee
0d8c02db35 Merge branch 'master' into nonce-tracker 2017-06-16 17:07:12 -07:00
Frankie
ac728189e1 Merge branch 'master' into i1567-FixInaccurateError 2017-06-16 16:46:13 -07:00
Frankie
42f3ccd9dc Merge pull request #1623 from MetaMask/checkTxs
Check txs
2017-06-16 16:44:59 -07:00
frankiebee
9c2ead3d52 put event back on the "blockTracker:/provider" 2017-06-16 16:43:38 -07:00
frankiebee
3e359d6a6a Merge branch 'master' into i1567-FixInaccurateError 2017-06-16 16:39:52 -07:00
frankiebee
5f8e74e0aa put the block listeners back on the provider 2017-06-16 16:36:32 -07:00
Dan Finlay
06f6aa7a00 Debounce background updates
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
2017-06-15 18:01:10 -07:00
Dan Finlay
48789f2a3d Add ability to add tokens to token list
Fiex #1616
2017-06-15 16:22:53 -07:00
frankiebee
f76a555c09 Merge branch 'master' into i1567-FixInaccurateError 2017-06-15 14:28:10 -07:00
kumavis
41a1ce037b Merge pull request #1611 from MetaMask/checkTxsOnSync
add a check for weather a tx is included in a block when jumping blocks
2017-06-15 14:12:14 -07:00
kumavis
27b874f2c4 transactions controller - add comments 2017-06-15 14:08:07 -07:00
frankiebee
2e5deef2b0 check nonce and balance when resubmiting tx 2017-06-15 13:48:48 -07:00
Dan Finlay
39c7ed230d Merge remote-tracking branch 'origin/master' into AddTokenList 2017-06-15 13:44:58 -07:00
kumavis
b3492d9c17 transaction controller - use nonce-tracker 2017-06-14 23:44:02 -07:00
kumavis
dab2fccc78 introduce nonce-tracker 2017-06-14 22:16:14 -07:00
frankiebee
07539a63e4 remove unnecessary log 2017-06-14 21:52:49 -07:00
frankiebee
a10740af7e add a check for weather a tx is included in a block when jumping blocks 2017-06-14 20:17:59 -07:00
frankiebee
6ae97290f0 check for the tx in the block that provider engine gives us 2017-06-14 17:43:04 -07:00
Dan Finlay
6fda78cd2b Refresh token balance on network change 2017-06-14 15:21:51 -07:00
Dan Finlay
b7b9e0c1ac Persist selected account tab
Also improve error handling with token balances.
2017-06-14 14:21:50 -07:00
Dan Finlay
0fd32e67d4 Do not mark slowly mined txs as failed.
Fixes #1567

Also seems to fix #1556

Also improves resubmit performance by only resubmitting on `latest`.
2017-06-14 12:01:45 -07:00
Dan Finlay
dd7e11d196 Merge pull request #1598 from MetaMask/txRetry
put tx resubmission on the block event
2017-06-13 10:45:21 -07:00
frankiebee
ec3383c162 rename continuallyResubmitPendingTxs to resubmitPendingTxs 2017-06-13 09:50:01 -07:00
Thomas Huang
ae7c296669 Fix networkState in chain id 2017-06-12 17:44:11 -07:00
Dan Finlay
a741cc4fc4 Merge branch 'master' into AddTokenList 2017-06-12 17:17:16 -07:00
frankiebee
96fa29ffbc put tx resubmission on the block event 2017-06-12 16:11:37 -07:00
kumavis
3b3c96ef34 Merge pull request #1208 from MetaMask/i#1203MainNetSwitch
Change default to mainnet
2017-06-12 14:22:07 -07:00
kumavis
c0a023ffdb default testnet - fix typo 2017-06-12 13:46:56 -07:00
kumavis
27220b7bcd Merge branch 'master' into i#1203MainNetSwitch 2017-06-12 13:27:04 -07:00
Thomas Huang
13e6672028 Linting 2017-06-12 11:08:32 -07:00
Dan Finlay
ba254d9041 Merge branch 'master' into currency-fix 2017-06-12 10:32:54 -07:00
Kevin Serrano
203a573f3f
Use new URL for currency API from cryptonator. 2017-06-05 16:23:56 -07:00
Kevin Serrano
2b7d842498
Update gasblocklimit params with every block. 2017-06-02 15:18:14 -07:00
Kevin Serrano
82cbfaa826
Convert gasLimit to not use muln in BN 2017-06-01 12:53:16 -07:00
Thomas Huang
8f9a230d8d Merge pull request #1500 from MetaMask/RemoveStreamingSubprovider
Remove streaming subprovider
2017-05-25 15:04:50 -07:00
Dan Finlay
ad40e4d260 Remove stream subprovider
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.
2017-05-25 12:37:04 -07:00
frankiebee
717dceede8 fix spelling 2017-05-24 23:36:10 -04:00
frankiebee
3b06a29e1b Merge branch 'master' into reloadDapp 2017-05-24 23:10:58 -04:00
frankiebee
473b88f399 Reload the page when switching networks for sites that use web3 2017-05-24 23:00:58 -04:00
Dan Finlay
764806d211 Merge pull request #1494 from MetaMask/1472-gasceiling
Add Max GasLimit Ceiling
2017-05-24 16:36:00 -07:00
Kevin Serrano
26fd016b63
Add new blockGasLimit property to txMeta object. 2017-05-24 16:17:03 -07:00
kumavis
e6b278569e inpage-provider - disable polling after first block 2017-05-24 11:34:26 -07:00
frankiebee
db982cf795 stop polling when switching networks 2017-05-24 11:52:18 -04:00
Frankie
97ea7454b3 Merge branch 'master' into networkController 2017-05-23 20:36:11 -04:00
frankiebee
c5d74e6421 include ethQuery in txController 2017-05-23 20:06:19 -04:00
frankiebee
243eeff7cb Fix for tests 2017-05-23 19:49:57 -04:00
Dan Finlay
e4d09aebf4 Cleanup 2017-05-23 14:49:10 -07:00
Dan Finlay
cd2ad1733d Continually resubmit pending txs 2017-05-23 12:22:15 -07:00
frankiebee
529304c005 Wrap the provider in a proxy 2017-05-23 01:56:10 -04:00
frankiebee
e08c1541e5 Add a migration for the network controller 2017-05-23 01:55:20 -04:00
frankiebee
13a41f3129 Merge branch 'master' into networkController 2017-05-22 19:48:10 -04:00
kumavis
b217ad1ae8 clean - remove console logs 2017-05-22 16:06:22 -07:00
kumavis
1c1400b584 deps - use stream-subprovider from provider-engine 2017-05-22 15:59:07 -07:00
Dan Finlay
cbfaa6f56f Rename stream to streamSubprovider 2017-05-22 15:41:13 -07:00
Dan Finlay
48d9a21071 Use filter subprovider in-page to avoid filter leaks 2017-05-22 15:23:29 -07:00
Dan Finlay
709c0eb307 Use stream-provider v3 api 2017-05-22 15:21:25 -07:00
Dan Finlay
c5432da567 Add new streaming subprovider but getting a loop
Regarding #1458

Uses a new streaming subprovider architecture on an experimental branch of StreamProvider:
https://github.com/flyswatter/web3-stream-provider/tree/StreamSubprovider
2017-05-20 20:38:38 -07:00
frankiebee
f87ea49b5a Create a network controller to manage switcing networks an updating the provider 2017-05-19 00:14:10 +02:00
Dan Finlay
68d6ea44a0 Fix path references 2017-05-16 11:39:00 -07:00
Dan Finlay
2df9344be5 Rename tx manager to tx controller 2017-05-16 10:35:28 -07:00
kumavis
28aba6e9de migration 13 - change provider from testnet to ropsten 2017-05-15 23:56:13 -07:00
Thomas Huang
3367363b12 Remove all traces of testnet 2017-05-15 19:11:16 -07:00
Thomas Huang
62ee038889 Merge branch 'master' into i1419-rinkebydefaultnetwork 2017-05-15 18:06:48 -07:00
Thomas Huang
4c10e2021a Change default network to rinkeby 2017-05-15 18:05:11 -07:00
Dan Finlay
fe3e943169 Merge pull request #1422 from MetaMask/drop-asyncq
background - drop async-q in favor of async/await
2017-05-15 15:35:19 -07:00
kumavis
5c9449dec1 background - drop async-q in favor of async/await 2017-05-12 13:09:23 -07:00
kumavis
2c8bbe3b25 migrator - fix typo 2017-05-12 12:27:40 -07:00
kumavis
70a328e028 migrator - cleaner migration runner with es7 2017-05-11 18:15:59 -07:00
frankiebee
6c01b26845 use asyncQ.waterfall instead of asyncQ.eachSeries 2017-05-11 23:25:33 +02:00
frankiebee
1772d34e94 fix migrator 2017-05-11 10:10:50 +02:00
kumavis
68be86abe9 ui - remove web3, use eth-query 2017-05-08 12:29:08 -07:00
kumavis
fb08c4a131 metamask - publicConfig - fix init state 2017-05-04 17:56:30 -07:00
kumavis
10ba760ed3 metamask - selected accounts - dont reveal when locked 2017-05-04 17:50:59 -07:00
Kevin Serrano
833b9f183f
Minor lint 2017-05-03 07:22:36 -07:00
Dan Finlay
a3149c1752 Use loglevel for more logs 2017-04-30 12:38:38 -07:00
kumavis
6ace0c9afb notification-manager - remove promise listener
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
2017-04-28 16:04:00 -07:00
Dan Finlay
d1a1069180 Merge branch 'master' into rinkeby 2017-04-27 14:50:19 -07:00
Thomas Huang
6bdb4c8728 Fix linting warnings 2017-04-26 21:05:45 -07:00
Kevin Serrano
242dc1e99f
Add missing changes. Create unique style for rinkeby icon. 2017-04-25 14:39:01 -07:00
Nickyg
e9aa37b699 add rinkeby network 2017-04-26 01:40:33 +05:30
Dan Finlay
d05d9a5f57 Add missing tx manager state 2017-04-24 13:55:33 -07:00
kumavis
9b9570fd2b auto-faucet - only skip faucet on explicit test environment 2017-04-04 18:48:33 -07:00
kumavis
5a91adf7d8 add platforms to mascara + move buyEther window open to ui 2017-04-04 18:23:46 -07:00
kumavis
5d967eeebb Merge pull request #1307 from MetaMask/mascara
Proof of Concept: Mascara
2017-04-04 11:27:45 -07:00
kumavis
4779999bfc clean - metamask controller - remove log 2017-04-04 11:13:07 -07:00
Kevin Serrano
39181ed33f Merge pull request #1308 from MetaMask/FixFaucet
Fix faucet to only autoFaucet first account
2017-04-04 09:43:25 -07:00
frankiebee
0a7b388b39 Fix faucet to only autoFaucet first account 2017-04-04 18:38:56 +02:00
frankiebee
f80d1ce3e6 Switch auto-faucet from XMLHttpRequest to fetch 2017-04-04 14:55:48 +02:00
frankiebee
f81fdbc34f Merge branch 'master' into mascara 2017-04-02 23:04:55 -07:00
frankiebee
89c924101e Merge branch 'master' into mascara 2017-04-02 22:26:25 -07:00
kumavis
86e882c51a notification-manager - rename show -> showPoup + make getPopup private 2017-03-31 18:41:51 -07:00
kumavis
aa06183c64 ui - use global.platform for extension interaction 2017-03-31 18:04:13 -07:00
kumavis
810f5881f6 Merge branch 'master' of github.com:MetaMask/metamask-plugin into platform 2017-03-31 17:57:47 -07:00
kumavis
60a48e713f ui - move popup auto-close after tx conf to ui entrypoint 2017-03-31 13:32:47 -07:00
kumavis
49d8877fd7 ui - startPopup returns store after boot 2017-03-31 13:20:16 -07:00
kumavis
6259ffaef4 extension - remove local extension files, we use extensionizer 2017-03-30 18:35:22 -07:00
kumavis
5036263f88 introduce platform api and rename notifications to notification-manager 2017-03-30 18:33:19 -07:00
kumavis
be88c87b25 extension - prefer extensionizer module 2017-03-30 18:30:24 -07:00
kumavis
1dce352523 tx-manager - add eip155 support 2017-03-30 14:23:23 -07:00
frankiebee
29a602a89b Clean up 2017-03-30 11:28:22 -07:00
Kevin Serrano
9a6b84644a Merge pull request #1293 from MetaMask/ImproveGasEstimates
tx-utils - gas buffer ceiling at 90% of block gas limit
2017-03-30 09:25:28 -04:00
kumavis
ff49e5e5cf tx-utils - gas buffer ceiling at 90% of block gas limit 2017-03-29 23:21:31 -07:00
frankiebee
84b3415b44 WIP: lost enital call from dapp to getAccounts 2017-03-29 10:53:43 -07:00
Dan Finlay
98dd684524 Linted 2017-03-29 10:42:43 -07:00
Dan Finlay
610ec2bdf5 Fix popup behavior for Firefox
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.
2017-03-29 10:40:57 -07:00
Kevin Serrano
576fb26c15
Add missing migration. 2017-03-29 11:08:15 -04:00
frankiebee
a20a237282 Merge branch 'master' into mascara 2017-03-28 18:02:39 -07:00
Dan Finlay
7b9ac18557 Merge pull request #1268 from MetaMask/kovan-faucet-instructions
Add Kovan faucet instructions
2017-03-28 14:56:02 -07:00
Dan Finlay
f2587b7e80 Merge pull request #1273 from MetaMask/i1267-seedfix
Assure that seed words are placed into state tree upon request.
2017-03-28 14:54:04 -07:00
Dan Finlay
a3e08d779e Merge branch 'master' into kovan-faucet-instructions 2017-03-28 14:50:55 -07:00
kumavis
0f1ea5861f Merge pull request #1276 from MetaMask/ImproveGasEstimates
Improve UI gas calculation logic
2017-03-28 14:48:03 -07:00
kumavis
6310a05dae tx manager - emit update on new unapproved tx 2017-03-28 14:39:29 -07:00
kumavis
e864623d3c tx manager - add eth-query 2017-03-28 13:56:35 -07:00
kumavis
1495240969 tx manager - adjust new tx flow and txMeta decorations 2017-03-28 13:35:27 -07:00
Dan Finlay
81d3658343 Improve UI gas calculation logic
- Now striping hex prefixed gas values, which may have been causing mis-estimation.
- Unified calculation logic to be entirely functional.
- Greatly simplified how the pending-tx form keeps updated form state.

Still needs a commit from @kumavis to ensure the background passes in a txMeta.txParams.gasPrice value.
2017-03-28 11:52:15 -07:00
Kevin Serrano
0625b4a110
Fix injection logic. 2017-03-28 14:30:39 -04:00
Kevin Serrano
a95d96d507
Assure that seed words are placed into state tree upon request. 2017-03-28 11:23:25 -04:00
Kevin Serrano
c1136a6317
Add link to kovan faucet instructions. 2017-03-27 16:05:21 -04:00
Stefaan Ponnet
0faddb2ed2 Allow injection in IFrames + dynamic IFrames 2017-03-26 13:57:44 +02:00
Kevin Serrano
30e8d25013
Merge branch 'master' into i1210-txdisappearance 2017-03-24 17:13:57 -04:00
Dan Finlay
3a888ede2a Merge branch 'master' into notice-modification 2017-03-24 13:56:30 -07:00
frankiebee
8e30acb41a Merge branch 'master' into mascara 2017-03-23 15:44:29 -07:00
Dan Finlay
2cab2f767c Remove gas limit param
Fixes #1256 by removing redundant param.
2017-03-23 13:56:32 -07:00
frankiebee
197e6e0b77 WIP: indexdb is at an err state "provider is undefined" 2017-03-23 11:41:32 -07:00
frankiebee
45ab81fb45 WIP: streams->indexdb 2017-03-23 11:06:38 -07:00
Kevin Serrano
fa0bbd66b6
Fix persistence of transactions between networks. 2017-03-23 11:28:06 -04:00
Kevin Serrano
16c76d5229
Create migration to erase body in read notices. 2017-03-23 10:15:59 -04:00
Kevin Serrano
bcaf0864c1
Remove notice body after reading. 2017-03-23 09:58:57 -04:00
Dan Finlay
af9d782363 Merge branch 'master' into i238-kovan 2017-03-22 15:55:01 -07:00
Kevin Serrano
16bdfd3d6e Merge branch 'master' into i238-kovan 2017-03-22 15:41:38 -07:00
Kevin Serrano
2687b8604b Merge branch 'master' into i1237-xmlfix2 2017-03-22 15:39:30 -07:00
Kevin Serrano
1b7326048d
Add current block number and hash to the state. 2017-03-22 16:41:19 -04:00
Kevin Serrano
33dd7954a7
Add kovan config settings to config manager. 2017-03-22 16:00:50 -04:00
Kevin Serrano
c5f96be98d
Add kovan to config file. 2017-03-22 15:59:46 -04:00
Kevin Serrano
b5b88392b9 Merge branch 'master' into i1237-xmlfix2 2017-03-22 11:33:56 -07:00
Kevin Serrano
9906da86a4
Modify logic for injection conditions. 2017-03-22 14:25:56 -04:00
frankiebee
8c7be43403 Have better error messages 2017-03-22 09:48:41 -07:00
Dan Finlay
b6e2eaf7b1 Remove eth-lightwallet 2017-03-16 11:16:03 -07:00
Frankie
57d1a1f186 Merge branch 'master' into i#1203MainNetSwitch 2017-03-16 11:00:12 -07:00
Kevin Serrano
a186e40d17 Merge branch 'master' into i1165-predictive 2017-03-14 17:52:03 -07:00
kumavis
53efc53a40 Merge branch 'master' into i#1203MainNetSwitch 2017-03-14 17:26:06 -07:00
Kevin Serrano
37ffcfcf0e Rename variables to proper currency state variables. 2017-03-14 17:06:16 -07:00
Kevin Serrano
177f2dc948 Fix description of some migrations. 2017-03-14 17:05:47 -07:00
frankiebee
f6e551ef5f Swithch the default network to mainnet 2017-03-13 21:14:19 -07:00
Kevin Serrano
4933e2e2ee Limit the number of addresses stored in our book. 2017-03-13 16:37:53 -07:00
Kevin Serrano
7dcab52a9e Connect keyring controller to address book to prevent additional duplicates. 2017-03-10 10:34:46 -08:00
Kevin Serrano
7182a2be43 Improve duplicate checking in address book. 2017-03-10 10:05:10 -08:00
Kevin Serrano
2ab86b001d Add comments. 2017-03-10 09:34:13 -08:00
Kevin Serrano
b34ee4daa1 Allow for adding recently used addresses to address book. 2017-03-09 15:10:27 -08:00
Kevin Serrano
b296640f1b Rename functions for consistency. 2017-03-09 15:09:50 -08:00
Kevin Serrano
9f6c040554
Create persistence address book. 2017-03-09 13:58:42 -08:00
Kevin Serrano
d270cbc9d2
Create distinct labels and names for addresses. 2017-03-09 13:07:38 -08:00
Kevin Serrano
acc9a2a9d0
Modify message. 2017-03-08 10:53:11 -08:00
Kevin Serrano
6f980cfe10
Add more informative message 2017-03-08 10:46:17 -08:00
Kevin Serrano
b0280dc162 Merge branch 'master' into i1065-removealert 2017-03-08 10:22:08 -08:00
Dan Finlay
67c3126e63 Merge branch 'master' into kumavis-patch-1 2017-03-08 10:16:50 -08:00
Kevin Serrano
529eb25ced
Convert alert to a log.error 2017-03-08 10:13:45 -08:00
Kevin Serrano
86f71d504c Merge branch 'master' into i1144-moarrpc 2017-03-08 09:28:36 -08:00
Kevin Serrano
cf2268c3d2
Nodeify and promisify calls to background. 2017-03-08 09:06:41 -08:00
kumavis
92b8443824 tx-utils - add encoding utils 2017-03-07 22:51:39 -08:00
kumavis
c063fab993 tx-utils - stricter naming type-based convention 2017-03-07 22:47:35 -08:00
kumavis
17b805c76e tx-utils - clean and comment 2017-03-07 22:18:14 -08:00
Dan Finlay
0889309bf3 Merge branch 'master' into i1118-IncreaseGasBuffer 2017-03-07 21:30:43 -08:00
jaredpereira
52ee007fcb Merge branch 'master' into i1118-IncreaseGasBuffer 2017-03-07 22:55:56 -05:00
Jared Pereira
4916331c53 change BN.mul to BN.muln 2017-03-07 22:42:16 -05:00
frankiebee
2f7a95c257 Fix grammar in erro message 2017-03-07 18:56:38 -08:00
frankiebee
af5ad218e2 Merge branch 'master' into i#1032 2017-03-07 17:59:21 -08:00
frankiebee
3e8b584c98 fix issue where account import allows for duplicates 2017-03-07 17:59:03 -08:00
Jared Pereira
4256e631a6 remove constant buffer and add multiplier 2017-03-07 19:57:57 -05:00
Kevin Serrano
e7e024bcdd
Refactor of code into separate reducers and actions. 2017-03-07 16:01:51 -08:00
Kevin Serrano
08ca7dac5a
Merge branch 'master' into i1144-moarrpc 2017-03-07 10:37:31 -08:00
Dan Finlay
51aa95a65c Merge branch 'master' into i1173-ShowPersonalMessage 2017-03-06 16:34:24 -08:00
Dan Finlay
e66e755766 Fix normalizeMsgData function to always return hex prefixed 2017-03-06 16:33:33 -08:00
Frankie
b84f1b0532 Fix issue where old txMeta object was being used to pass the txHash to the cb 2017-03-06 15:41:11 -08:00
Dan Finlay
9bd8c5f723 Render personal_sign messages as utf-8 text
Calls to `personal_sign` are now:

- When hex encoded, preserved as hex encoded, but displayed as utf-8 text.
- When not hex encoded, decoded as utf-8 text as hex for signing.
- The messages proposed for signing are displayed as UTF-8 text.
- When the message cannot be rendered as UTF-8 text, it is displayed as hexadecimal.

Fixes #1173
2017-03-06 15:04:11 -08:00
Kevin Serrano
e66035254f
More conflict resolution. 2017-03-01 10:04:25 -08:00
Kevin Serrano
0a3849ec84
Fix merge conflicts. 2017-03-01 10:01:21 -08:00
Dan Finlay
ddc136a7c2 Add a couple more debug logs 2017-02-28 15:41:20 -08:00
Dan Finlay
f908aaafbc Use correct action to update and submit tx 2017-02-28 14:45:21 -08:00
Dan Finlay
e07e4b7bc7 Linted 2017-02-28 14:13:58 -08:00
Dan Finlay
da88481560 Remove gasMultiplier txMeta param
This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic.

Removed it and the logic that referred to this now-outdated parameter.
2017-02-28 14:08:00 -08:00
Dan Finlay
2e16e1eb94 Fixed bug that made send screen sometimes transition to account detail 2017-02-28 12:00:07 -08:00
Dan Finlay
1eb4a5d62c Add background method for updating and approving a tx in one call 2017-02-27 18:25:46 -08:00
Dan Finlay
462c7ae213 Merge branch 'master' into i765-gaslimits 2017-02-27 12:59:19 -08:00
Dan Finlay
b5d03cd524 add controllers to root scripts folder 2017-02-27 10:40:37 -08:00
Dan Finlay
5edb3db969 Merge branch 'master' into i1144-moarrpc 2017-02-27 10:36:48 -08:00
Dan Finlay
8c66260bdb Removed redundant personal_recover logic 2017-02-24 17:07:54 -08:00
Dan Finlay
f2851402f3 Mostly fix personal_recover 2017-02-24 16:36:29 -08:00
Kevin Serrano
dfc89d6c6d
Make gasPrice accessible to the UI. 2017-02-24 15:06:55 -08:00
Dan Finlay
961a83769b Fix cancel msg signing behavior. 2017-02-23 16:02:58 -08:00
Dan Finlay
4697aca02c Got personal_sign working
Also fixed bug where signing would not close popup.
2017-02-23 14:23:45 -08:00
Kevin Serrano
62854398f1
Tested against code to play nice with unit tests. 2017-02-23 13:56:58 -08:00
Dan Finlay
7ec25526b7 Add alternate UI for pending personal_sign messages 2017-02-23 11:18:49 -08:00
Dan Finlay
564f920ae0 Add personal sign actions and template 2017-02-22 16:30:09 -08:00
Kevin Serrano
7a0ce31bd3
Implemented functionality for displaying recent custom RPCs 2017-02-22 15:12:56 -08:00
Dan Finlay
8684fc40c7 Allow provider to init before keyringController 2017-02-21 14:41:55 -08:00