272 Commits

Author	SHA1	Message	Date
Dan Finlay	4c971ebfd1	Define encryptor in constructor params instead of platform object	2017-09-22 13:25:08 -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
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
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
kumavis	9d4c02e57f	metamask - add jsonrpc filter middleware on per-connection engine	2017-09-07 21:26:25 -07:00
kumavis	57e4805c62	streams - use pump and published obj-multiplex	2017-09-07 21:17:49 -07:00
kumavis	cc56d0d2f6	inpage - use json-rpc-engine for inpage-provider	2017-08-24 15:44:40 -07: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	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
frankiebee	25bc15ba17	lint fixes	2017-08-02 11:47:13 -04:00
frankiebee	ece9200c72	fix spelling mistake	2017-08-02 11:36:07 -04:00
frankiebee	432f516ab0	make addUnapprovedTransaction async function and use promise based ethQuery	2017-08-02 10:26:25 -04:00
frankiebee	948f3880a3	turn off auto faucet and remove file	2017-07-17 17:37:01 -04:00
frankiebee	751103d948	Merge branch 'master' into nonce-tracker	2017-07-12 15:10:58 -07:00
frankiebee	da35f6744e	use new nodeify	2017-07-12 15:06:49 -07:00
kumavis	9f46984fee	metamask - on rpc err show whole error body	2017-07-11 14:17:47 -07:00
kumavis	d228f46254	Merge branch 'master' into nonce-tracker	2017-07-07 14:21:43 -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
frankiebee	847a4282a2	Merge branch 'master' into nonce-tracker	2017-06-27 13:10:56 -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	b7f8657ab5	Add infura network status to our UI state.	2017-06-22 12:32:08 -07:00
Dan Finlay	41d992cca9	Merge branch 'AddTokenList' into i1616-AddTokenAdding	2017-06-19 19:03:49 -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
frankiebee	3e359d6a6a	Merge branch 'master' into i1567-FixInaccurateError	2017-06-16 16:39:52 -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	2e5deef2b0	check nonce and balance when resubmiting tx	2017-06-15 13:48:48 -07:00
kumavis	b3492d9c17	transaction controller - use nonce-tracker	2017-06-14 23:44:02 -07:00
Dan Finlay	b7b9e0c1ac	Persist selected account tab ... Also improve error handling with token balances.	2017-06-14 14:21:50 -07:00
frankiebee	c5d74e6421	include ethQuery in txController	2017-05-23 20:06:19 -04:00
frankiebee	243eeff7cb	Fix for tests	2017-05-23 19:49:57 -04: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	2df9344be5	Rename tx manager to tx controller	2017-05-16 10:35:28 -07:00
kumavis	fb08c4a131	metamask - publicConfig - fix init state	2017-05-04 17:56:30 -07:00
kumavis	10ba760ed3	metamask - selected accounts - dont reveal when locked	2017-05-04 17:50:59 -07:00
Dan Finlay	a3149c1752	Use loglevel for more logs	2017-04-30 12:38:38 -07:00
Thomas Huang	6bdb4c8728	Fix linting warnings	2017-04-26 21:05:45 -07:00
kumavis	5a91adf7d8	add platforms to mascara + move buyEther window open to ui	2017-04-04 18:23:46 -07:00
kumavis	5d967eeebb	Merge pull request #1307 from MetaMask/mascara ... Proof of Concept: Mascara	2017-04-04 11:27:45 -07:00
kumavis	4779999bfc	clean - metamask controller - remove log	2017-04-04 11:13:07 -07:00
frankiebee	0a7b388b39	Fix faucet to only autoFaucet first account	2017-04-04 18:38:56 +02:00