3788 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Finlay	df78020c18	Version 3.9.10	2017-08-23 11:51:10 -07:00
Dan Finlay	d836e281de	Merge pull request #1945 from MetaMask/useLocalNonce ... Use local nonce	2017-08-23 11:50:27 -07:00
Dan Finlay	09235a5924	Merge branch 'master' into useLocalNonce	2017-08-23 11:14:25 -07:00
Dan Finlay	1d7781da6b	Bump changelog	2017-08-23 11:13:35 -07:00
Dan Finlay	b3b62d97a3	Merge branch 'master' into useLocalNonce	2017-08-23 11:12:46 -07:00
Dan Finlay	a1618ca1b4	Fix format of changelog	2017-08-23 11:12:44 -07:00
Kevin Serrano	86d3169423	Merge pull request #1960 from MetaMask/RemoveTxViz ... Remove eth-tx-viz link from tx history icons	2017-08-23 10:29:20 -07:00
Dan Finlay	e0ccdcd6fd	Remove eth-tx-viz link from tx history icons	2017-08-23 09:40:24 -07:00
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
Dan Finlay	38ba31bbe0	Refer to pending nonces, not just their count	2017-08-21 17:29:31 -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	e43db262d8	fix test	2017-08-21 16:44:29 -07:00
Dan Finlay	bb24f07b17	When network nonce is highest, it should be used.	2017-08-21 11:59:51 -07:00
Dan Finlay	0f36e0e6da	Fix test	2017-08-21 11:57:42 -07:00
Dan Finlay	440101f2b5	Add new assertions and de-duplicate nonce tracker generation	2017-08-21 11:52:41 -07:00
Dan Finlay	306249e89e	Add test for no previous txs	2017-08-21 11:39:22 -07:00
Dan Finlay	f13c637b23	Confine mock strategy to describe block	2017-08-21 11:37:39 -07:00
Dan Finlay	c76194d7c3	Move mock txs to tx mocking class	2017-08-21 11:35:51 -07:00
Thomas Huang	9203b4edf9	Merge pull request #1946 from MetaMask/Version-3.9.9 ... Version 3.9.9	2017-08-18 16:38:00 -07:00
Dan Finlay	f24cfea35e	Version 3.9.9	2017-08-18 16:12:36 -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	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
frankiebee	bf8a62eb39	add test for using localNonce	2017-08-18 13:53:18 -07:00
Dan Finlay	e0c35179c2	Merge pull request #1914 from MetaMask/history-diff ... Move Tx State History to diff-based format	2017-08-18 13:14:17 -07:00
Kevin Serrano	729233a288	Merge pull request #1941 from MetaMask/i1912-TokenPrecisionFix ... Fix token balance precision rendering	2017-08-18 10:55:07 -07:00
Kevin Serrano	7e6c714f78	Merge branch 'master' into i1912-TokenPrecisionFix	2017-08-18 10:48:55 -07:00
Thomas Huang	31e5a4f050	Merge pull request #1942 from MetaMask/i1903-EthSignFormat ... Fix "Eth Sign" format	2017-08-17 15:52:39 -07:00
Dan Finlay	c90ff2847f	Bump changelog	2017-08-17 15:35:52 -07:00
Dan Finlay	98bedfabf9	Fix eth sign formatting	2017-08-17 15:35:17 -07:00
Dan Finlay	d7a34514b0	Fix token balance precision rendering ... Fixes a bug where balances under 1 token could be mis-rendered by fixing it [here](https://github.com/MetaMask/eth-token-tracker/pull/9) then updating us to `eth-token-tracker@1.1.3`. Fixes #1912	2017-08-17 14:53:08 -07:00
Frankie	5f9862c89e	Merge pull request #1935 from MetaMask/i1091-ShowTxErrors ... Transition home after tx errors	2017-08-17 10:29:08 -07:00
Dan Finlay	f684b53b69	Remove dead tests	2017-08-16 17:17:05 -07:00
Dan Finlay	e3a5c3684d	Bump changelog	2017-08-16 17:06:45 -07:00
Dan Finlay	343a7e9cce	Transition to home view after tx error	2017-08-16 17:06:21 -07:00
Thomas Huang	9b57c77cb8	Merge pull request #1933 from MetaMask/Version-3.9.8 ... Version 3.9.8	2017-08-16 16:35:20 -07:00
Dan Finlay	27d030b1a1	Version 3.9.8	2017-08-16 15:43:34 -07:00
Kevin Serrano	0477e08a6d	Merge pull request #1928 from MetaMask/RemoveDefaultTokens ... Remove default tokens	2017-08-16 13:38:21 -07:00
Dan Finlay	9fbdeab3de	Fallback to ethplorer link	2017-08-16 12:55:34 -07:00