Commit Graph

4328 Commits

Author SHA1 Message Date
Kevin Serrano d9f5e6beb2 Merge pull request #2370 from MetaMask/MoveOutEtherscanLinkGeneration
Move etherscan link logic into module
2017-10-16 11:31:05 -07:00
Kevin Serrano 42e3261c98 Merge pull request #2379 from MetaMask/FixImportedTypedDataSigning
Bump version on eth-simple-keyring
2017-10-16 11:15:39 -07:00
Dan Finlay 10011395f6 Bump changelog 2017-10-16 04:14:09 -07:00
Dan Finlay c77bc5d408 Bump version on eth-simple-keyring
Fixes bug where imported accounts could not use the new `signTypedData` method.
2017-10-16 04:12:51 -07:00
Dan Finlay 06094c914b Move etherscan link logic into module 2017-10-14 11:23:44 -04:00
greenkeeper[bot] 970fbd797a fix(package): update react-simple-file-input to version 2.0.0 2017-10-14 12:05:00 +00:00
kumavis 701887bb19 Merge pull request #2352 from MetaMask/i1340-SynchronousInjection
Fix slow web3 injection bug
2017-10-12 13:01:29 -07:00
kumavis 53a360b65d contentscript - fix inpage require and bundling 2017-10-12 12:51:48 -07:00
Dan Finlay c9a984a237 Break up inpage file read into multiple lines 2017-10-12 14:16:40 -04:00
Dan Finlay d71f14cb67 Increase build readability 2017-10-12 14:03:42 -04:00
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
Frankie c4adefcc53 Merge pull request #2318 from MetaMask/network-controller-client
NetworkController refactor for new EthClient interface
2017-10-12 05:45:10 -07:00
kumavis 5c5f9297f7 deps - bump eth-rpc-client for fix 2017-10-11 18:36:25 -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
Dan Finlay 6072e71a53 Merge pull request #2344 from MetaMask/FixTokenHelpLink
Fix link to token support page
2017-10-11 12:26:23 -07:00
Dan Finlay 9f063c320c Fix link to token support page 2017-10-11 15:15:31 -04:00
kumavis f0713d4b1a ui - network - fix localhost active status 2017-10-11 01:01:29 -07:00
kumavis 8a9d5ffe06 network - convert localhost from custom rpc to network type 2017-10-11 00:53:35 -07:00
kumavis d31c746210 test - integration - intercept reload attempts 2017-10-10 21:10:35 -07:00
kumavis 4096ec9f69 deps - bump eth-json-rpc-middleware for fix 2017-10-10 20:20:12 -07: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
Dan Finlay f18615a82a Merge pull request #2296 from MetaMask/precision-fix
Fix precision to account for small wei increase.
2017-10-09 14:15:09 -07:00
Kevin Serrano d82d9215fb
Make modification 2017-10-09 13:02:52 -07:00
Kevin Serrano c12d56063d
Fix to actually fail in earlier versions. 2017-10-09 13:01:58 -07:00
Dan Finlay 7f70c866c3 Merge pull request #2223 from ukstv/master
Add eth_signTypedData handler
2017-10-09 12:18:43 -07:00
Kevin Serrano 6f0c0e8374
Add test to look for wei precision. 2017-10-09 12:12:54 -07:00
Kevin Serrano 5ae5ee9a20
Merge branch 'master' into precision-fix 2017-10-09 11:54:16 -07:00
Sergey Ukustov 53bb4bebb1 More appropriate styling 2017-10-07 23:25:40 +03: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 9adf77e3fe Merge pull request #2306 from MetaMask/i2294-MarkTxAsFailedAfterSameNonceIsMined
Mark tx as failed after tx with same nonce is mined
2017-10-06 13:17:45 -07:00
kumavis 0b6dab384f Merge branch 'nodeify' of github.com:MetaMask/metamask-extension into nodeify 2017-10-06 13:17:06 -07:00
kumavis 3b3120c5f8 nodeify - fix test 2017-10-06 13:16:44 -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 a32d71e8ed Add failing test for issue #2294 2017-10-06 12:29:27 -07:00
Dan Finlay 0146b55d6d Check status of pending transactions on startup
Fixes #1531
2017-10-06 11:41:28 -07:00