1247 Commits

Author	SHA1	Message	Date
kumavis	e294aa7e0d	inpage - lint fix	2017-08-28 10:41:01 -07:00
kumavis	cc56d0d2f6	inpage - use json-rpc-engine for inpage-provider	2017-08-24 15:44:40 -07:00
kumavis	9ce82640f2	Merge pull request #1973 from MetaMask/hotfix-migration019 ... hotfix - fail submitted txs whos nonce is out of bound	2017-08-24 00:15:24 -07:00
frankiebee	c2624dd1a0	fall back to latest if blockNumber is null	2017-08-24 00:02:06 -07:00
Dan Finlay	803e696cdc	Make method return a number	2017-08-23 23:24:01 -07:00
Dan Finlay	17a71a9b4c	Only cancel pending txs with non continuously high nonces	2017-08-23 23:13:42 -07:00
frankiebee	f42687d25f	fix description	2017-08-23 22:53:29 -07:00
frankiebee	dadee1ed79	hotfix - fail submitted txs whos nonce is out of bound	2017-08-23 22:50:40 -07:00
Dan Finlay	0ad310e096	Fail transactions after a day of retries	2017-08-23 22:29:08 -07:00
Dan Finlay	c620123fab	Enforce nonces as type string	2017-08-23 21:50:28 -07:00
Dan Finlay	a122ec1f8b	Use toNumber method	2017-08-23 21:37:07 -07:00
Dan Finlay	55c1a259b1	Fix network nonce parsing	2017-08-23 21:14:46 -07:00
Dan Finlay	855f4eeacb	Pass nonce tests	2017-08-23 20:43:47 -07:00
Dan Finlay	04d40b114d	Got all tests but one passing	2017-08-23 20:11:37 -07:00
Dan Finlay	221575a191	Fix new test, break an older maybe wrong one	2017-08-23 20:04:03 -07:00
Dan Finlay	c4ab7a5779	Linted	2017-08-23 19:35:49 -07:00
Dan Finlay	1f0223d0a0	Simplify nonce calculation	2017-08-23 19:34:20 -07:00
kumavis	4019f318fe	inpage provider - autoreload - improve readability	2017-08-23 16:44:57 -07:00
kumavis	44dc2ba712	inpage provider - only warn web3 usage once per session	2017-08-23 16:26:55 -07:00
kumavis	53e410167b	inpage provider - sync rpc - default to null values	2017-08-23 16:13:33 -07:00
Dan Finlay	b3b62d97a3	Merge branch 'master' into useLocalNonce	2017-08-23 11:12:46 -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
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	fbba3a1ac8	Merge branch 'master' into transactionControllerRefractorPt3	2017-08-21 11:35:22 -07:00
frankiebee	7ea83b6bae	Create TxStateManager	2017-08-21 10:29:10 -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	e9712a13ec	Create tests for TxStateManager	2017-08-18 14:11:18 -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
kumavis	588b8f0d39	migration 18 - activate	2017-08-14 20:06:15 -07:00
kumavis	ac2b572c34	migration 18 - fix an oops	2017-08-14 20:05:57 -07:00
kumavis	1af797b1b3	tx controller - tx state history various small fixes	2017-08-14 19:15:36 -07:00
kumavis	accd057b1a	migration 18 - move to diff-based history	2017-08-14 18:46:18 -07:00
kumavis	fdffb6fedc	introduce tx-state-history-helper and diff-based history	2017-08-14 18:46:04 -07:00
frankiebee	66a012550e	fix wording	2017-08-11 15:54:52 -07:00
frankiebee	ac9e84ff40	add deprecation warning for web3	2017-08-11 15:52:03 -07:00
Thomas Huang	1071a35f7b	Merge pull request #1883 from MetaMask/estimateGas-fix ... tx utils - detect estimateGas err and set simulationFailed	2017-08-09 14:03:02 -07:00
kumavis	245125eb18	ui - buy eth - formatting and moved network names to config	2017-08-09 12:25:38 -07:00
kumavis	b4052cd5e6	tx utils - detect estimateGas err and set simulationFailed	2017-08-08 23:34:18 -07:00
kumavis	25f9746dab	tx controller - fix error serialization	2017-08-08 21:09:28 -07:00
kumavis	5e6962342d	tx controller - fix getBalance fn	2017-08-08 21:08:30 -07:00
kumavis	5418813ed1	util - sufficientBalance - validate input	2017-08-08 21:05:59 -07:00
Frankie	d40bd9a726	Merge pull request #1880 from MetaMask/pendingFix ... fix getPendingTransactions function for pendingTxTracker	2017-08-08 22:00:17 -04:00
frankiebee	9c9165e930	filter by network for pending txs	2017-08-08 21:54:26 -04:00
frankiebee	5bb84f6e21	fix getPendingTransactions function for pendingTxTracker	2017-08-08 21:49:48 -04:00
kumavis	922ecb9149	Merge branch 'master' into greenkeeper/initial	2017-08-08 16:23:14 -07:00
frankiebee	a13643bdb5	fix class names	2017-08-08 18:30:49 -04:00
frankiebee	3a2190ec3c	fix the bind on pending tx watchers	2017-08-07 16:58:38 -04:00
frankiebee	f3b42f1e33	Merge branch 'master' into transactionControllerRefractor	2017-08-07 16:24:58 -04:00
frankiebee	59124eb6fd	remove logging of the message and log the error	2017-08-07 14:45:43 -04:00
frankiebee	a54c26382e	remove unnecessary if statment for error message	2017-08-07 14:40:07 -04:00
frankiebee	fb9866b4e1	fix spelling	2017-08-07 14:37:20 -04:00
kumavis	78aa957e5a	Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial	2017-08-07 10:52:08 -07:00
kumavis	1be8053cca	blacklist - update phishing on boot and speed up polling to 4 min	2017-08-04 13:51:48 -07:00
frankiebee	08f49ab35f	rename PendingTransactionUtils -> PendingTransactionWatchers	2017-08-04 14:50:34 -04:00
frankiebee	89a4fef1e4	Merge branch 'master' into transactionControllerRefractor	2017-08-04 14:45:22 -04:00
frankiebee	087cd9fb1a	break out tx status pendding watchers	2017-08-04 14:41:35 -04:00
frankiebee	caee2a9e35	move util functions to util.js	2017-08-04 13:55:00 -04:00
kumavis	c4cb371ce8	Merge pull request #1857 from MetaMask/hotFixCancleTx ... fix cancelTransaction not receiving a callback	2017-08-03 21:01:13 -07:00
frankiebee	7de58c8709	fix cancelTransaction not reciving a callback	2017-08-03 21:22:08 -04:00
kumavis	da16f39626	Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial	2017-08-03 15:05:32 -07:00
kumavis	da7471e095	lint fixes	2017-08-03 14:48:19 -07:00
kumavis	34b1e80088	Merge branch 'master' of github.com:MetaMask/metamask-plugin into blacklist-refactor2	2017-08-03 14:28:48 -07:00
kumavis	d4877cb4e2	blacklist - use module eth-phishing-detect	2017-08-03 14:25:02 -07:00
frankiebee	dce593fd7b	remove stack from txs	2017-08-03 15:39:55 -04:00
kumavis	8a9d0073b1	Merge pull request #1848 from MetaMask/transactionControllerRefractor ... Transaction controller refractor part 1: promises for everyone and more tests!	2017-08-02 19:57:16 -07:00
frankiebee	b471afcdb3	use error for #approveTransaction when setting failed	2017-08-02 19:24:34 -04:00
frankiebee	340dbe75fc	use async with #publishTransaction	2017-08-02 19:09:37 -04:00
frankiebee	b80c7e417b	move newUnapprovedTransaction to transactions.js	2017-08-02 18:59:34 -04:00
kumavis	8c6f01b910	blacklist controller - breakout from metamask and infura controllers	2017-08-02 15:54:59 -07:00
kumavis	ecaa235b5e	phishing detection - move phishing detection into contentscript and metamask controller	2017-08-02 14:26:10 -07:00
kumavis	aea5735b29	obj-multiplex - missing name error + prefer const over var	2017-08-02 14:25:28 -07:00
frankiebee	25bc15ba17	lint fixes	2017-08-02 11:47:13 -04:00
frankiebee	25cffd21f8	Merge branch 'master' into transactionControllerRefractor	2017-08-02 11:41:29 -04:00
frankiebee	ece9200c72	fix spelling mistake	2017-08-02 11:36:07 -04:00
frankiebee	3a4726018e	fix addTxDefaults	2017-08-02 11:35:35 -04:00
frankiebee	432f516ab0	make addUnapprovedTransaction async function and use promise based ethQuery	2017-08-02 10:26:25 -04:00
Dan Finlay	6675241fa9	Merge branch 'master' into i1805-LiveBlacklistUpdating	2017-07-26 16:46:59 -07:00
Dan Finlay	8b1726cc55	Live update blacklist from Infura	2017-07-26 16:30:54 -07:00
Dan Finlay	f147b928b2	Merge branch 'master' into i1805-LiveBlacklistUpdating	2017-07-26 15:32:19 -07:00
Kevin Serrano	aa282b4e3a	Give credit where it is due	2017-07-26 15:31:16 -07:00
Kevin Serrano	66f6d5a4e0	Add levenshtein logic to blacklister.	2017-07-26 15:25:30 -07:00
Dan Finlay	3d8ebf2265	Begin implementing live-updating blacklist, not working yet	2017-07-26 12:27:16 -07:00
kumavis	35a128db1e	nonce-tracker - hotfix for provider proxying	2017-07-26 11:37:00 -07:00
kumavis	b15a2baaf3	nonce-tracker - add raw baseNonceHex to nonceDetails	2017-07-26 11:09:02 -07:00
kumavis	7e2e4948a6	tx cont - dont recursively store history	2017-07-26 10:57:47 -07:00
kumavis	de2cf4e9cd	Merge branch 'master' of github.com:MetaMask/metamask-plugin into betterErrorsOnTx	2017-07-26 10:43:36 -07:00
kumavis	0ef90fb1f0	tx controller + nonce tracker - record nonce components on txMeta	2017-07-26 10:40:08 -07:00
kumavis	39d28922de	nonce-tracker - validation - add validation failing value type to error message	2017-07-26 10:16:08 -07:00
kumavis	f16802e2d4	nonce-tracker - validation - add validation failing value to error message	2017-07-26 10:15:35 -07:00
frankiebee	30cbe74ba6	Merge branch 'betterErrorsOnTx' of https://github.com/MetaMask/metamask-extension into betterErrorsOnTx	2017-07-25 18:33:52 -04:00
frankiebee	ba88f7b8dd	fix typo	2017-07-25 18:29:02 -04:00
Frankie	a929fb2387	Merge branch 'master' into betterErrorsOnTx	2017-07-25 18:26:41 -04:00
frankiebee	b81f883150	fix stack wording	2017-07-25 18:23:26 -04:00
frankiebee	1df833bee8	use clone	2017-07-25 18:21:40 -04:00
frankiebee	e0a626da3b	remove line numbers	2017-07-25 18:02:21 -04:00
kumavis	4445ba1569	tx cont - add argument for provider constructor	2017-07-25 14:36:19 -07:00
kumavis	5b9a6bd367	tx cont - remove old cb from async fn	2017-07-25 13:16:46 -07:00
frankiebee	ab01358a48	Add stack traces both in errors and as a way to track txMetas	2017-07-25 16:08:31 -04:00
kumavis	12d6f21627	transactions - block nonce-tracker while updating pending transactions	2017-07-18 15:27:15 -07:00
kumavis	aa48ed34c4	nonce-tracker - fix lock mechanism to be a real mutex	2017-07-18 15:11:29 -07:00
kumavis	67fdba5e42	transaction - promisify _checkPendingTxs	2017-07-18 14:00:43 -07:00
kumavis	d249da77d7	nonce-tracker - return nonce as integer	2017-07-18 13:59:56 -07:00
kumavis	4f9fc8014a	nonce-tracker - validate nonce calc components	2017-07-18 12:48:16 -07:00
frankiebee	948f3880a3	turn off auto faucet and remove file	2017-07-17 17:37:01 -04:00
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
kumavis	3d082203ec	Merge pull request #1771 from MetaMask/addNonceErrToErrLIst ... Add nonce err to err list	2017-07-12 23:41:26 -07:00
frankiebee	6086bcdf0d	limit the range for retryCount	2017-07-12 20:01:07 -07:00
frankiebee	de0cd6e663	write a migration for resubmit tx's to get put back into a submitted state	2017-07-12 19:03:35 -07:00
frankiebee	27cb02bc58	add "nonce too low" to the ignored errs list for tx retrys	2017-07-12 19:03:34 -07:00
frankiebee	751103d948	Merge branch 'master' into nonce-tracker	2017-07-12 15:10:58 -07:00
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
Dan Finlay	52b92fbe40	Add first version of phishing site warning ... Links to my own blacklist for now, since I added a package.json for easy importing. We can point at the main 408H repository once this is merged: https://github.com/409H/EtherAddressLookup/pull/24 Redirects detected phishing sites [here](https://metamask.io/phishing.html).	2017-07-12 13:09:20 -07:00
kumavis	9f46984fee	metamask - on rpc err show whole error body	2017-07-11 14:17:47 -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
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	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	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
frankiebee	6d2cddaac9	fix nonce calculation order	2017-07-05 12:00:42 -07:00
kumavis	68fc3603df	metamask - append dapp origin domain to rpc request	2017-07-04 12:48:00 -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
Dan Finlay	b9f220c90d	Merge pull request #1685 from MetaMask/setFailed ... Migration #015 set txs Failed	2017-06-27 15:33:32 -07:00
frankiebee	0ee4502d71	calculate nonce based on local pending txs w/o error state.	2017-06-27 15:26:04 -07:00
frankiebee	4e0ec74bb7	Create a migration for setting tx's with the message 'Gave up submitting tx.' as failed	2017-06-27 15:09:07 -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
Kevin Serrano	92da8bc578	Fix error message for invalid seed words.	2017-06-26 16:14:35 -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
Dan Finlay	06706f6e1b	Merge branch 'master' into i1616-AddTokenAdding	2017-06-23 08:50:44 -04:00
Kevin Serrano	f022c7c714	Merge pull request #1603 from MetaMask/AddTokenList ... Add popular token list	2017-06-22 17:28:10 -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	abbbe1156c	Merge branch 'master' into nonce-tracker	2017-06-21 19:52:28 -07:00
frankiebee	92df9965eb	fix nonceTracker	2017-06-21 19:51:00 -07:00
frankiebee	fa8c74fe9b	add a test for #getNonceLock	2017-06-21 17:28:19 -07:00
Kevin Serrano	044c16219b	Fix badge number to include personal_sign	2017-06-20 15:38:23 -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
Frankie	42f3ccd9dc	Merge pull request #1623 from MetaMask/checkTxs ... Check txs	2017-06-16 16:44:59 -07:00
frankiebee	9c2ead3d52	put event back on the "blockTracker:/provider"	2017-06-16 16:43:38 -07:00
frankiebee	3e359d6a6a	Merge branch 'master' into i1567-FixInaccurateError	2017-06-16 16:39:52 -07:00
frankiebee	5f8e74e0aa	put the block listeners back on the provider	2017-06-16 16:36:32 -07:00
Dan Finlay	06f6aa7a00	Debounce background updates ... Our background sometimes emits absurd quantities of updates very quickly. This PR reduces the amount of inter-process traffic by ensuring the `sendUpdate` method does not fire more than every 200 ms. Fixes #1621	2017-06-15 18:01:10 -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
kumavis	dab2fccc78	introduce nonce-tracker	2017-06-14 22:16:14 -07:00
frankiebee	07539a63e4	remove unnecessary log	2017-06-14 21:52:49 -07:00
frankiebee	a10740af7e	add a check for weather a tx is included in a block when jumping blocks	2017-06-14 20:17:59 -07:00
frankiebee	6ae97290f0	check for the tx in the block that provider engine gives us	2017-06-14 17:43:04 -07:00
Dan Finlay	6fda78cd2b	Refresh token balance on network change	2017-06-14 15:21:51 -07:00
Dan Finlay	b7b9e0c1ac	Persist selected account tab ... Also improve error handling with token balances.	2017-06-14 14:21:50 -07:00
Dan Finlay	0fd32e67d4	Do not mark slowly mined txs as failed. ... Fixes #1567 Also seems to fix #1556 Also improves resubmit performance by only resubmitting on `latest`.	2017-06-14 12:01:45 -07:00
Dan Finlay	dd7e11d196	Merge pull request #1598 from MetaMask/txRetry ... put tx resubmission on the block event	2017-06-13 10:45:21 -07:00
frankiebee	ec3383c162	rename continuallyResubmitPendingTxs to resubmitPendingTxs	2017-06-13 09:50:01 -07:00
Thomas Huang	ae7c296669	Fix networkState in chain id	2017-06-12 17:44:11 -07:00
Dan Finlay	a741cc4fc4	Merge branch 'master' into AddTokenList	2017-06-12 17:17:16 -07:00