Chi Kei Chan
c8c773d641
Merge branch 'NewUI-flat' into merge
2017-10-18 22:58:46 -07:00
kumavis
8da0d0b28a
Revert "NetworkController refactor for new EthClient interface"
2017-10-18 15:09:32 -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
d0d082d70c
Merge branch 'master' into i1340-SynchronousInjection
2017-10-12 13:25:19 -04:00
kumavis
dcf10f3d75
nonce-tracker - use blockTracker directly
2017-10-11 18:33:36 -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
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
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
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
Dan Finlay
1cba6543a4
Begin implementing sync injection idea
2017-10-04 15:35:04 -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
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
kumavis
1ad8a9a0ff
network - make network controller internal network switching explicit
2017-09-29 17:10:34 -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
