645 Commits

Author	SHA1	Message	Date
Chi Kei Chan	344b467d03	Merge branch 'master' into NewUI-flat	2017-10-20 11:05:10 -07:00
Dan Finlay	a10a600cce	Linted	2017-10-19 12:33:43 -07:00
Chi Kei Chan	c8c773d641	Merge branch 'NewUI-flat' into merge	2017-10-18 22:58:46 -07:00
Dan Finlay	bbe2c9f48d	Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault	2017-10-18 17:07:25 -07:00
Dan Finlay	d89394a7c9	Make account tracking much more reactive	2017-10-18 17:07:22 -07:00
kumavis	8da0d0b28a	Revert "NetworkController refactor for new EthClient interface"	2017-10-18 15:09:32 -07:00
Dan Finlay	75177ce34c	Make account tracking more reactive ... We were doing a lot of conditional observation & updating. Pulled out a bunch of that for generic observer/syncers.	2017-10-18 15:08:34 -07:00
kumavis	dcf10f3d75	nonce-tracker - use blockTracker directly	2017-10-11 18:33:36 -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
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
Chi Kei Chan	bd99bc2e88	Merge branch 'master' into NewUI-flat	2017-10-03 16:02:58 -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
frankiebee	ac80eaca1f	pending-tx - dont check the balance to rebrodcast	2017-09-29 12:54:05 -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	7d499df8e3	account-tracker - remove unused import	2017-09-27 14:12:45 -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	8d3fec42d0	Fix bug where block gas limit was incorrectly parsed.	2017-09-27 12:09:32 -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
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