1473 Commits

Author	SHA1	Message	Date
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
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
frankiebee	9d1cb0f76d	network contoller - clean up unused code	2017-09-26 13:56:09 -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	9e3648c668	Pass blocktracker to balances controller	2017-09-26 11:33:36 -07:00
Kevin Serrano	16ba2e6a30	Merge branch 'master' into new-currency-test	2017-09-26 09:51:20 -07:00
Dan Finlay	1968d61431	Make encryptor configurable for keyring-controller	2017-09-25 15:23:37 -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
Dan Finlay	40f1d08684	Made some requested changes	2017-09-25 11:42:08 -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
Dan Finlay	128cf40f91	Fix accont-tracker merge bug	2017-09-22 14:16:19 -07:00
Dan Finlay	f01b0a818b	Fix account-tracker references	2017-09-22 14:13:56 -07:00
Dan Finlay	f9d2f523c6	Merge branch 'master' into AddBalanceController	2017-09-22 14:12:41 -07:00
Dan Finlay	d2a747e57e	Fix computed-balances controller reference	2017-09-22 14:06:54 -07:00
Dan Finlay	11c8c07bfc	Refactor eth-store into account-tracker ... EthStore was only being used for tracking account balances and nonces now, so I removed its block-tracking duties, renamed it account-tracker, and removed it as a dependency from `KeyringController`, so that KRC can go live on without a hard dep on it.	2017-09-22 13:59:25 -07:00
Dan Finlay	977405fc7d	Remove dead code from eth-store	2017-09-22 13:33:53 -07:00
Dan Finlay	08b36b9b58	Allow metamaskController to define keyring types	2017-09-22 13:29:13 -07:00
Dan Finlay	4c971ebfd1	Define encryptor in constructor params instead of platform object	2017-09-22 13:25:08 -07:00
Alex Lunyov	bfaacd3118	Wildcard for infura.io permissions, added permission for cryptonator api	2017-09-22 12:14:04 +08:00
kumavis	0a5ae39509	bug - fix event emitter mem leak warning	2017-09-21 17:37:30 -07:00
Dan Finlay	bd117d6b71	Merge branch 'master' into ConfigurableEncryption	2017-09-21 15:56:24 -07:00
Dan Finlay	e9043f22df	Allow custom encryptor to be passed to MetaMaskController and KeyringControllers.	2017-09-21 15:47:25 -07:00
Dan Finlay	8a874824a8	Version 3.10.3	2017-09-21 11:45:33 -07:00
frankiebee	14b9d16ece	platforms: put context for extension in platform extension class	2017-09-21 11:12:04 -07:00
Alex Lunyov	7256894f51	Fix CORS issues in FireFox	2017-09-21 15:13:53 +08:00
Kevin Serrano	b22783a223	Merge branch 'master' into new-currency-test	2017-09-20 09:40:33 -07:00
frankiebee	90482934f1	Merge branch 'master' into breakout-mascara	2017-09-19 10:45:51 -07:00
frankiebee	bfd75107f1	add context to platform to not have X-Metamask-Origin in mascara	2017-09-19 10:45:32 -07:00
kumavis	51b40adecd	v3.10.2 ... published `v3.10.2` as an emergency rollback to `v3.10.0`	2017-09-18 22:42:04 -07:00
Kevin Serrano	bd8428e9ed	Comply with current currency API and add additional styling.	2017-09-18 16:09:01 -07:00
Dan Finlay	2b7b1db851	Do not mark a retry tx failed that has been broadcast successfully ... Fixes #2115 If a tx has been braodcast, the only failures we should accept are: - Never mined - On chain failure We had a section of code that would mark a tx failed during any unknown error during a retry. Now no retry > 1 will ever mark a tx failed, since it has been broadcast, and may be mined.	2017-09-18 14:34:25 -07:00
Dan Finlay	c90c904f95	Version 3.10.1	2017-09-18 11:47:59 -07:00
Kevin Serrano	51f0911f87	Merge branch 'master' into new-currency-test	2017-09-18 11:46:10 -07:00
Kevin Serrano	cb8856597c	Merge branch 'master' into new-currency-test	2017-09-14 08:35:48 -07:00
kumavis	d7097db022	createOriginMiddleware - fix var name	2017-09-13 15:29:44 -07:00
kumavis	765ef64061	metamask controller - destroy filter polyfill on disconnect	2017-09-13 15:19:44 -07:00
kumavis	245c0f0c27	metamask controller - move middleware into seperate files	2017-09-13 15:17:26 -07:00
Dan Finlay	a01921758b	Add computed balance to account detail view	2017-09-13 15:06:04 -07:00
Dan Finlay	86cd4e4fed	Got pending balance updating correctly	2017-09-13 14:28:51 -07:00
frankiebee	77a48fb0b1	ensure that values written to txParams are hex strings	2017-09-13 14:27:27 -07:00
Dan Finlay	e4d7fb2447	Add state-labeled events to allow subscribing to any transaction's state change	2017-09-13 11:39:39 -07:00
kumavis	96d1175834	debug - prefer logger over console	2017-09-13 10:28:29 -07:00
kumavis	a265144176	metamask cont - standardize multiplex stream naming	2017-09-13 10:21:00 -07:00
Dan Finlay	53a467cd1e	Some progress	2017-09-12 15:06:19 -07:00
frankiebee	9e0c0745ab	linting && format fixing	2017-09-12 12:19:26 -07:00
kumavis	114dae5f80	Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix3	2017-09-12 11:51:22 -07:00
frankiebee	3ad67d1b14	match other controller patterns	2017-09-12 09:59:59 -07:00
Dan Finlay	4738746968	Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController	2017-09-11 15:19:17 -07:00
Dan Finlay	6c318f238d	Version 3.10.0	2017-09-11 14:37:53 -07:00
kumavis	8545453a9d	contentscript - fix obj-multiplex instantiation and use pump for streams	2017-09-11 14:30:30 -07:00
kumavis	41164f61db	Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix	2017-09-11 14:21:09 -07:00
Kevin Serrano	68b22d409a	Merge pull request #2049 from MetaMask/i1938-removecryptopermissions ... Remove cryptonator from chrome manifest file	2017-09-10 11:05:52 -07:00
frankiebee	62f26c5ba8	fix miss type	2017-09-08 15:02:36 -07:00
frankiebee	9b9df41724	more tests and craete a getPendingTransactions function	2017-09-08 14:24:40 -07:00
kumavis	5fa0b992a7	Merge pull request #2057 from MetaMask/Version-3.9.13 ... Version 3.9.13	2017-09-08 13:06:59 -07:00
Dan Finlay	585a32534d	Version 3.9.13	2017-09-08 12:17:58 -07:00
kumavis	d03b0547bb	inpage provider - define sendAsync on the prototype	2017-09-08 11:52:00 -07:00
kumavis	ef3bf810bf	inpage - use obj-multiplex module	2017-09-07 22:47:08 -07:00
kumavis	671dafea9e	Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix	2017-09-07 22:37:44 -07:00
kumavis	70401626e2	lint - remove dead code	2017-09-07 22:35:38 -07:00
kumavis	9d4c02e57f	metamask - add jsonrpc filter middleware on per-connection engine	2017-09-07 21:26:25 -07:00
kumavis	0e8e655fdb	inpage - distinguish pump vs pipe	2017-09-07 21:19:24 -07:00
kumavis	57e4805c62	streams - use pump and published obj-multiplex	2017-09-07 21:17:49 -07:00
Kevin Serrano	b7e24dcda7	Remove cryptonator from chrome permissions.	2017-09-07 18:17:43 -07:00
Dan Finlay	d4d7c6d89e	Linted	2017-09-07 12:54:28 -07:00
Dan Finlay	fadc0617df	Make tx calculations account for gas prices	2017-09-07 12:52:49 -07:00
Dan Finlay	c616581001	Remove logs	2017-09-07 12:47:52 -07:00
Dan Finlay	a95a3c7e4f	Fix balance calc test	2017-09-07 12:47:27 -07:00
Dan Finlay	74c6de7d23	Add constructor comment	2017-09-07 12:45:00 -07:00
Dan Finlay	7b92268428	Fix valueFor test	2017-09-07 12:43:10 -07:00
Dan Finlay	4058574436	Add basic test for valueFor	2017-09-07 12:30:25 -07:00
Dan Finlay	b6e8791bc2	test not passing	2017-09-07 11:59:15 -07:00
kumavis	440a42bbc3	inpage - add idRemapMiddleware	2017-09-07 10:08:07 -07:00
frankiebee	50075c6df5	fix messy merge	2017-09-07 00:55:21 -07:00
frankiebee	00fca4f1f2	remove unused variable	2017-09-06 14:38:39 -07:00
Dan Finlay	74f7fc4613	Check balances in parallel	2017-09-06 14:37:46 -07:00
Dan Finlay	f9a052deed	Add first passing balance calc test	2017-09-06 14:36:15 -07:00
frankiebee	a73aecc796	fix merge and errors disaperaing on update	2017-09-06 14:01:07 -07:00
Kevin Serrano	0217984a40	Merge branch 'master' into readd-loose	2017-09-06 13:59:52 -07:00
Kevin Serrano	b5f48730cd	Properly update keyring state on new account addition.	2017-09-06 13:59:41 -07:00
frankiebee	6c83ba762e	Merge branch 'master' into transactionControllerRefractorPt3	2017-09-06 13:45:03 -07:00
Dan Finlay	5e934994d1	Version 3.9.12	2017-09-06 13:33:30 -07:00
frankiebee	15c12ca4bb	add better comments	2017-09-05 21:50:36 -07:00
frankiebee	00bd5b143f	rename tx-utils.js -> tx-gas-utils.js	2017-09-05 20:33:50 -07:00
frankiebee	4c554f32ec	remove #buildEthTxFromParams	2017-09-05 20:13:43 -07:00
kumavis	ea7e46ed38	inpage - bug fix ... prevents mutation of original message object which causes problems with web3 1.0	2017-09-05 16:46:21 -07:00
Dan Finlay	70a61f8712	Make web3 deprecation notice more useful ... Linking to a descriptive & precriptive article on a path forward.	2017-09-05 11:35:33 -07:00
Kevin Serrano	ae8486d5cf	Merge branch 'master' into new-currency-test	2017-08-29 16:36:19 -07:00
Kevin Serrano	056276af02	integrate infura currency	2017-08-29 16:36:05 -07:00