Commit Graph

1585 Commits

Author SHA1 Message Date
Dan Finlay d0d082d70c Merge branch 'master' into i1340-SynchronousInjection 2017-10-12 13:25:19 -04:00
Thomas Huang 29ee33359e Merge pull request #2345 from MetaMask/Version-3.11.0
Version 3.11.0
2017-10-12 09:24:35 -07:00
kumavis dcf10f3d75 nonce-tracker - use blockTracker directly 2017-10-11 18:33:36 -07:00
Dan Finlay 4ed00ea2d8 Version 3.11.0 2017-10-11 15:54:17 -04:00
kumavis 0f8d7dacb1 network-controller - use obj-proxy for providerProxy 2017-10-10 17:26:44 -07:00
kumavis 7d50a56198 util - add obj-proxy 2017-10-10 17:15:52 -07:00
kumavis e32d75965f events-proxy - clean up 2017-10-10 17:15:14 -07:00
kumavis 4d273d3cea lint fixes 2017-10-10 14:14:43 -07:00
kumavis efa92a7fc5 network controller - refactor to use eth-rpc-client 2017-10-10 14:13:12 -07:00
kumavis ff4e9a0d11 metamask controller - define this.newTransaction to ease instantiation order 2017-10-10 10:50:45 -07:00
kumavis f7c1bc804d metamask controller - simplify provider init 2017-10-10 10:39:31 -07:00
kumavis e79037261e metamask controller - breakout getAccounts method 2017-10-10 10:26:59 -07:00
Kevin Serrano 1816eca914
Merge branch 'master' into version-debugging 2017-10-10 08:38:27 -07:00
Kevin Serrano 24a55cf777
Make the function callback friendly. 2017-10-10 08:36:15 -07:00
Dan Finlay 7f70c866c3 Merge pull request #2223 from ukstv/master
Add eth_signTypedData handler
2017-10-09 12:18:43 -07:00
Dan bbe893a0d8 UI for send screen container without form rows. 2017-10-08 17:48:09 -07:00
Sergey Ukustov a1696f89a8 Validate data format for eth_signTypedData 2017-10-07 00:38:13 +03:00
Frankie 4a4338c1f4 Merge pull request #2305 from MetaMask/nodeify
nodeify - allow callback to be optional
2017-10-06 14:08:58 -07:00
Dan Finlay 0c61695656 Merge branch 'master' into SignTypedData 2017-10-06 14:03:04 -07:00
kumavis fa11bbf996 Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInit
Update status of pending transactions on startup
2017-10-06 13:40:43 -07:00
kumavis bc396a7417 lint fix - nodeify 2017-10-06 13:02:34 -07:00
Dan Finlay a417fab0eb When checking pending txs, check for successful txs with same nonce.
If a successful tx with the same nonce exists, transition tx to the failed state.

Fixes #2294
2017-10-06 12:51:13 -07:00
Dan Finlay 94513cae7b Provide method for tx tracker to refer to all txs 2017-10-06 12:50:33 -07:00
kumavis be4f7b33f4 nodeify - allow callback to be optional 2017-10-06 12:36:08 -07:00
Dan Finlay 0146b55d6d Check status of pending transactions on startup
Fixes #1531
2017-10-06 11:41:28 -07:00
Kevin Serrano f6821781d2
Simplify try catch 2017-10-05 17:17:34 -07:00
Kevin Serrano 106af9ec5b
Catch an error if this is not defined. 2017-10-05 17:13:58 -07:00
Kevin Serrano b9012a62e5
Merge branch 'master' into version-debugging 2017-10-05 17:06:55 -07:00
Dan Finlay 9f18b898c5 Merge branch 'Version-3.10.9' into SignTypedData 2017-10-05 14:52:19 -07:00
Dan Finlay cf178341c1 Merge branch 'master' into SignTypedData 2017-10-05 14:50:19 -07:00
Dan Finlay 9bc80d998e Add signTypedData input validations 2017-10-05 14:39:35 -07:00
Dan Finlay 8d45b96db6 Version 3.10.9 2017-10-05 12:44:48 -07:00
Dan Finlay c5b7880f05 Merge branch 'master' into SignTypedData 2017-10-05 11:55:23 -07:00
frankiebee 3cb9da2ae5 "fix" hours for message 2017-10-05 11:42:01 -07:00
frankiebee ec9c528313 pending-tx - check time stamp instead of block number for resubmit 2017-10-05 11:07:22 -07:00
Kevin Serrano 15809894ff
Add indicator for specified gas price 2017-10-05 09:58:04 -07:00
Dan Finlay 1cba6543a4 Begin implementing sync injection idea 2017-10-04 15:35:04 -07:00
Kevin Serrano 3d80565339
Configured for callback-required function.' 2017-10-04 10:55:10 -07:00
Kevin Serrano 147b81068a
Include OS version 2017-10-04 09:56:18 -07:00
Chi Kei Chan bd99bc2e88 Merge branch 'master' into NewUI-flat 2017-10-03 16:02:58 -07:00
Dan ac4868170f Enables remove token and ensures add/remove update the list without need for refresh. 2017-10-03 15:46:01 -07:00
Frankie 948a0b1078 Merge pull request #2250 from interfect/master
Don't pass origin as an HTTP header
2017-10-03 10:36:39 -07:00
Sergey Ukustov e11ca12890 Merge remote-tracking branch 'upstream/master' 2017-10-03 02:10:47 +03:00
kumavis 062eaa6a82 pending tx tracker - on tx:warn append error message instead of error obj 2017-10-02 15:39:11 -07:00
kumavis ed77304e73 pending tx tracker - tx:warning event includes err obj 2017-10-02 15:20:01 -07:00
kumavis 22eaf92ec2 pending tx tracker - resubmit - warn dont error on unknown error 2017-10-02 15:00:23 -07:00
kumavis 7af696bfbe pending tx tracker - dont throw on load failure 2017-10-02 14:56:59 -07:00
kumavis 167ad729fd Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into history-notes 2017-10-02 13:45:47 -07:00
frankiebee e08a727d44 Merge branch 'master' into history-notes 2017-10-02 13:44:15 -07:00
kumavis df59ef9942 tx state history - append note to first op of diff 2017-10-02 13:44:11 -07:00
frankiebee 833da191c3 transaction - provide notes for history 2017-10-02 13:41:29 -07:00
kumavis d29b5f10ef tx state history - fix bug where initial snapshot was mutated on updateTx 2017-10-02 13:14:42 -07:00
Thomas Huang 1769f880db Merge pull request #2138 from sunify/fix-firefox-cors
Fix CORS issues in FireFox
2017-10-02 11:09:06 -07:00
Kevin Serrano 36bc8f3c60 Update manifest.json 2017-10-02 10:59:15 -07:00
Adam Novak 8cc8fecdac Don't pass origin as an HTTP header
Requests with this nonstandard header are being blocked by CORS when
made against Parity.

Not sending it ought to fix #1779.
2017-10-01 18:55:52 -07:00
Dan Finlay d5b0d8af4f Version 3.10.8 - Fix Currency Conversion
In our conversion to the new Infura API, somehow we were sending upper-cased conversions to their lower-case sensitive API.

Fixes the first part of #2240
2017-09-29 20:57:15 -07:00
kumavis 7bdf73b1dd Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactions
pending-tx - dont check the balance to rebrodcast
2017-09-29 17:36:49 -07:00
Frankie 8425fb04d3 Merge pull request #2239 from MetaMask/network-controller-contd
network - make network controller internal network switching explicit
2017-09-29 17:22:16 -07:00
kumavis 1ad8a9a0ff network - make network controller internal network switching explicit 2017-09-29 17:10:34 -07:00
Frankie f57fd717fe Merge pull request #2237 from MetaMask/network-controller-contd
Networking refactor
2017-09-29 16:50:31 -07:00
kumavis d6ea2fa425 network - convert localhost from custom rpc to network type 2017-09-29 16:35:58 -07:00
kumavis b88d11f86e network controller - small refactor 2017-09-29 16:09:38 -07:00
Dan Finlay 14d58e630d Version 3.10.7 2017-09-29 13:17:21 -07:00
frankiebee ac80eaca1f pending-tx - dont check the balance to rebrodcast 2017-09-29 12:54:05 -07:00
Dan Finlay 861bd877f3 Ensure selected account is always set if possible
Fixes #2218

Subscribes to keyringController, and if only one account exists, sets it as selected.
2017-09-29 11:19:54 -07:00
Sergey Ukustov c2b8dada91 Add eth_signTypedData handler 2017-09-29 19:40:46 +03:00
Chi Kei Chan 5a1d50cd43 Merge branch 'master' into mmn 2017-09-27 22:32:07 -07:00
kumavis cdf41c2857 Merge pull request #2124 from MetaMask/breakout-mascara
require metamascara
2017-09-27 16:27:01 -07:00
frankiebee b24e16d346 re-enabled x-metamask-origin for mascara 2017-09-27 16:14:58 -07:00
kumavis 15b2823e54 Merge branch 'master' into new-currency-test 2017-09-27 16:04:51 -07:00
kumavis ecf909e140 Merge pull request #2194 from MetaMask/network-controller-refactor
Network controller refactor
2017-09-27 15:56:23 -07:00
Dan Finlay b473d440a3 Version 3.10.6 2017-09-27 15:14:40 -07:00
Dan Finlay a246770866 Commit to the eth-keyring-controller module 2017-09-27 14:55:34 -07:00
Dan Finlay aefd17ef94 Remove dead reference 2017-09-27 14:45:24 -07:00
kumavis 06b5dd2096 network controller - move _setProvider to bottom 2017-09-27 14:44:54 -07:00
kumavis f2d9b75e94 network controller - refactor to use _setProvider 2017-09-27 14:44:13 -07:00
Dan Finlay 96ebbde634 Fix Account Selection
Do not select accounts on restore, only on creation and deliberate selection.

Fixes #2164
2017-09-27 14:43:34 -07:00
kumavis 7d499df8e3 account-tracker - remove unused import 2017-09-27 14:12:45 -07:00
kumavis c781e11c7a network - remove getter/setter 2017-09-27 14:10:58 -07:00
kumavis 7e9c6e96a1 metamask - improve comment 2017-09-27 14:10:17 -07:00
kumavis 4404dfc5d3 Merge branch 'master' into direct-block-tracker 2017-09-27 13:58:54 -07:00
kumavis 5bbea78306 Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3
Transaction controller refractor pt3
2017-09-27 13:57:04 -07:00
kumavis b41aad6d1a style - small whitespace nitpick 2017-09-27 12:33:46 -07:00
kumavis 89e690fc79 account-tracker - use new block-tracker block format 2017-09-27 12:33:00 -07:00
Dan Finlay 1983e161c6 Fix accountTracker store references 2017-09-27 12:29:09 -07:00
Dan Finlay a453eb132d Version 3.10.5 2017-09-27 12:10:25 -07:00
Dan Finlay 8d3fec42d0 Fix bug where block gas limit was incorrectly parsed. 2017-09-27 12:09:32 -07:00
Dan Finlay d77e0aff4d Version 3.10.4 2017-09-27 11:15:22 -07:00
Dan Finlay e72083f6e8 Merge branch 'master' into filter-fixes-moar 2017-09-27 10:57:02 -07:00
frankiebee 0a94ec41d3 pending-tx - move incrementing of the retryCount on the txMeta outside pending-tx-tracker 2017-09-26 22:42:59 -07:00
kumavis 1877c0766c Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOutKeyringController 2017-09-26 21:42:30 -07:00
frankiebee 508696f71d transactions: reveal #getFilteredTxList from txStateManage and fix accountTracker.store reference 2017-09-26 18:12:53 -07:00
frankiebee 80c98b1653 transactions: make evnt names pretty and eaiser to read 2017-09-26 16:55:11 -07:00
frankiebee 9fd5458112 transactions: lint fixes and reveal status-update event for balance controller 2017-09-26 16:54:04 -07:00
frankiebee 8ab23c713d Merge branch 'master' into transactionControllerRefractorPt3 2017-09-26 16:24:43 -07:00
Dan Finlay 651098c70d Remove duplicate instantiation of account-tracker 2017-09-26 14:30:29 -07:00
Dan Finlay 2eca5455c0 Move obs store into account-tracker instead of inheriting 2017-09-26 14:15:16 -07:00
frankiebee 9d1cb0f76d network contoller - clean up unused code 2017-09-26 13:56:09 -07:00
frankiebee 2ed8d579da listen for the blocke event on the block tracker instead of rawBlock on the provider 2017-09-26 13:38:27 -07:00
frankiebee b654eb9b1f wrap block tracker in events proxy 2017-09-26 13:38:27 -07:00