83 Commits

Author	SHA1	Message	Date
tmashuang	bda52f7cba	Infura Network response tests	2017-07-14 10:34:03 -07:00
Frankie	9d3207fb73	Merge pull request #1617 from MetaMask/nonce-tracker ... transaction controller - use nonce-tracker	2017-07-13 15:48:50 -04:00
frankiebee	7eccf5905a	make publishTransaction and signTransaction async methods	2017-07-13 15:25:43 -04:00
frankiebee	27cb02bc58	add "nonce too low" to the ignored errs list for tx retrys	2017-07-12 19:03:34 -07:00
frankiebee	bd26ec46aa	mv updateAndApproveTx to txController	2017-07-12 15:07: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
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
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	d228f46254	Merge branch 'master' into nonce-tracker	2017-07-07 14:21:43 -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
Dan Finlay	07d4e4fe6f	Fix failing test	2017-07-05 23:24:33 -07:00
Dan Finlay	3abceac55d	Fail pending txs with low balance or invalid nonce	2017-07-05 22:43:31 -07:00
frankiebee	51ff6d74e8	clean up unused code from old noncelock	2017-07-05 12:07:34 -07:00
Thomas Huang	ffd3773ef3	Merge pull request #1620 from MetaMask/i1616-AddTokenAdding ... Add ability to add tokens to token list	2017-06-28 10:07:49 -07:00
Dan Finlay	ddba2af415	Merge pull request #1509 from MetaMask/i1473-dappDefaultGasPrice ... I1473 dapp default gas price	2017-06-27 21:00:08 -07:00
frankiebee	690685d20d	nonce-tracker: only check transactions that are not supposed to be ignored	2017-06-27 16:46:33 -07:00
frankiebee	0ee4502d71	calculate nonce based on local pending txs w/o error state.	2017-06-27 15:26:04 -07:00
frankiebee	db2836a1ae	dont stop retrying brodcasting txs	2017-06-27 14:19:28 -07:00
frankiebee	847a4282a2	Merge branch 'master' into nonce-tracker	2017-06-27 13:10:56 -07:00
Thomas Huang	1977417017	Merge branch 'master' into i1473-dappDefaultGasPrice	2017-06-27 10:32:28 -07:00
Thomas Huang	8b5b2d8329	Merge pull request #1663 from MetaMask/infura-status ... Add Infura Status Information to UI State	2017-06-26 12:06:23 -07:00
Kevin Serrano	f9f0f6f9ef	Add infura network status to our UI state.	2017-06-22 12:32:34 -07:00
Kevin Serrano	b7f8657ab5	Add infura network status to our UI state.	2017-06-22 12:32:08 -07:00
frankiebee	92df9965eb	fix nonceTracker	2017-06-21 19:51:00 -07:00
Dan Finlay	41d992cca9	Merge branch 'AddTokenList' into i1616-AddTokenAdding	2017-06-19 19:03:49 -07:00
Thomas Huang	235cb1f2d7	Keeps dapp gas price if set	2017-06-19 17:50:06 -07:00
Kevin Serrano	9da243f42d	Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTokenList	2017-06-19 13:51:38 -07:00
frankiebee	0d8c02db35	Merge branch 'master' into nonce-tracker	2017-06-16 17:07:12 -07:00
Frankie	ac728189e1	Merge branch 'master' into i1567-FixInaccurateError	2017-06-16 16:46:13 -07:00
frankiebee	9c2ead3d52	put event back on the "blockTracker:/provider"	2017-06-16 16:43:38 -07:00
frankiebee	5f8e74e0aa	put the block listeners back on the provider	2017-06-16 16:36:32 -07:00
Dan Finlay	48789f2a3d	Add ability to add tokens to token list ... Fiex #1616	2017-06-15 16:22:53 -07:00
frankiebee	f76a555c09	Merge branch 'master' into i1567-FixInaccurateError	2017-06-15 14:28:10 -07:00
kumavis	41a1ce037b	Merge pull request #1611 from MetaMask/checkTxsOnSync ... add a check for weather a tx is included in a block when jumping blocks	2017-06-15 14:12:14 -07:00
kumavis	27b874f2c4	transactions controller - add comments	2017-06-15 14:08:07 -07:00
frankiebee	2e5deef2b0	check nonce and balance when resubmiting tx	2017-06-15 13:48:48 -07:00
Dan Finlay	39c7ed230d	Merge remote-tracking branch 'origin/master' into AddTokenList	2017-06-15 13:44:58 -07:00
kumavis	b3492d9c17	transaction controller - use nonce-tracker	2017-06-14 23:44:02 -07:00