3380 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
frankiebee	aeefcbd75b	Fix test to match behavior	2017-07-12 15:10:52 -07:00
frankiebee	bd26ec46aa	mv updateAndApproveTx to txController	2017-07-12 15:07:56 -07:00
frankiebee	da35f6744e	use new nodeify	2017-07-12 15:06:49 -07:00
frankiebee	231ad48564	Use txParams	2017-07-11 12:52:56 -07:00
frankiebee	971d25a8ab	Merge branch 'master' into nonce-tracker	2017-07-11 12:41:03 -07:00
kumavis	a1fd9bc6be	Merge pull request #1762 from MetaMask/ImproveRetryLogic ... Improve retry logic	2017-07-11 12:29:20 -07:00
Dan Finlay	c7b9e3fb18	Improve insufficient balance checking in retry loop	2017-07-11 12:19:01 -07:00
frankiebee	a670e54973	Merge branch 'nonce-tracker' of https://github.com/MetaMask/metamask-plugin into nonce-tracker	2017-07-11 12:18:44 -07:00
frankiebee	c121ac21ec	remove irrelevan code	2017-07-11 12:16:08 -07:00
kumavis	0eee232e26	Merge pull request #1761 from MetaMask/resubmimtErrors ... add "Gateway timeout"	2017-07-11 12:05:00 -07:00
frankiebee	611338c4e0	use .includes	2017-07-11 12:01:59 -07:00
Dan Finlay	d97c6533b8	Remove local nonce error setting.	2017-07-11 12:00:17 -07:00
frankiebee	11d57adc5c	add "Gateway timeout" to ignored errors when resubmiting and use .includes over .startsWith	2017-07-11 11:57:42 -07:00
Frankie	2d1b7c0ee1	Merge pull request #1757 from MetaMask/resubmit-fix ... Resubmit fix	2017-07-07 19:36:40 -07:00
kumavis	512b6cae81	migration 16 - move resubmit warning back to submitted state	2017-07-07 19:31:27 -07:00
kumavis	c425ad4ec7	tx controller - resubmit - correctly set error on bad nonce/balance	2017-07-07 19:13:06 -07:00
kumavis	c53aac398a	tx controller - correctly set error message on resubmit error	2017-07-07 19:09:32 -07:00
kumavis	4fa999e4de	tx controller - resubmit - recognize parity known hash message	2017-07-07 19:02:34 -07:00
kumavis	fd6caf8713	Merge pull request #1754 from MetaMask/Version-3.8.4 ... Version 3.8.4	2017-07-07 18:56:37 -07:00
kumavis	f5de16c911	test - tx controller - fix promise handling	2017-07-07 14:32:03 -07:00
kumavis	ab8bae421e	test - tx-controller - stub block-tracker method	2017-07-07 14:26:52 -07:00
kumavis	d228f46254	Merge branch 'master' into nonce-tracker	2017-07-07 14:21:43 -07:00
Dan Finlay	04a0b949a2	Version 3.8.4	2017-07-07 11:24:33 -07:00
kumavis	678cfd2175	Merge pull request #1750 from MetaMask/failIfError ... Fail if error	2017-07-07 03:23:34 -07:00
frankiebee	092a9c9def	fail transactions that fail in resubmit	2017-07-07 03:05:39 -07:00
kumavis	34e2f6650d	tx controller - clean code	2017-07-07 01:50:48 -07:00
kumavis	8661989f51	tx controller - move comments	2017-07-07 01:37:45 -07:00
frankiebee	9955668409	add comment	2017-07-06 23:10:04 -07:00
frankiebee	11b744bb87	if an error happens during a tx publication set tx status to fail	2017-07-06 22:30:25 -07:00
Thomas Huang	47936019d2	Merge pull request #1748 from MetaMask/Version-3.8.3 ... Version 3.8.3	2017-07-06 10:19:22 -07:00
Dan Finlay	289fdfb701	Version 3.8.3	2017-07-06 10:05:51 -07:00
Dan Finlay	33c2b864db	Merge pull request #1747 from MetaMask/FailingTestForFailingLowBalanceTx ... Fail txs on retry if balance is insufficient	2017-07-06 10:03:06 -07:00
Dan Finlay	b87d10ab1d	Bump changelog	2017-07-05 23:26:58 -07:00
Dan Finlay	07d4e4fe6f	Fix failing test	2017-07-05 23:24:33 -07:00
Dan Finlay	96df7ad8d3	Add missing done	2017-07-05 23:04:51 -07:00
Dan Finlay	ef1282b556	Typo fix	2017-07-05 22:48:11 -07:00
Dan Finlay	b2f6ae9ace	Merge branch 'FailLowBalance' into FailingTestForFailingLowBalanceTx	2017-07-05 22:43:56 -07:00
Dan Finlay	3abceac55d	Fail pending txs with low balance or invalid nonce	2017-07-05 22:43:31 -07:00
Dan Finlay	a915dfdeaa	Add failing test for retrying an over-spending tx	2017-07-05 22:36:52 -07:00
kumavis	8201ae1b53	Merge pull request #1742 from MetaMask/TokenSymbolMisspelled ... Fix spelling	2017-07-05 22:05:32 -07:00
tmashuang	5c1ccc657c	Fix spelling	2017-07-05 13:42:15 -07:00
frankiebee	51ff6d74e8	clean up unused code from old noncelock	2017-07-05 12:07:34 -07:00
frankiebee	6d2cddaac9	fix nonce calculation order	2017-07-05 12:00:42 -07:00
kumavis	8aab5d965b	Merge pull request #1741 from MetaMask/ReEnableTokenList ... Reenable Default Token List	2017-07-05 10:38:14 -07:00
Dan Finlay	52a6b9f103	Reenable Default Token List ... Looks pretty clear to me now that the heavy traffic spike was not this feature, but was the EOS crowdsale. Now that we've mitigated their traffic spike, I think we can safely re-introduce this feature.	2017-07-05 10:30:48 -07:00
Dan Finlay	ce3d374d80	Merge pull request #1739 from MetaMask/origin-header ... metamask - append dapp origin domain to rpc request	2017-07-05 10:27:21 -07:00
kumavis	68fc3603df	metamask - append dapp origin domain to rpc request	2017-07-04 12:48:00 -07:00
Thomas Huang	bc844ac80a	Merge pull request #1733 from MetaMask/Version-3.8.2 ... Version 3.8.2	2017-07-03 18:27:01 -07:00
Dan Finlay	af8015c1c5	Version 3.8.2	2017-07-03 18:06:47 -07:00
Kevin Serrano	ba4a7de1a2	Merge pull request #1727 from MetaMask/i1720-NoSpinnerOnConfig ... No longer show network spinner on config screen	2017-07-03 15:30:51 -07:00