4314 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
frankiebee	0a94ec41d3	pending-tx - move incrementing of the retryCount on the txMeta outside pending-tx-tracker	2017-09-26 22:42:59 -07:00
kumavis	1877c0766c	Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOutKeyringController	2017-09-26 21:42:30 -07:00
frankiebee	b05a6f89cb	fix tests	2017-09-26 18:19:44 -07:00
frankiebee	36ddaf220d	Merge branch 'transactionControllerRefractorPt3' of https://github.com/MetaMask/metamask-extension into transactionControllerRefractorPt3	2017-09-26 18:16:00 -07:00
frankiebee	508696f71d	transactions: reveal #getFilteredTxList from txStateManage and fix accountTracker.store reference	2017-09-26 18:12:53 -07:00
frankiebee	80c98b1653	transactions: make evnt names pretty and eaiser to read	2017-09-26 16:55:11 -07:00
frankiebee	9fd5458112	transactions: lint fixes and reveal status-update event for balance controller	2017-09-26 16:54:04 -07:00
frankiebee	8ab23c713d	Merge branch 'master' into transactionControllerRefractorPt3	2017-09-26 16:24:43 -07:00
Kevin Serrano	e998d528f0	Merge branch 'master' into RemoveSlackLink	2017-09-26 15:47:31 -07:00
Kevin Serrano	6ca519e97c	Merge pull request #2183 from MetaMask/Fix2094 ... Fix 2094 related issues	2017-09-26 15:17:24 -07:00
Dan Finlay	651098c70d	Remove duplicate instantiation of account-tracker	2017-09-26 14:30:29 -07:00
Dan Finlay	2eca5455c0	Move obs store into account-tracker instead of inheriting	2017-09-26 14:15:16 -07:00
kumavis	ff5e8746be	Merge pull request #2180 from MetaMask/proxy-blockTracker ... Wrap block tracker in events proxy	2017-09-26 14:09:17 -07:00
frankiebee	9d1cb0f76d	network contoller - clean up unused code	2017-09-26 13:56:09 -07:00
frankiebee	4f887c6a62	fix test	2017-09-26 13:44:45 -07:00
frankiebee	2ed8d579da	listen for the blocke event on the block tracker instead of rawBlock on the provider	2017-09-26 13:38:27 -07:00
frankiebee	b654eb9b1f	wrap block tracker in events proxy	2017-09-26 13:38:27 -07:00
Dan Finlay	3bedcd3582	Restore blockGasLimit to account-tracker	2017-09-26 13:36:41 -07:00
Dan Finlay	b1daa5ae26	Merge pull request #2094 from MetaMask/AddBalanceController ... Calculate balance based on pending txs	2017-09-26 11:46:28 -07:00
Dan Finlay	9e3648c668	Pass blocktracker to balances controller	2017-09-26 11:33:36 -07:00
Thomas Huang	d135c3c9ca	Merge pull request #2174 from MetaMask/i2162-TokenPrecision ... Fix token precision bug	2017-09-26 11:32:32 -07:00
Kevin Serrano	accee14282	Remove old conversion list.	2017-09-26 10:35:13 -07:00
Kevin Serrano	7b199e215d	Polish names on currency list.	2017-09-26 10:11:18 -07:00
Kevin Serrano	88ddedfb5a	Account for undefined currencies.	2017-09-26 10:09:50 -07:00
Kevin Serrano	31e9dcf470	Modify tests for new API.	2017-09-26 10:02:49 -07:00
Dan Finlay	57b5f15265	Remove slack link	2017-09-26 10:01:16 -07:00
Kevin Serrano	16ba2e6a30	Merge branch 'master' into new-currency-test	2017-09-26 09:51:20 -07:00
kumavis	50633fbba6	Merge pull request #2170 from MetaMask/greenkeeper/sinon-4.0.0 ... Update sinon to the latest version 🚀	2017-09-26 09:49:12 -07:00
Dan Finlay	5d300f146a	Add computed balance to mock state	2017-09-26 09:38:43 -07:00
Dan Finlay	b46cb3ecb5	Fix token precision bug ... Had fixed this before in the dependency, but hadn't merged in that version bump yet :( Fixes #2162	2017-09-26 09:25:04 -07:00
greenkeeper[bot]	e52d52b22e	chore(package): update sinon to version 4.0.0	2017-09-26 08:22:48 +00:00
tmashuang	ff6f7b52e4	Clean up transactionController tests	2017-09-25 19:47:03 -07:00
Dan Finlay	1968d61431	Make encryptor configurable for keyring-controller	2017-09-25 15:23:37 -07:00
Dan Finlay	feed9a5a17	Add mock random value generator	2017-09-25 14:45:28 -07:00
Dan Finlay	fd985e7ec1	Merge branch 'master' into AddBalanceController	2017-09-25 14:44:04 -07:00
Dan Finlay	674aac83ce	Make blockTracker an independent param	2017-09-25 14:39:54 -07:00
Dan Finlay	d9c92cdbd1	Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin into AddBalanceController	2017-09-25 14:37:11 -07:00
Dan Finlay	8cd7329c91	Implemented feedback	2017-09-25 14:36:49 -07:00
kumavis	9bbb0ca1ea	Merge pull request #2143 from MetaMask/Version-3.10.3 ... Version 3.10.3	2017-09-25 12:55:45 -07:00
Dan Finlay	dfbdb99858	Merge branch 'master' into AddBalanceController	2017-09-25 11:49:38 -07:00
kumavis	95afdfe368	Merge pull request #2145 from MetaMask/ConfigurableEncryption ... Configurable encryption	2017-09-25 11:46:04 -07:00
Dan Finlay	40f1d08684	Made some requested changes	2017-09-25 11:42:08 -07:00
tmashuang	20fea3f1de	Remove pending updateAndApprovedTransaction test	2017-09-25 10:47:36 -07:00
frankiebee	4979f5902f	bump metamascara version	2017-09-22 20:04:58 -07:00
tmashuang	d4578836c9	Most of transaction controller tests	2017-09-22 16:15:18 -07:00
kumavis	87fc44c45a	Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-fixes-moar	2017-09-22 15:24:26 -07:00
kumavis	8ad74cf93a	deps - bump filter deps and add random missing deps	2017-09-22 15:16:42 -07:00
Dan Finlay	443b1a8eb7	Remove keyring controller from project	2017-09-22 14:38:40 -07:00
Dan Finlay	aa2abc00eb	Merge branch 'AddBalanceController' into BreakOutKeyringController	2017-09-22 14:30:31 -07:00
kumavis	dd45592641	metamask - use provider-engines block tracker	2017-09-22 14:22:07 -07:00