1098 Commits

Author	SHA1	Message	Date
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
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
frankiebee	96fa29ffbc	put tx resubmission on the block event	2017-06-12 16:11:37 -07:00
Kevin Serrano	203a573f3f	Use new URL for currency API from cryptonator.	2017-06-05 16:23:56 -07:00
frankiebee	db982cf795	stop polling when switching networks	2017-05-24 11:52:18 -04:00
Frankie	97ea7454b3	Merge branch 'master' into networkController	2017-05-23 20:36:11 -04:00
frankiebee	243eeff7cb	Fix for tests	2017-05-23 19:49:57 -04:00
Dan Finlay	e4d09aebf4	Cleanup	2017-05-23 14:49:10 -07:00
Dan Finlay	cd2ad1733d	Continually resubmit pending txs	2017-05-23 12:22:15 -07:00
frankiebee	529304c005	Wrap the provider in a proxy	2017-05-23 01:56:10 -04:00
frankiebee	13a41f3129	Merge branch 'master' into networkController	2017-05-22 19:48:10 -04:00
frankiebee	f87ea49b5a	Create a network controller to manage switcing networks an updating the provider	2017-05-19 00:14:10 +02:00
Dan Finlay	68d6ea44a0	Fix path references	2017-05-16 11:39:00 -07:00
Dan Finlay	2df9344be5	Rename tx manager to tx controller	2017-05-16 10:35:28 -07:00
Thomas Huang	6bdb4c8728	Fix linting warnings	2017-04-26 21:05:45 -07:00
Kevin Serrano	4933e2e2ee	Limit the number of addresses stored in our book.	2017-03-13 16:37:53 -07:00
Kevin Serrano	7dcab52a9e	Connect keyring controller to address book to prevent additional duplicates.	2017-03-10 10:34:46 -08:00
Kevin Serrano	7182a2be43	Improve duplicate checking in address book.	2017-03-10 10:05:10 -08:00
Kevin Serrano	2ab86b001d	Add comments.	2017-03-10 09:34:13 -08:00
Kevin Serrano	b296640f1b	Rename functions for consistency.	2017-03-09 15:09:50 -08:00
Kevin Serrano	9f6c040554	Create persistence address book.	2017-03-09 13:58:42 -08:00
Kevin Serrano	d270cbc9d2	Create distinct labels and names for addresses.	2017-03-09 13:07:38 -08:00
Kevin Serrano	e7e024bcdd	Refactor of code into separate reducers and actions.	2017-03-07 16:01:51 -08:00
Kevin Serrano	e66035254f	More conflict resolution.	2017-03-01 10:04:25 -08:00
Dan Finlay	b5d03cd524	add controllers to root scripts folder	2017-02-27 10:40:37 -08:00