metamask-extension

mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-13 13:17:13 +01:00

Author	SHA1	Message	Date
bitpshr	7129d7c0f3	Require loglevel singleton in each module that uses it	2018-04-13 17:56:28 -04:00
frankiebee	943eea043c	fix up - more docs	2018-04-13 13:18:45 -07:00
frankiebee	88f4212363	meta - transactions - code clean up and jsDoc	2018-04-13 12:38:07 -07:00
bitpshr	8974f933fc	Add tests for ComposableObservableStore	2018-04-13 14:32:58 -04:00
bitpshr	4780f825b1	Add ComposableObservableStore for subscription management	2018-04-13 10:20:44 -04:00
frankiebee	3aaa28531e	transactions - code cleanup	2018-04-12 12:24:16 -07:00
Dan	8fb1237d64	Documentation for environemnt-type.js	2018-04-12 13:17:46 -02:30
frankiebee	5494aa4f9c	transactions - lint fixes	2018-04-10 14:54:30 -07:00
frankiebee	2d7c3c2b00	meta - transactions - create a transactions dir in controller and move relevant files into it	2018-04-10 14:28:05 -07:00
kumavis	4cae3d3b0d	Merge pull request #3921 from MetaMask/gh-3736-react-router Add react-router integration	2018-04-09 10:55:46 -07:00
kumavis	2511a9e634	Merge pull request #3922 from MetaMask/empty-vault-fix Empty vault - attempt recovery	2018-04-06 13:18:48 -07:00
kumavis	f9a6feb263	metamask - never persist if state is missing	2018-04-06 12:10:39 -07:00
kumavis	6f4dbd6d4a	metamask - never persist if state is missing data	2018-04-06 12:09:26 -07:00
kumavis	0685381fdc	metamask - attempt recovery from empty vault	2018-04-06 12:05:24 -07:00
kumavis	26fe638377	tx-state-manager - dont remove old tx history if candidate is not found	2018-04-06 10:18:00 -07:00
Alexander Tseung	4c15c0d3ba	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-04-05 23:17:22 -07:00
frankiebee	d4e30040a2	migrations - back fixes	2018-04-05 19:33:10 -07:00
frankiebee	7d243aacf9	create migration 25	2018-04-05 18:05:03 -07:00
frankiebee	b9243cd8b9	meta - create a migration template	2018-04-05 16:25:13 -07:00
kumavis	79932b7e17	Merge pull request #3857 from MetaMask/match-local-localecodes Ensure get-first-preferred-lang-code.js matches locale codes from loc…	2018-04-05 15:08:19 -07:00
kumavis	741c6097a2	Merge pull request #3887 from MetaMask/i#3886 transactions - remove unnecessary keys on txParams	2018-04-05 15:06:29 -07:00
Frankie	2dfa8a2e50	Merge pull request #3900 from MetaMask/migration-error-report migrations - report migrations errors to sentry with vault structure	2018-04-05 15:03:53 -07:00
kumavis	17931698a8	Merge pull request #3892 from alextsg/gh-3891 Fix populating txParams with undefined data	2018-04-05 15:02:35 -07:00
kumavis	ffc71ff7d2	migrator - dont overwrite error stack and warn to console	2018-04-05 13:38:34 -07:00
kumavis	7fdf663ea7	migrator - fix typo	2018-04-05 13:21:00 -07:00
kumavis	2b880dd4e0	migrations - report migrations errors to sentry with vault structure	2018-04-05 13:15:08 -07:00
frankiebee	c02da0f27c	transactions - _normalizeTxParams will now return a new object for txParams	2018-04-05 12:12:02 -07:00
frankiebee	4efc718074	make migration-24 compat with first-time-state	2018-04-05 11:28:25 -07:00
Alexander Tseung	418926ffdf	Fix populating txParams with undefined data	2018-04-05 09:54:41 -07:00
frankiebee	343f0e9e80	transactions - remove unnecessary keys on txParams	2018-04-04 22:29:43 -07:00
Alexander Tseung	5b2ace3b80	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-04-04 18:21:35 -07:00
frankiebee	245c01bc0f	transactions - make #_validateTxParams not async and "linting" wink wink nudge nudge	2018-04-04 14:57:27 -07:00
frankiebee	6ab938546c	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into normalize-transactions	2018-04-04 14:28:25 -07:00
frankiebee	8243824c6a	hot-fix - migrate unaproved txParams so that the from is lowercase	2018-04-04 14:27:28 -07:00
frankiebee	457a47bf62	transactions - normalize txParams	2018-04-04 14:27:20 -07:00
kumavis	502011019a	tx - txParams - allow chainId to be a hex string	2018-04-04 08:59:03 -07:00
Dan Finlay	86693af156	Add webby awards to web3 block list.	2018-04-03 20:33:19 -07:00
Alexander Tseung	34e608e9dc	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-04-03 17:06:00 -07:00
Dan	3c4b72bf2c	Map existingLocaleCodes and userPreferredLocaleCodes to lower case in get-first-preferred-lang-code.js	2018-04-03 20:52:17 -02:30
Dan	5aff114001	Ensure get-first-preferred-lang-code.js matches locale codes from local directory names and chrome extension api.	2018-04-03 20:34:28 -02:30
kumavis	83df8b58ba	tx-state-manager - validateTxParams - validate chainId is Number	2018-04-03 13:55:20 -07:00
frankiebee	3b1e4c74f5	transactions - dont throw if chain id is not a string	2018-04-03 12:17:53 -07:00
kumavis	038ad91454	app - currency - fix typo + prefer log over console	2018-04-03 10:39:23 -07:00
kumavis	79d63332ee	app - currency - fix typo	2018-04-03 10:35:41 -07:00
kumavis	ecbab14cae	app - warn on fetch errors instead of spamming sentry	2018-04-03 10:33:10 -07:00
kumavis	00657e14a8	build - correctly set METAMASK_ENV via envify	2018-04-03 09:51:33 -07:00
Alexander Tseung	35875863d2	Fix merge conflicts. Modify send workflow	2018-04-03 01:03:31 -07:00
frankiebee	ab126b8c78	transactions gasLimit - use the block gasLimit if getCode fails	2018-04-02 15:43:32 -07:00
frankiebee	e8a480aac4	transactions validationt - valdate from field on txParams	2018-04-02 13:17:54 -07:00
Alexander Tseung	51ad2b03c8	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-03-30 16:34:57 -07:00
Alexander Tseung	ba23843f91	Fix merge conflicts	2018-03-30 16:18:48 -07:00
frankiebee	3def45004a	transactions#newUnapprovedTransaction - dont default origin to metamask	2018-03-30 16:00:11 -07:00
frankiebee	03b123a85d	transactions - put the origing on the txMeta to help with debugging	2018-03-30 15:48:39 -07:00
kumavis	b49ad750dd	Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts	2018-03-29 16:54:00 -07:00
Alexander Tseung	ef61ef2ce8	Fix i18n merge conflicts	2018-03-29 09:37:29 -07:00
kumavis	253abd60fc	build - extension - move js files to toplevel	2018-03-28 21:29:57 -07:00
Frankie	650b716f55	Merge pull request #3782 from MetaMask/i3670-FixNonceBug Add test for suspected nonce bug	2018-03-28 14:38:40 -07:00
Dan Finlay	f50a7a8fe8	Rename variable to be more understandable	2018-03-28 14:18:03 -07:00
kumavis	bedc1d1a47	Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts	2018-03-28 14:12:20 -07:00
kumavis	5815de33fb	build - rename 'popup.js' to 'ui.js'	2018-03-28 14:04:33 -07:00
Frankie	8766420f19	Merge pull request #3777 from MetaMask/etc-fixes Sentry spam fix and etc fixes	2018-03-28 12:57:01 -07:00
Frankie	06112b3e30	Merge pull request #3765 from MetaMask/sentry-error-simplify sentry - simplify error message 'Transaction Failed: known transaction'	2018-03-28 12:55:52 -07:00
kumavis	c4c459c8d7	controllers - currency - warn currency and encountered error	2018-03-28 09:41:25 -07:00
kumavis	21fbaed97c	tx controller - explode on non-hex txParams + dont add chainId to txParams + sign with chainId as number	2018-03-27 23:55:18 -07:00
kumavis	97e1fcd331	sentry - simplify error message 'Transaction Failed: known transaction'	2018-03-27 20:41:10 -07:00
Frankie	76e83365ca	Merge pull request #3752 from MetaMask/sentry-error-fix sentry - simplify all ethjs errors for better batching	2018-03-27 19:13:42 -07:00
kumavis	f7a2dc984e	Merge pull request #3760 from MetaMask/i3439-ResetCacheOnAccountReset Fix bug where resetAccount does not clear network cache	2018-03-27 19:10:31 -07:00
kumavis	d8357413ac	metamask-controller - fix typo	2018-03-27 19:04:28 -07:00
Dan Finlay	729a473210	Fix bug where resetAccount does not clear network cache Fixes #3439	2018-03-27 18:07:51 -07:00
kumavis	165ae7d193	i18n - derrive locale codes from index	2018-03-27 18:07:24 -07:00
kumavis	5290570c8f	Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux	2018-03-27 17:17:04 -07:00
frankiebee	fefbf40a06	Merge branch 'master' into i#3731	2018-03-27 16:50:57 -07:00
frankiebee	f0f45e6fe1	migration for removing unnecessary transactions from state	2018-03-27 16:49:13 -07:00
kumavis	651e48dbd6	sentry - simplify all ethjs errors for better batching	2018-03-27 12:37:30 -07:00
Dan	f74e802026	Undo unnecessary line removals.	2018-03-27 10:52:19 -02:30
Dan	be2254b880	Remove comments and console.logs	2018-03-27 10:37:45 -02:30
Dan	d2bd5687e8	Merge branch 'master' into i18n-translator-redux	2018-03-27 10:17:48 -02:30
Alexander Tseung	6f367a5a6b	Fix merge conflicts	2018-03-27 00:20:35 -07:00
frankiebee	0a2616a37f	include migration 22	2018-03-26 18:12:16 -07:00
frankiebee	43dde3cbde	transactions - only save up to 40 txs totall across all networks	2018-03-26 15:58:36 -07:00
Dan Finlay	e196b6dcb7	Fix bug where full localStorage would crash on start	2018-03-26 15:25:26 -07:00
Frankie	5a61a6d57a	migration for adding submittedTime to the txMeta (#3727 ) * test for migration 022 * write migration 022 adding submittedTime to txMetas whove been submitted	2018-03-26 14:24:12 -07:00
Dan	4f0881e41b	Merge branch 'master' into i18n-translator-redux	2018-03-26 16:13:49 -02:30
kumavis	46e8781e41	lint - fix	2018-03-23 18:45:58 -07:00
kumavis	2eaac897bf	sentry - namespace files under metamask dir	2018-03-23 18:37:41 -07:00
kumavis	e3d7062e9b	sentry - rewrite report urls + use raven-js from npm	2018-03-23 17:22:44 -07:00
Dan	b9309f689b	Use extension api to get initial locale.	2018-03-22 12:49:19 -02:30
Dan	be845fd190	Merge branch 'master' into i18n-translator-redux	2018-03-21 22:28:58 -02:30
kumavis	5d3246c836	Merge branch 'master' of https://github.com/trigun0x2/metamask-extension into trigun0x2-master	2018-03-21 11:55:09 -07:00
kumavis	112a9443ee	Merge pull request #3585 from lazaridiscom/laz/i3568 [WIP] document/rearrange metamask-controller.js, re #3568	2018-03-20 16:47:04 -07:00
kumavis	1a60094d50	Merge pull request #3504 from lazaridiscom/laz/i3427 adds READMEs to folders, re #3427	2018-03-20 16:28:47 -07:00
kumavis	29cc2f8ab9	Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux	2018-03-20 13:01:08 -07:00
Jeffrey Tong	93495b2809	fix for lint	2018-03-20 12:18:48 -07:00
Dan	2ddc2cc1fb	Lint fixes.	2018-03-19 16:53:06 -02:30
Dan	d8788af9b8	Merge branch 'master' into retry-tx-refractor	2018-03-19 15:30:47 -02:30
Dan	5733820024	Merge branch 'master' into i18n-translator-redux	2018-03-19 14:39:04 -02:30
Dan	a51e8f6a16	Fetch localeMessages in front end only.	2018-03-19 13:36:16 -02:30
Saptak Sengupta	6174c00c10	Inject Script: Blacklist domains where not to inject script Put a blacklist domain check where if the page url is in the list of blacklisted domains, we shouldn't inject script in that web page.	2018-03-17 01:02:08 +05:30
Lazaridis	e1d6398b0f	moves setup-related code towads end of file, re #3568	2018-03-16 18:37:56 +02:00
Lazaridis	bb6af25e20	add ESLint exceptions for //= and //-, re #3568	2018-03-16 03:22:10 +02:00
Lazaridis	904f00e8ac	group all vault/keyring related methods together, re #3568	2018-03-16 02:29:53 +02:00
Dan	5fe0be722b	Handle i18n with redux.	2018-03-15 21:59:45 -02:30
Lazaridis	d8f5150aa5	adds initial documentation, re #3568	2018-03-16 00:27:10 +02:00
frankiebee	cd721f52cb	Merge branch 'master' into retry-tx-refractor	2018-03-15 08:07:16 -07:00
kumavis	34aeef50a0	i18n - load locales manually	2018-03-14 16:32:35 -07:00
kumavis	6aef2ed0b2	local-store - fix class syntax	2018-03-14 10:59:47 -07:00
kumavis	c4e90c9359	local-store - check for error from extension.runtime	2018-03-14 10:49:54 -07:00
kumavis	481983aae8	local-store - fix promisification of methods	2018-03-14 10:31:25 -07:00
frankiebee	b609924125	fix destructuring of variables	2018-03-14 08:21:50 -07:00
frankiebee	bc987a1129	fix destructuring of variables	2018-03-14 08:20:54 -07:00
Dan	106ce091a9	Fix TransactionStateManager spelling.	2018-03-14 11:45:04 -02:30
Lazaridis	2d3763d709	add READMEs to folders, re #3427	2018-03-14 15:33:22 +02:00
Dan	798988597b	Merge branch 'master' into retry-tx-refractor	2018-03-14 00:02:27 -02:30
kumavis	dc5fbf5eb2	Merge branch 'master' into i3076-UseStorageLocalInstead	2018-03-13 15:43:37 -07:00
kumavis	22cd788203	tx-gas-utils - fix code style	2018-03-13 15:39:33 -07:00
frankiebee	e5a83d3f1a	transactions move validation of the to field to validateRecipient	2018-03-13 15:32:03 -07:00
frankiebee	a2c14ad02b	Merge remote-tracking branch 'origin/i#3509' into i#3509	2018-03-13 15:27:26 -07:00
frankiebee	c465d510b1	fix error message	2018-03-13 15:26:45 -07:00
Frankie	c83a9ceb04	Merge branch 'master' into i#3509	2018-03-13 15:23:46 -07:00
frankiebee	d195cfab50	transactions - insure if a to field in tx params has a truthy valu that it is a valid addres and if it is falsy that it is not null to fix issue #3509	2018-03-13 15:13:05 -07:00
frankiebee	9d7640996a	transactions - return the txMeta in retryTransaction	2018-03-13 14:42:26 -07:00
frankiebee	9fd349d740	transactions:state - add a submittedTime stamp so the ui has a better grasp of the time of submission	2018-03-13 09:51:37 -07:00
Jeffrey Tong	4f853bbd3c	remove console log	2018-03-11 10:18:55 -07:00
Jeffrey Tong	bda493dc9d	add comments that need clarification on naming convention	2018-03-11 10:17:08 -07:00
Dan	81e72147ef	Merge branch 'master' into retry-tx-refractor	2018-03-09 02:07:27 -03:30
kumavis	a88e436b7d	lint fix	2018-03-08 14:55:35 -08:00
kumavis	455faece9e	Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-UseStorageLocalInstead	2018-03-08 14:14:49 -08:00
kumavis	98efca0a97	background - storage - cleanup storage wiring	2018-03-08 14:10:28 -08:00
frankiebee	5572345b78	fix marking of confirmed transaction as dropped	2018-03-08 10:37:47 -08:00
frankiebee	4a3288fec9	transactions - make _markNonceDuplicatesDropped	2018-03-07 22:01:14 -08:00
Jeffrey Tong	aaef2aeefd	fixed multiple notification windows when executing batch	2018-03-07 20:09:40 -08:00
frankiebee	8adb03074c	Merge branch 'master' into retry-tx-refractor	2018-03-07 17:16:35 -08:00
frankiebee	62febac876	refactor retrytx with higher gas price: - create a new tx instead of overwriting the tx hash - add a new state 'dropped' to the txStateManager - mark duplicate txs as dropped when one gets confirmed in a block	2018-03-07 17:16:16 -08:00
Dan Finlay	f4e5dd37b1	Merge pull request #3409 from scsaba/seed-phrase-verification Add seed phrase verification script into background process	2018-03-07 16:47:13 -08:00
Dan Finlay	64fcd27102	Tighten up data loading code	2018-03-07 14:42:59 -08:00
Dan Finlay	b97ac5106f	Add clarifying comment	2018-03-07 14:38:26 -08:00
Dan Finlay	d58e47edec	Some fixes for new storage strategy - Don't persist undefined data - Write to new storage strategy without waiting for completion. - Continue writing to localStorage as fallback.	2018-03-07 14:23:31 -08:00
Jeffrey Tong	40b1688c67	removed check for width & height on multiple popup windows	2018-03-07 14:19:27 -08:00
Dan Finlay	ab55c184c7	Increase storage debounce to 2s	2018-03-07 13:50:22 -08:00
Dan Finlay	d0ba2d2d94	Merge branch 'master' into i3076-UseStorageLocalInstead	2018-03-07 13:39:44 -08:00
Jeffrey Tong	cad5f5f000	fix typo in tests and tx-state-manager	2018-03-07 10:24:36 -08:00
Jeffrey Tong	57dc5a6e9b	fix typo in transaction.js	2018-03-06 20:37:26 -08:00
Dan Finlay	423f084cb4	Merge branch 'master' into i3076-UseStorageLocalInstead	2018-03-06 14:59:09 -08:00
Dan Finlay	dd9cac69ae	Merge pull request #3309 from scsaba/edge-support Add Edge Support	2018-03-06 09:39:57 -08:00
Csaba Solya	59007a6c36	modify verifySeedPhrase to async and call it from addNewAccount also	2018-03-06 15:56:27 +01:00
Csaba Solya	f7d4a1080d	add documentation	2018-03-04 08:47:46 +01:00
Csaba Solya	2b86d65d0c	verify seedwords on log in	2018-03-03 22:08:10 +01:00
Csaba Solya	3e05b693db	verify addresses regardless case	2018-03-03 14:11:02 +01:00
Csaba Solya	4bd7f1a37a	fix lint issues	2018-03-03 00:40:40 +01:00
Csaba Solya	92453f8715	seed phrase verifier	2018-03-03 00:32:57 +01:00
kumavis	c3bd27c965	sentry - extractErrorMessage - fix comment formatting	2018-02-28 10:57:54 -08:00
kumavis	8e5bcf8935	sentry - failed tx - improve ethjs-rpc error formating	2018-02-28 10:53:54 -08:00
kumavis	fca2cbc8ef	sentry - clean - move setupRaven to lib	2018-02-28 10:37:53 -08:00
Dan Finlay	fe21f8a952	Merge pull request #3281 from MetaMask/sentry-failed-tx-debatch sentry - report failed tx with more specific message	2018-02-27 10:15:18 -08:00
Csaba Solya	73d9bfc52c	make keyFromPassword private	2018-02-23 10:09:16 +01:00
Csaba S	2f34630486	Merge branch 'master' into edge-support	2018-02-22 14:55:46 +01:00
Csaba Solya	5ec311ba3e	add edge support	2018-02-22 14:39:32 +01:00
Thomas Huang	e27a3823ba	Merge pull request #3306 from danjm/MM-805-send-from-tab-popup-fix [NewUI] Prevents new tx from active tab from opening popup	2018-02-21 12:50:45 -08:00
Dan Finlay	716acc088e	Merge branch 'master' into uat-master	2018-02-21 10:56:23 -08:00
Dan	a4ed6af2ad	Prevents new transaction from generating popup when metamask is open in an active tab.	2018-02-21 15:04:04 -03:30
Dan Finlay	98d3fba3ef	Fix promise construction	2018-02-20 15:45:48 -08:00
kumavis	06838774fa	sentry - report failed tx with more specific message	2018-02-16 10:21:06 -08:00
kumavis	c0893f2bcc	Merge pull request #3250 from MetaMask/i#3136 fix - hex prefix estimatedGas on txMeta	2018-02-16 15:59:20 +00:00
Dan Finlay	73e5ae6e29	Fix incorrect promise instantiation	2018-02-15 15:32:48 -08:00
Dan Finlay	58871cb146	Merge pull request #3222 from MetaMask/mesh-test metamask mesh - inject mesh testing container	2018-02-15 12:08:06 -08:00
frankiebee	dc3f3e79ca	fix - hex prefix estimatedGas on txMeta	2018-02-14 14:37:02 -08:00
Lazaridis	58a554b168	use the providers initial _blocktracker. fixes #2393	2018-02-11 05:09:27 +02:00
kumavis	94cd5b9df4	metamask mesh - inject mesh testing container	2018-02-10 19:33:33 +00:00
Alexander Tseung	eb919f4710	Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254	2018-02-08 16:43:31 -08:00
Dan	b0db68a281	Merge branch 'uat' into uat-next	2018-02-07 21:19:14 -03:30
Dan J Miller	7f151b861c	[NewUI] Opens to full screen when restoring from seed. (#3201 ) * Opens to full screen when restoring from seed. * Remove redundant parameter in actions.markPasswordForgotten call.	2018-02-07 21:08:55 -03:30
Dan	d8896a8c31	Merge branch 'master' into uat	2018-02-07 16:32:47 -03:30
Alexander Tseung	4f1fe1da62	Fix merge conflicts from uat-next	2018-01-31 18:24:20 -08:00
Frankie	201e0579a5	Merge branch 'master' into localStorage-clean-up	2018-01-31 11:57:38 -08:00
frankiebee	c3adbda5f5	remove RecentBlocks from disk	2018-01-31 10:49:58 -08:00
Bruno Barbieri	c1b7cfe91d	preserve other networks TXs	2018-01-31 13:29:02 -05:00
Bruno Barbieri	7dc1b09f94	use txMeta.txParams	2018-01-31 04:40:32 -05:00
Bruno Barbieri	03d17c75ae	wipe only transactions for current account	2018-01-31 04:25:32 -05:00
Bruno Barbieri	5f39844382	clean up	2018-01-31 03:36:04 -05:00
Bruno Barbieri	e6fda855a5	added reset account feature	2018-01-31 03:33:15 -05:00
frankiebee	28ee0aae91	creater migration to remove BlacklistController	2018-01-30 14:07:32 -08:00
frankiebee	f13ad6bd6a	remove BlacklistController from disk state	2018-01-30 14:07:32 -08:00
Alexander Tseung	ecc39c5a7a	Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254	2018-01-29 18:22:52 -08:00
Dan Finlay	8ba64c657f	Increase storage debounce value	2018-01-25 15:38:43 -08:00
Dan Finlay	ceebc6caa4	Debounce storage to avoid crashing pump	2018-01-25 13:01:03 -08:00
Kevin Serrano	19a379edba	Bump limit for event emitter warning.	2018-01-25 12:28:11 -08:00
Dan Finlay	2f13790653	Remove local storage writes, add log	2018-01-24 15:28:15 -08:00
Dan Finlay	76521cf739	Fix retrieval of object	2018-01-24 15:03:16 -08:00
Dan Finlay	cd5eaa4393	Remove redundant async modifiers	2018-01-24 13:05:13 -08:00
Dan	b281a52759	Remove already handled TODO comment.	2018-01-24 16:49:12 -03:30
Dan Finlay	f09d72fa2a	Remove extension-store since we aren't using it yet	2018-01-24 11:36:42 -08:00
Dan	b7ae77f57a	Check that extension.storage exists before attempting to call methods on it.	2018-01-24 09:43:20 -03:30
Dan	0164030e56	Handle errors when getting and setting to localStore.	2018-01-24 09:41:32 -03:30
Dan Finlay	7c4a9c32fa	Merge branch 'UseStorageLocal' into i3076-UseStorageLocalInstead	2018-01-23 16:33:37 -08:00
Dan Finlay	456dfdb9fd	Modify @heyellieday's work to use storage.local to replace main storage	2018-01-23 16:26:50 -08:00
Thomas	97ca86733c	Merge branch 'master' into uat	2018-01-23 01:12:50 -08:00
kumavis	b91e2b5eb1	sentry - report failed txs	2018-01-22 15:54:26 -08:00
Chi Kei Chan	77c545336b	Merge branch 'uat' into newmaster	2018-01-19 15:29:36 -08:00
Dan Finlay	59d0fa2637	Merge pull request #3016 from MetaMask/sentry Stability - Add Sentry Remote Error Reporting	2018-01-18 13:11:15 -08:00
kumavis	d7c8ec22a4	test - tx controller - fix txGasUtil reference	2018-01-17 20:09:13 -08:00
kumavis	96fc916024	Update transactions.js	2018-01-17 17:56:31 -08:00
frankiebee	234c2417ca	transactions - transtion approved transactions to failed transactions on boot	2018-01-17 16:49:38 -08:00
frankiebee	be8d924432	transactions - fail txs on boot who fail addTxDefaults	2018-01-17 15:48:37 -08:00
frankiebee	9f19fea8e0	transactions - wrap addTxDefaults in a try catch and re try addTxDefaults on boot if they did not complete	2018-01-17 15:42:01 -08:00
kumavis	1f5325804b	sentry - dedupe raven vendor	2018-01-17 15:38:25 -08:00
kumavis	daa62b507a	sentry - breakout raven setup and add release config	2018-01-17 14:59:15 -08:00
kumavis	52a1c954f1	sentry - update raven and add to ui	2018-01-17 14:28:37 -08:00
kumavis	7d1554b1c1	sentry - add raven + sentry reporting config	2018-01-17 14:04:37 -08:00
Alexander Tseung	81f86cfab6	Merge branch 'uat' into uat-master-011618	2018-01-16 18:17:28 -08:00
Dan Finlay	8fb62b97c5	Create new flag for simple sends to avoid overloading other flag	2018-01-16 11:05:11 -08:00
kumavis	6cfaf03b3d	Merge branch 'master' into i2907-NoCodeGasLimit	2018-01-16 09:59:32 -08:00
Frankie	f18ed8bfd4	Merge branch 'master' into open-popup	2018-01-15 15:25:14 -08:00
Dan Finlay	845917b2d5	Merge branch 'master' into i2907-NoCodeGasLimit	2018-01-15 15:10:50 -08:00
Dan Finlay	cd7eaaa735	Set gas limit to 21k for recipients with no code Fixes #2907	2018-01-15 15:08:07 -08:00
Dan Finlay	582634d9fa	Merge pull request #2936 from MetaMask/i2925-BetterGasEstimation Improve gas price estimation by backfilling recent-blocks	2018-01-15 14:35:59 -08:00
Dan J Miller	aa833a0928	[NewUI] Place all users of extension into old UI (disable auto adding). (#2946 ) * Place all users of extension into old UI (disable auto adding). * Fix lint errors.	2018-01-15 13:23:44 -08:00
frankiebee	f0dd4f1923	transactions - emit 'newUnapprovedTx' before estimateGas finishes	2018-01-14 14:00:17 -08:00
Alexander Tseung	bdcee058dc	Fix styling in initialization	2018-01-12 13:39:26 -08:00
Dan Finlay	7cb66ce4cb	Prefer passing a provider over an ethQuery instance	2018-01-12 10:25:36 -08:00
Dan Finlay	4a9dad7c40	Improve gas price estimation by backfilling recent-blocks When first initializing, recent-block controller now back-fills up to its desired history length. This makes estimated gas prices reflect a longer recent history, even when first switching to a new network. Fixes #2925	2018-01-11 15:04:54 -08:00
kumavis	cf60b23eec	Merge branch 'master' into infura-rest-api	2018-01-11 11:40:56 -08:00
Dan Finlay	d829fb91b8	Default to 1 gwei for empty blocks	2018-01-08 15:41:57 -08:00
Dan Finlay	0275231e13	Default gas estimate to 1 gwei for networks with no block activity	2018-01-08 15:08:05 -08:00
kumavis	ab7701efb3	provider - infura - use infura REST api	2018-01-08 14:57:57 -08:00
kumavis	63ae7fb589	bugfix - transactions controller - breakout logic and fix order of operations bug	2018-01-08 13:20:38 -08:00
kumavis	9a8670309d	bugfix - transactions controller - breakout logic and fix order of operations bug	2018-01-08 13:19:18 -08:00
Thomas Huang	0fbecb9f7c	Merge pull request #2891 from MetaMask/i2621-0xRecipientAddress Account for 0x/empty string recipient	2018-01-08 11:47:47 -08:00
Kevin Serrano	0cf5c22178	Merge pull request #2851 from MetaMask/i2812-seedworderrorfix Fix condition where failing seed word checks would infinite-spin future attempts.	2018-01-08 11:43:43 -08:00
Dan Finlay	d11ec81f49	Merge branch 'master' into i2621-0xRecipientAddress	2018-01-08 11:21:41 -08:00
Thomas	39b700bf87	Account for 0x/empty string address and contract creation	2018-01-08 03:16:20 -08:00
Dan Finlay	aec24ec81e	Fix feature to work	2018-01-05 22:08:03 -08:00
Dan Finlay	447682d1fb	Linted	2018-01-05 21:34:35 -08:00
Dan Finlay	4bca98d588	Derive gas price estimate from previous transactions Return the 50th percentile lowest gas price of the previous 20 blocks.	2018-01-05 21:24:20 -08:00
Kevin Serrano	20aa135ad8	Add fix for infinite spinner for incorrect seed phrase.	2018-01-03 16:06:46 -08:00
Alexander Tseung	a6f062a686	Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c	2018-01-03 11:06:08 -08:00
Ellie Day	3c6a5b16ad	conditionally use extension store if supported or enabled	2018-01-02 21:53:11 -08:00
Ellie Day	7184db7632	handle situation where storage.sync is disabled in certain versions of firefox	2018-01-02 21:31:17 -08:00
kumavis	313b3c087a	Merge pull request #2783 from MetaMask/tx-param-vaalidation transactions - throw error if txParams.value contains a decimal	2018-01-02 14:30:39 -08:00
kumavis	3f6cef0b3f	tx-gas-utils - tx-param-validation - use more intuitive check	2018-01-02 14:22:44 -08:00
Frankie	b2e4f913ba	Merge pull request #2817 from MetaMask/i#2810 only check nonces of transactions who's from address match the txMeta	2017-12-28 16:34:24 -08:00
Kevin Serrano	414f89668e	Fix some silly linting issues.	2017-12-27 17:27:48 -08:00
frankiebee	5efb0044d8	transactions:pending - only check nonces of transactions who's from adress match the txMeta	2017-12-27 16:50:15 -08:00
Ellie Day	a76324f6d3	Add ExtensionStore and add basic store instance syncing to main controller	2017-12-23 08:23:34 -06:00
Alexander Tseung	06410381d4	Merge branch 'NewUI-flat' into merge-master	2017-12-22 11:00:46 -08:00
Alexander Tseung	a218008adf	Track usage of old and new UI (#2794 ) [NewUI] Track usage of old and new UI	2017-12-22 10:43:02 -08:00
Dan Finlay	33dbee3db9	Remove retryTimePeriod from tx controller	2017-12-21 14:15:17 -08:00
Dan Finlay	75b8baafb6	Stop failing pending transactions after any period of time	2017-12-21 13:41:08 -08:00
Frankie	9940ea71df	Merge branch 'master' into tx-param-vaalidation	2017-12-21 11:37:37 -08:00
Chi Kei Chan	9959aea598	Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20	2017-12-20 17:38:28 -08:00
Dan	bf4043c59b	Adds updateTransaction to background and used it to update after editing in send-v2.	2017-12-20 17:37:18 -08:00
Dan	1f1fc2c49e	Canceled, edited transactions show edited amount.	2017-12-20 17:37:18 -08:00
Dan	7915e62d65	Merge branch 'master' into NewUI-flat	2017-12-20 19:16:12 -03:30
frankiebee	f47e81e493	transactions - throw error if dapp provides txParams whos value has a decimal	2017-12-20 14:09:59 -08:00
Thomas Huang	d3f5ad874e	Merge pull request #2763 from MetaMask/AddRecentBlocksController Add Recent Blocks controller	2017-12-20 13:07:34 -05:00
Dan Finlay	30b45c8a38	Do not log whole txs in recent block controller. Only record gas prices, because that has a current use.	2017-12-19 12:23:59 -08:00
Dan Finlay	975f7279c7	Allow updating token details Fixes #2173	2017-12-18 15:57:04 -08:00
Dan Finlay	10ff77477c	Add Recent Blocks controller Tracks recent blocks, useful for estimating recent successful gas prices.	2017-12-17 16:36:55 -08:00
frankiebee	0daeaeb4a8	Merge branch 'master' into i#2720	2017-12-15 12:59:43 -08:00
Thomas Huang	fb8744771a	Change console.log for opts in _configureInfuraProvider	2017-12-15 14:43:55 -06:00
frankiebee	828734b977	transactions:gas-utils - handle new type of estimateGas error	2017-12-15 01:31:48 -08:00
Alexander Tseung	e226b10a89	Add react-router to allow use of the browser back button	2017-12-14 12:50:20 -08:00
Thomas Huang	fb5edfe69e	Merge pull request #2662 from williamchong007/master fix #1398, prevent injecting xml without xml suffix	2017-12-14 14:34:21 -05:00
kumavis	161aa66cb4	Revert "Revert "network - for infura networks use the infura block tracker provider"" This reverts commit `5df7dcd758`.	2017-12-13 18:57:27 -08:00
Frankie	5df7dcd758	Revert "network - for infura networks use the infura block tracker provider"	2017-12-13 17:46:56 -08:00
Frankie	0935e22d30	Merge pull request #2741 from MetaMask/infura-block-tracker network - for infura networks use the infura block tracker provider	2017-12-13 17:15:26 -08:00
kumavis	33e6befdaa	network - for infura networks use the infura block tracker provider	2017-12-13 13:51:36 -08:00
frankiebee	da209a9cfd	dont aggresively query account data	2017-12-13 11:19:18 -08:00
Dan	05c6789030	Adds button for opening app in main browser window in extension.	2017-12-12 12:14:40 -08:00
Dan Finlay	542e0035dd	Pass polling interval to zero client provider	2017-12-09 19:58:47 -05:00
kumavis	a91200fd08	tx-controller - failed state is a finished state	2017-12-07 18:04:14 -05:00
Dan Finlay	950ec9596c	Do not allow nonces larger than the next valid nonce To avoid situations where a user signs a transaction that will become surprisingly valid in the future.	2017-12-07 16:13:40 -05:00
Dan Finlay	89e640afcb	Merge branch 'master' into patch-2	2017-12-07 16:05:17 -05:00
Chi Kei Chan	845aec82b9	Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI	2017-12-07 09:46:28 -08:00
vicnaum	553d713636	A more expressive way replaced ifs with ? :	2017-12-07 15:30:05 +01:00
Chi Kei Chan	373f8b72d0	Merge branch 'master' into NewUI-flat	2017-12-06 21:13:29 -08:00
Dan	ec6c3c33bd	Merge branch 'master' into NewUI-flat-merge-with-master	2017-12-06 21:11:52 -08:00
Dan Finlay	0e25129028	Enforce retry tx at minimum gas of previous tx	2017-12-06 23:42:47 -05:00
Dan Finlay	31564e0a86	Fix retry action	2017-12-06 23:20:15 -05:00
Dan Finlay	6ff580584a	Add retry background method and action	2017-12-06 22:20:58 -05:00
vicnaum	7854321fae	Fix for #2644 - Specified Nonce isn't used Added nonceSpecified. And a check if nonce was specified - then we should use the specified nonce instead of generating a new one.	2017-12-06 22:49:24 +01:00
Dan	f58aae3f2b	firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta in _resubmitTx	2017-12-06 13:21:09 -03:30
Dan	ea23da9e75	Correct note for updateTx after block-update event in transaction.js	2017-12-06 13:07:31 -03:30
Dan	871d9fd9fb	Fix undefined latestBlockNumber in _resubmitTx	2017-12-06 13:02:38 -03:30
Dan	ae2a4d78e8	Exponentional backoff on transaction retry in pending-tx-tracker	2017-12-05 17:21:14 -03:30
William Chong	03f86acd60	fix #1398 , prevent injecting xml without xml suffix	2017-12-05 19:53:01 +08:00
Dan	84321b2d9b	Lint fix	2017-12-04 23:08:23 -03:30
Dan	db06e7e649	Css selected in background based on betaUI state.	2017-12-04 23:08:23 -03:30
Dan	7f79524070	Add UI selection	2017-12-04 23:08:23 -03:30
Thomas Huang	c30b543a80	Merge pull request #2630 from MetaMask/i2624-VersionedNotices Versioned notices	2017-11-29 17:25:10 -06:00
Dan Finlay	8192c0b58c	Fix migration comment	2017-11-29 11:51:27 -08:00
kumavis	327651e7fb	Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fix	2017-11-29 08:27:47 -10:00
Dan Finlay	ab35a76a24	Migrate old data to include firstVersion info	2017-11-28 16:56:45 -08:00
Dan Finlay	bd82b17310	Linted	2017-11-28 15:35:20 -08:00
Dan Finlay	049ec52a95	Add seed phrase bounty award notice Only shows to people who installed before or equal to MetaMask 3.12.1	2017-11-28 15:31:49 -08:00
Dan Finlay	f0f6bb28e0	Get notice version filtering working nicely	2017-11-28 15:16:04 -08:00
kumavis	f64bc3c01a	deps - obs-store@3 + migrate stream plumbing	2017-11-28 11:09:18 -10:00
Dan Finlay	ec4b7de962	Add firstVersion field to notices selector	2017-11-28 11:22:09 -08:00
Dan Finlay	e89f82399f	Add optional version field to notices Allows notices to only show to users who are on a certain version.	2017-11-28 11:14:57 -08:00
Dan Finlay	725277dbdb	Merge pull request #2441 from MetaMask/kumavis-patch-3 NetworkController - add warning when aborting lookupNetwork	2017-11-27 16:21:25 -08:00
kumavis	634102df63	network controller - warn via log.warn	2017-11-27 13:59:32 -10:00
Jason Clark	a34362b776	Fixes changes requested in pullrequestreview-79088534	2017-11-27 08:11:48 -07:00
Jason Clark	abefcc9612	more eslint fixes	2017-11-25 15:57:54 -07:00
Jason Clark	fc46a16a32	toggle wired up to preferences property store	2017-11-24 10:35:17 -07:00
Clark, Jason (Contractor)	90fc4812bc	incremental commit	2017-11-23 18:33:44 -07:00
Dan Finlay	65cb970487	Prevent creation of multiple vaults Fixes #2577 by ensuring only one seed phrase can be set for a new vault. Also cleans up logs and reproduction logic.	2017-11-20 14:03:12 -08:00
Dan Finlay	c0aa7ce857	Add reproduction and mutex code	2017-11-20 13:27:29 -08:00
Thomas Huang	408bbe726f	Merge pull request #2516 from MetaMask/i2507-DoubleWeb3Error Add useful error when duplicate web3 is detected.	2017-11-20 11:38:41 -06:00
Chi Kei Chan	e61ba93194	Merge branch 'master' into merge-master	2017-11-15 12:03:13 -08:00
Dora E. Mondrian	41fea44af3	newUnaprovedTx => newUnapprovedTx This typo tripped me up when I was reading through the code and trying to understand what's going on.	2017-11-06 04:35:51 -08:00
Dan	5a94775b3f	Lint fixes for NewUI-flat.	2017-11-02 00:00:33 -02:30
Dan Finlay	5ce94e69b3	Add useful error when duplicate web3 is detected. Fixes #2507	2017-10-31 09:59:26 -07:00
Kevin Serrano	e0030a8bf8	Merge pull request #2291 from MetaMask/gasPriceSpecified Add boolean for specified gas price	2017-10-27 14:01:08 -07:00
Kevin Serrano	1e9c0a9db2	Resolve merge conflicts	2017-10-26 16:22:08 -07:00
Chi Kei Chan	5aecce908f	Merge branch 'master' into NewUI-flat	2017-10-25 18:49:02 -07:00
Chi Kei Chan	fa95303e1e	Sign Typed Request styling fixes	2017-10-25 18:05:52 -07:00
Dan	ddf11011c9	Signature request fixes.	2017-10-25 17:40:48 -07:00
Kevin Serrano	b9bbf8f329	Resolving that ugly merge.	2017-10-25 15:45:26 -07:00
Chi Kei Chan	301c737bbc	Merge branch 'master' into NewUI-flat	2017-10-24 16:56:49 -07:00
Kevin Serrano	1767dceba4	Merge pull request #2422 from watilde/fixes-lint Fixes lint warnings	2017-10-24 16:53:54 -07:00
Chi Kei Chan	7c20011023	Merge branch 'master' into NewUI-flat	2017-10-24 16:50:25 -07:00
kumavis	b17a799de6	Update network.js	2017-10-23 12:10:49 -07:00
Dan Finlay	6d05238469	Try to fix intermittent test failure in NonceTracker tests	2017-10-22 22:24:50 -07:00
Daijiro Wachi	43b1cb9100	Fix lint warnings Fixed warnings: ```md app/scripts/controllers/computed-balances.js + 35:27 warning Missing space before function parentheses space-before-function-paren + 41:14 warning 'address' is never reassigned. Use 'const' instead prefer-const + 61:9 warning 'updater' is never reassigned. Use 'const' instead prefer-const + 68:11 warning 'newState' is never reassigned. Use 'const' instead prefer-const app/scripts/controllers/network.js + 104:29 warning Missing space before function parentheses space-before-function-paren app/scripts/lib/createLoggerMiddleware.js + 4:32 warning Missing space before function parentheses space-before-function-paren + 15:2 warning Newline required at end of file but not found eol-last app/scripts/lib/createOriginMiddleware.js + 4:32 warning Missing space before function parentheses space-before-function-paren + 9:2 warning Newline required at end of file but not found eol-last app/scripts/lib/createProviderMiddleware.js + 5:34 warning Missing space before function parentheses space-before-function-paren + 13:2 warning Newline required at end of file but not found eol-last app/scripts/lib/events-proxy.js + 1:50 warning Missing space before function parentheses space-before-function-paren + 31:2 warning Newline required at end of file but not found eol-last app/scripts/lib/nodeify.js + 2:22 warning Missing space before function parentheses space-before-function-paren + 2:24 warning Missing space before opening brace space-before-blocks + 5:18 warning Missing space before function parentheses space-before-function-paren + 5:20 warning Missing space before opening brace space-before-blocks app/scripts/lib/pending-balance-calculator.js + 16:19 warning Missing space before function parentheses space-before-function-paren app/scripts/lib/pending-tx-tracker.js + 85:11 warning '\|\|' should be placed at the end of the line operator-linebreak + 87:11 warning '\|\|' should be placed at the end of the line operator-linebreak + 88:11 warning '\|\|' should be placed at the end of the line operator-linebreak + 90:11 warning '\|\|' should be placed at the end of the line operator-linebreak + 91:11 warning '\|\|' should be placed at the end of the line operator-linebreak app/scripts/lib/port-stream.js + 3:22 warning Missing space before function parentheses space-before-function-paren + 3:24 warning Missing space before opening brace space-before-blocks app/scripts/lib/tx-gas-utils.js + 84:2 warning Newline required at end of file but not found eol-last app/scripts/lib/tx-state-history-helper.js + 12:37 warning Missing space before function parentheses space-before-function-paren + 23:30 warning Missing space before function parentheses space-before-function-paren + 30:23 warning Missing space before function parentheses space-before-function-paren + 35:28 warning Missing space before function parentheses space-before-function-paren + 41:2 warning Newline required at end of file but not found eol-last app/scripts/lib/tx-state-manager.js + 94:13 warning 'value' is never reassigned. Use 'const' instead prefer-const ui/app/reducers.js + 45:7 warning 'state' is never reassigned. Use 'const' instead prefer-const + 53:7 warning 'stateString' is never reassigned. Use 'const' instead prefer-const ui/lib/tx-helper.js + 27:2 warning Newline required at end of file but not found eol-last ui/app/components/account-dropdowns.js + 163:1 warning More than 2 blank lines not allowed no-multiple-empty-lines ui/app/components/menu-droppo.js + 22:7 warning 'style' is never reassigned. Use 'const' instead prefer-const ui/app/components/shapeshift-form.js + 135:11 warning '&&' should be placed at the end of the line operator-linebreak ui/app/components/typed-message-renderer.js + 35:25 warning Missing space before function parentheses space-before-function-paren + 42:2 warning Newline required at end of file but not found eol-last mascara/server/index.js + 11:42 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 12:36 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 13:33 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 14:40 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 20:29 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 21:29 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat + 26:40 warning Use path.join() or path.resolve() instead of + to create paths no-path-concat ```	2017-10-21 21:06:39 +02:00
Chi Kei Chan	344b467d03	Merge branch 'master' into NewUI-flat	2017-10-20 11:05:10 -07:00
Dan Finlay	a10a600cce	Linted	2017-10-19 12:33:43 -07:00
Dan Finlay	3b4c679ffc	Fix bug where new account was not immediately selected	2017-10-19 12:15:26 -07:00
Dan Finlay	0ae406e489	Allow computed balances to enumerate its own view	2017-10-19 09:59:57 -07:00
Chi Kei Chan	c8c773d641	Merge branch 'NewUI-flat' into merge	2017-10-18 22:58:46 -07:00
Dan Finlay	21bde66e16	Remove account-tracker from keyringController	2017-10-18 17:14:26 -07:00
Dan Finlay	bbe2c9f48d	Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault	2017-10-18 17:07:25 -07:00
Dan Finlay	d89394a7c9	Make account tracking much more reactive	2017-10-18 17:07:22 -07:00
kumavis	8da0d0b28a	Revert "NetworkController refactor for new EthClient interface"	2017-10-18 15:09:32 -07:00
Dan Finlay	75177ce34c	Make account tracking more reactive We were doing a lot of conditional observation & updating. Pulled out a bunch of that for generic observer/syncers.	2017-10-18 15:08:34 -07:00
Dan Finlay	9cc1e8a6d8	Refresh computed balances controller when restoring vault	2017-10-18 14:22:04 -07:00
Dan Finlay	ea79eca8eb	Add validation to balance constructor	2017-10-18 12:21:22 -07:00
Dan Finlay	7032edf32b	Stop tracking old account balances after restore vault Per @kgserrano note	2017-10-18 11:13:14 -07:00
Dan Finlay	50e8599988	Promisify metamask-controller vault creating methods	2017-10-17 13:25:27 -07:00
Dan Finlay	d7f384485d	Select first account when restoring seed Fixes #2348	2017-10-17 13:19:57 -07:00
Dan Finlay	ab31eb6a17	Select first account on new vault creation	2017-10-17 13:09:41 -07:00
kumavis	53a360b65d	contentscript - fix inpage require and bundling	2017-10-12 12:51:48 -07:00
Dan Finlay	c9a984a237	Break up inpage file read into multiple lines	2017-10-12 14:16:40 -04:00
Dan Finlay	d0d082d70c	Merge branch 'master' into i1340-SynchronousInjection	2017-10-12 13:25:19 -04:00
kumavis	dcf10f3d75	nonce-tracker - use blockTracker directly	2017-10-11 18:33:36 -07:00
kumavis	0f8d7dacb1	network-controller - use obj-proxy for providerProxy	2017-10-10 17:26:44 -07:00
kumavis	7d50a56198	util - add obj-proxy	2017-10-10 17:15:52 -07:00
kumavis	e32d75965f	events-proxy - clean up	2017-10-10 17:15:14 -07:00
kumavis	4d273d3cea	lint fixes	2017-10-10 14:14:43 -07:00
kumavis	efa92a7fc5	network controller - refactor to use eth-rpc-client	2017-10-10 14:13:12 -07:00
kumavis	ff4e9a0d11	metamask controller - define this.newTransaction to ease instantiation order	2017-10-10 10:50:45 -07:00
kumavis	f7c1bc804d	metamask controller - simplify provider init	2017-10-10 10:39:31 -07:00
kumavis	e79037261e	metamask controller - breakout getAccounts method	2017-10-10 10:26:59 -07:00
Kevin Serrano	1816eca914	Merge branch 'master' into version-debugging	2017-10-10 08:38:27 -07:00
Kevin Serrano	24a55cf777	Make the function callback friendly.	2017-10-10 08:36:15 -07:00
Dan Finlay	7f70c866c3	Merge pull request #2223 from ukstv/master Add eth_signTypedData handler	2017-10-09 12:18:43 -07:00
Dan	bbe893a0d8	UI for send screen container without form rows.	2017-10-08 17:48:09 -07:00
Sergey Ukustov	a1696f89a8	Validate data format for eth_signTypedData	2017-10-07 00:38:13 +03:00
Frankie	4a4338c1f4	Merge pull request #2305 from MetaMask/nodeify nodeify - allow callback to be optional	2017-10-06 14:08:58 -07:00
Dan Finlay	0c61695656	Merge branch 'master' into SignTypedData	2017-10-06 14:03:04 -07:00
kumavis	fa11bbf996	Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInit Update status of pending transactions on startup	2017-10-06 13:40:43 -07:00
kumavis	bc396a7417	lint fix - nodeify	2017-10-06 13:02:34 -07:00
Dan Finlay	a417fab0eb	When checking pending txs, check for successful txs with same nonce. If a successful tx with the same nonce exists, transition tx to the failed state. Fixes #2294	2017-10-06 12:51:13 -07:00
Dan Finlay	94513cae7b	Provide method for tx tracker to refer to all txs	2017-10-06 12:50:33 -07:00
kumavis	be4f7b33f4	nodeify - allow callback to be optional	2017-10-06 12:36:08 -07:00
Dan Finlay	0146b55d6d	Check status of pending transactions on startup Fixes #1531	2017-10-06 11:41:28 -07:00
Kevin Serrano	f6821781d2	Simplify try catch	2017-10-05 17:17:34 -07:00
Kevin Serrano	106af9ec5b	Catch an error if this is not defined.	2017-10-05 17:13:58 -07:00
Kevin Serrano	b9012a62e5	Merge branch 'master' into version-debugging	2017-10-05 17:06:55 -07:00
Dan Finlay	cf178341c1	Merge branch 'master' into SignTypedData	2017-10-05 14:50:19 -07:00
Dan Finlay	9bc80d998e	Add signTypedData input validations	2017-10-05 14:39:35 -07:00
Dan Finlay	c5b7880f05	Merge branch 'master' into SignTypedData	2017-10-05 11:55:23 -07:00
frankiebee	3cb9da2ae5	"fix" hours for message	2017-10-05 11:42:01 -07:00
frankiebee	ec9c528313	pending-tx - check time stamp instead of block number for resubmit	2017-10-05 11:07:22 -07:00
Kevin Serrano	15809894ff	Add indicator for specified gas price	2017-10-05 09:58:04 -07:00
Dan Finlay	1cba6543a4	Begin implementing sync injection idea	2017-10-04 15:35:04 -07:00
Kevin Serrano	3d80565339	Configured for callback-required function.'	2017-10-04 10:55:10 -07:00
Kevin Serrano	147b81068a	Include OS version	2017-10-04 09:56:18 -07:00
Chi Kei Chan	bd99bc2e88	Merge branch 'master' into NewUI-flat	2017-10-03 16:02:58 -07:00
Dan	ac4868170f	Enables remove token and ensures add/remove update the list without need for refresh.	2017-10-03 15:46:01 -07:00
Frankie	948a0b1078	Merge pull request #2250 from interfect/master Don't pass origin as an HTTP header	2017-10-03 10:36:39 -07:00
Sergey Ukustov	e11ca12890	Merge remote-tracking branch 'upstream/master'	2017-10-03 02:10:47 +03:00
kumavis	062eaa6a82	pending tx tracker - on tx:warn append error message instead of error obj	2017-10-02 15:39:11 -07:00
kumavis	ed77304e73	pending tx tracker - tx:warning event includes err obj	2017-10-02 15:20:01 -07:00
kumavis	22eaf92ec2	pending tx tracker - resubmit - warn dont error on unknown error	2017-10-02 15:00:23 -07:00
kumavis	7af696bfbe	pending tx tracker - dont throw on load failure	2017-10-02 14:56:59 -07:00
kumavis	167ad729fd	Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into history-notes	2017-10-02 13:45:47 -07:00
frankiebee	e08a727d44	Merge branch 'master' into history-notes	2017-10-02 13:44:15 -07:00
kumavis	df59ef9942	tx state history - append note to first op of diff	2017-10-02 13:44:11 -07:00
frankiebee	833da191c3	transaction - provide notes for history	2017-10-02 13:41:29 -07:00
kumavis	d29b5f10ef	tx state history - fix bug where initial snapshot was mutated on updateTx	2017-10-02 13:14:42 -07:00
Adam Novak	8cc8fecdac	Don't pass origin as an HTTP header Requests with this nonstandard header are being blocked by CORS when made against Parity. Not sending it ought to fix #1779.	2017-10-01 18:55:52 -07:00
Dan Finlay	d5b0d8af4f	Version 3.10.8 - Fix Currency Conversion In our conversion to the new Infura API, somehow we were sending upper-cased conversions to their lower-case sensitive API. Fixes the first part of #2240	2017-09-29 20:57:15 -07:00
kumavis	7bdf73b1dd	Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactions pending-tx - dont check the balance to rebrodcast	2017-09-29 17:36:49 -07:00
kumavis	1ad8a9a0ff	network - make network controller internal network switching explicit	2017-09-29 17:10:34 -07:00
kumavis	d6ea2fa425	network - convert localhost from custom rpc to network type	2017-09-29 16:35:58 -07:00
kumavis	b88d11f86e	network controller - small refactor	2017-09-29 16:09:38 -07:00
frankiebee	ac80eaca1f	pending-tx - dont check the balance to rebrodcast	2017-09-29 12:54:05 -07:00
Dan Finlay	861bd877f3	Ensure selected account is always set if possible Fixes #2218 Subscribes to keyringController, and if only one account exists, sets it as selected.	2017-09-29 11:19:54 -07:00
Sergey Ukustov	c2b8dada91	Add eth_signTypedData handler	2017-09-29 19:40:46 +03:00
Chi Kei Chan	5a1d50cd43	Merge branch 'master' into mmn	2017-09-27 22:32:07 -07:00
kumavis	cdf41c2857	Merge pull request #2124 from MetaMask/breakout-mascara require metamascara	2017-09-27 16:27:01 -07:00
frankiebee	b24e16d346	re-enabled x-metamask-origin for mascara	2017-09-27 16:14:58 -07:00
kumavis	15b2823e54	Merge branch 'master' into new-currency-test	2017-09-27 16:04:51 -07:00
kumavis	ecf909e140	Merge pull request #2194 from MetaMask/network-controller-refactor Network controller refactor	2017-09-27 15:56:23 -07:00
Dan Finlay	a246770866	Commit to the eth-keyring-controller module	2017-09-27 14:55:34 -07:00
Dan Finlay	aefd17ef94	Remove dead reference	2017-09-27 14:45:24 -07:00
kumavis	06b5dd2096	network controller - move _setProvider to bottom	2017-09-27 14:44:54 -07:00
kumavis	f2d9b75e94	network controller - refactor to use _setProvider	2017-09-27 14:44:13 -07:00
Dan Finlay	96ebbde634	Fix Account Selection Do not select accounts on restore, only on creation and deliberate selection. Fixes #2164	2017-09-27 14:43:34 -07:00
kumavis	7d499df8e3	account-tracker - remove unused import	2017-09-27 14:12:45 -07:00
kumavis	c781e11c7a	network - remove getter/setter	2017-09-27 14:10:58 -07:00
kumavis	7e9c6e96a1	metamask - improve comment	2017-09-27 14:10:17 -07:00
kumavis	4404dfc5d3	Merge branch 'master' into direct-block-tracker	2017-09-27 13:58:54 -07:00
kumavis	5bbea78306	Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3 Transaction controller refractor pt3	2017-09-27 13:57:04 -07:00
kumavis	b41aad6d1a	style - small whitespace nitpick	2017-09-27 12:33:46 -07:00
kumavis	89e690fc79	account-tracker - use new block-tracker block format	2017-09-27 12:33:00 -07:00
Dan Finlay	1983e161c6	Fix accountTracker store references	2017-09-27 12:29:09 -07:00
Dan Finlay	8d3fec42d0	Fix bug where block gas limit was incorrectly parsed.	2017-09-27 12:09:32 -07:00
Dan Finlay	e72083f6e8	Merge branch 'master' into filter-fixes-moar	2017-09-27 10:57:02 -07:00
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	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
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	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
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
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
frankiebee	14b9d16ece	platforms: put context for extension in platform extension class	2017-09-21 11:12:04 -07: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
Chi Kei Chan	a67d3ecd46	Merge branch 'master' into NewUI-flat	2017-09-18 18:13:15 -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
Kevin Serrano	51f0911f87	Merge branch 'master' into new-currency-test	2017-09-18 11:46:10 -07:00
Chi Kei Chan	6c5865d564	Merge branch 'master' into nm	2017-09-18 11:28: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
Chi Kei Chan	8b5f2a95df	Improve styling in Confirmation Screen; Show decoded send token data	2017-09-12 23:04:01 -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
frankiebee	3ad67d1b14	match other controller patterns	2017-09-12 09:59:59 -07:00
Chi Kei Chan	7eb6dae418	Added signTokenTx; Adding token confirmation screen	2017-09-12 02:22:23 -07:00
Dan Finlay	4738746968	Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController	2017-09-11 15:19:17 -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
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
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
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
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
kumavis	76de053b0b	Merge branch 'master' into inpage-provider-fixes	2017-08-28 11:29:47 -07:00
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
sdtsui	dbc539ac55	Merge remote-tracking branch 'mm/master' into NewUI-flat	2017-08-14 11:06:14 +02: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	0188e7b94d	Merge branch 'master' into NewUI-flat	2017-08-08 23:30:58 -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
sdtsui	02c2106c3b	Merge branch 'master' into feat/mm-ui-5	2017-08-06 19:55:34 -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
sdtsui	dd4586ee84	Adjust sidebar transition using @cjeria\'s feedback	2017-08-02 19:26:46 -07:00
sdtsui	61b4b1f947	Ensure app-header is rendered in responsive layout	2017-08-02 19:13:17 -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
frankiebee	96fa29ffbc	put tx resubmission on the block event	2017-06-12 16:11:37 -07:00
kumavis	3b3c96ef34	Merge pull request #1208 from MetaMask/i#1203MainNetSwitch Change default to mainnet	2017-06-12 14:22:07 -07:00
kumavis	c0a023ffdb	default testnet - fix typo	2017-06-12 13:46:56 -07:00
kumavis	27220b7bcd	Merge branch 'master' into i#1203MainNetSwitch	2017-06-12 13:27:04 -07:00
Thomas Huang	13e6672028	Linting	2017-06-12 11:08:32 -07:00
Dan Finlay	ba254d9041	Merge branch 'master' into currency-fix	2017-06-12 10:32:54 -07:00
Kevin Serrano	203a573f3f	Use new URL for currency API from cryptonator.	2017-06-05 16:23:56 -07:00
Kevin Serrano	2b7d842498	Update gasblocklimit params with every block.	2017-06-02 15:18:14 -07:00
Kevin Serrano	82cbfaa826	Convert gasLimit to not use muln in BN	2017-06-01 12:53:16 -07:00
Thomas Huang	8f9a230d8d	Merge pull request #1500 from MetaMask/RemoveStreamingSubprovider Remove streaming subprovider	2017-05-25 15:04:50 -07:00
Dan Finlay	ad40e4d260	Remove stream subprovider Since the polling leak seems to be coming from elsewhere, and new bugs came from this, I'm rolling back this change so that we can push the other improvements sooner and fix the bug at its true root.	2017-05-25 12:37:04 -07:00
frankiebee	717dceede8	fix spelling	2017-05-24 23:36:10 -04:00
frankiebee	3b06a29e1b	Merge branch 'master' into reloadDapp	2017-05-24 23:10:58 -04:00
frankiebee	473b88f399	Reload the page when switching networks for sites that use web3	2017-05-24 23:00:58 -04:00
Dan Finlay	764806d211	Merge pull request #1494 from MetaMask/1472-gasceiling Add Max GasLimit Ceiling	2017-05-24 16:36:00 -07:00
Kevin Serrano	26fd016b63	Add new blockGasLimit property to txMeta object.	2017-05-24 16:17:03 -07:00
kumavis	e6b278569e	inpage-provider - disable polling after first block	2017-05-24 11:34:26 -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	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
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	e08c1541e5	Add a migration for the network controller	2017-05-23 01:55:20 -04:00
frankiebee	13a41f3129	Merge branch 'master' into networkController	2017-05-22 19:48:10 -04:00
kumavis	b217ad1ae8	clean - remove console logs	2017-05-22 16:06:22 -07:00
kumavis	1c1400b584	deps - use stream-subprovider from provider-engine	2017-05-22 15:59:07 -07:00
Dan Finlay	cbfaa6f56f	Rename stream to streamSubprovider	2017-05-22 15:41:13 -07:00
Dan Finlay	48d9a21071	Use filter subprovider in-page to avoid filter leaks	2017-05-22 15:23:29 -07:00
Dan Finlay	709c0eb307	Use stream-provider v3 api	2017-05-22 15:21:25 -07:00
Dan Finlay	c5432da567	Add new streaming subprovider but getting a loop Regarding #1458 Uses a new streaming subprovider architecture on an experimental branch of StreamProvider: https://github.com/flyswatter/web3-stream-provider/tree/StreamSubprovider	2017-05-20 20:38:38 -07: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
kumavis	28aba6e9de	migration 13 - change provider from testnet to ropsten	2017-05-15 23:56:13 -07:00
Thomas Huang	3367363b12	Remove all traces of testnet	2017-05-15 19:11:16 -07:00
Thomas Huang	62ee038889	Merge branch 'master' into i1419-rinkebydefaultnetwork	2017-05-15 18:06:48 -07:00
Thomas Huang	4c10e2021a	Change default network to rinkeby	2017-05-15 18:05:11 -07:00
Dan Finlay	fe3e943169	Merge pull request #1422 from MetaMask/drop-asyncq background - drop async-q in favor of async/await	2017-05-15 15:35:19 -07:00
kumavis	5c9449dec1	background - drop async-q in favor of async/await	2017-05-12 13:09:23 -07:00
kumavis	2c8bbe3b25	migrator - fix typo	2017-05-12 12:27:40 -07:00
kumavis	70a328e028	migrator - cleaner migration runner with es7	2017-05-11 18:15:59 -07:00
frankiebee	6c01b26845	use asyncQ.waterfall instead of asyncQ.eachSeries	2017-05-11 23:25:33 +02:00
frankiebee	1772d34e94	fix migrator	2017-05-11 10:10:50 +02:00
kumavis	68be86abe9	ui - remove web3, use eth-query	2017-05-08 12:29:08 -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
Kevin Serrano	833b9f183f	Minor lint	2017-05-03 07:22:36 -07:00
Dan Finlay	a3149c1752	Use loglevel for more logs	2017-04-30 12:38:38 -07:00
kumavis	6ace0c9afb	notification-manager - remove promise listener seems chrome changed their API? MDN suggests that a Promise should be returned but getting `undefined` https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/windows/create Chrome docs suggest its a callback API lolwut https://developer.chrome.com/extensions/windows#method-create	2017-04-28 16:04:00 -07:00
Dan Finlay	d1a1069180	Merge branch 'master' into rinkeby	2017-04-27 14:50:19 -07:00
Thomas Huang	6bdb4c8728	Fix linting warnings	2017-04-26 21:05:45 -07:00
Kevin Serrano	242dc1e99f	Add missing changes. Create unique style for rinkeby icon.	2017-04-25 14:39:01 -07:00
Nickyg	e9aa37b699	add rinkeby network	2017-04-26 01:40:33 +05:30
Dan Finlay	d05d9a5f57	Add missing tx manager state	2017-04-24 13:55:33 -07:00
kumavis	9b9570fd2b	auto-faucet - only skip faucet on explicit test environment	2017-04-04 18:48:33 -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
Kevin Serrano	39181ed33f	Merge pull request #1308 from MetaMask/FixFaucet Fix faucet to only autoFaucet first account	2017-04-04 09:43:25 -07:00
frankiebee	0a7b388b39	Fix faucet to only autoFaucet first account	2017-04-04 18:38:56 +02:00
frankiebee	f80d1ce3e6	Switch auto-faucet from XMLHttpRequest to fetch	2017-04-04 14:55:48 +02:00
frankiebee	f81fdbc34f	Merge branch 'master' into mascara	2017-04-02 23:04:55 -07:00
frankiebee	89c924101e	Merge branch 'master' into mascara	2017-04-02 22:26:25 -07:00
kumavis	86e882c51a	notification-manager - rename show -> showPoup + make getPopup private	2017-03-31 18:41:51 -07:00
kumavis	aa06183c64	ui - use global.platform for extension interaction	2017-03-31 18:04:13 -07:00
kumavis	810f5881f6	Merge branch 'master' of github.com:MetaMask/metamask-plugin into platform	2017-03-31 17:57:47 -07:00
kumavis	60a48e713f	ui - move popup auto-close after tx conf to ui entrypoint	2017-03-31 13:32:47 -07:00
kumavis	49d8877fd7	ui - startPopup returns store after boot	2017-03-31 13:20:16 -07:00
kumavis	6259ffaef4	extension - remove local extension files, we use extensionizer	2017-03-30 18:35:22 -07:00
kumavis	5036263f88	introduce platform api and rename notifications to notification-manager	2017-03-30 18:33:19 -07:00
kumavis	be88c87b25	extension - prefer extensionizer module	2017-03-30 18:30:24 -07:00
kumavis	1dce352523	tx-manager - add eip155 support	2017-03-30 14:23:23 -07:00
frankiebee	29a602a89b	Clean up	2017-03-30 11:28:22 -07:00
Kevin Serrano	9a6b84644a	Merge pull request #1293 from MetaMask/ImproveGasEstimates tx-utils - gas buffer ceiling at 90% of block gas limit	2017-03-30 09:25:28 -04:00
kumavis	ff49e5e5cf	tx-utils - gas buffer ceiling at 90% of block gas limit	2017-03-29 23:21:31 -07:00
frankiebee	84b3415b44	WIP: lost enital call from dapp to getAccounts	2017-03-29 10:53:43 -07:00
Dan Finlay	98dd684524	Linted	2017-03-29 10:42:43 -07:00
Dan Finlay	610ec2bdf5	Fix popup behavior for Firefox Firefox does not support the `focused` parameter when opening a new window, and we don't actually require it for Chrome either, new popups are at the foreground by default already.	2017-03-29 10:40:57 -07:00
Kevin Serrano	576fb26c15	Add missing migration.	2017-03-29 11:08:15 -04:00
frankiebee	a20a237282	Merge branch 'master' into mascara	2017-03-28 18:02:39 -07:00
Dan Finlay	7b9ac18557	Merge pull request #1268 from MetaMask/kovan-faucet-instructions Add Kovan faucet instructions	2017-03-28 14:56:02 -07:00
Dan Finlay	f2587b7e80	Merge pull request #1273 from MetaMask/i1267-seedfix Assure that seed words are placed into state tree upon request.	2017-03-28 14:54:04 -07:00
Dan Finlay	a3e08d779e	Merge branch 'master' into kovan-faucet-instructions	2017-03-28 14:50:55 -07:00
kumavis	0f1ea5861f	Merge pull request #1276 from MetaMask/ImproveGasEstimates Improve UI gas calculation logic	2017-03-28 14:48:03 -07:00
kumavis	6310a05dae	tx manager - emit update on new unapproved tx	2017-03-28 14:39:29 -07:00
kumavis	e864623d3c	tx manager - add eth-query	2017-03-28 13:56:35 -07:00
kumavis	1495240969	tx manager - adjust new tx flow and txMeta decorations	2017-03-28 13:35:27 -07:00
Dan Finlay	81d3658343	Improve UI gas calculation logic - Now striping hex prefixed gas values, which may have been causing mis-estimation. - Unified calculation logic to be entirely functional. - Greatly simplified how the pending-tx form keeps updated form state. Still needs a commit from @kumavis to ensure the background passes in a txMeta.txParams.gasPrice value.	2017-03-28 11:52:15 -07:00
Kevin Serrano	0625b4a110	Fix injection logic.	2017-03-28 14:30:39 -04:00
Kevin Serrano	a95d96d507	Assure that seed words are placed into state tree upon request.	2017-03-28 11:23:25 -04:00
Kevin Serrano	c1136a6317	Add link to kovan faucet instructions.	2017-03-27 16:05:21 -04:00
Stefaan Ponnet	0faddb2ed2	Allow injection in IFrames + dynamic IFrames	2017-03-26 13:57:44 +02:00
Kevin Serrano	30e8d25013	Merge branch 'master' into i1210-txdisappearance	2017-03-24 17:13:57 -04:00
Dan Finlay	3a888ede2a	Merge branch 'master' into notice-modification	2017-03-24 13:56:30 -07:00
frankiebee	8e30acb41a	Merge branch 'master' into mascara	2017-03-23 15:44:29 -07:00
Dan Finlay	2cab2f767c	Remove gas limit param Fixes #1256 by removing redundant param.	2017-03-23 13:56:32 -07:00
frankiebee	197e6e0b77	WIP: indexdb is at an err state "provider is undefined"	2017-03-23 11:41:32 -07:00
frankiebee	45ab81fb45	WIP: streams->indexdb	2017-03-23 11:06:38 -07:00
Kevin Serrano	fa0bbd66b6	Fix persistence of transactions between networks.	2017-03-23 11:28:06 -04:00
Kevin Serrano	16c76d5229	Create migration to erase body in read notices.	2017-03-23 10:15:59 -04:00
Kevin Serrano	bcaf0864c1	Remove notice body after reading.	2017-03-23 09:58:57 -04:00
Dan Finlay	af9d782363	Merge branch 'master' into i238-kovan	2017-03-22 15:55:01 -07:00
Kevin Serrano	16bdfd3d6e	Merge branch 'master' into i238-kovan	2017-03-22 15:41:38 -07:00
Kevin Serrano	2687b8604b	Merge branch 'master' into i1237-xmlfix2	2017-03-22 15:39:30 -07:00
Kevin Serrano	1b7326048d	Add current block number and hash to the state.	2017-03-22 16:41:19 -04:00
Kevin Serrano	33dd7954a7	Add kovan config settings to config manager.	2017-03-22 16:00:50 -04:00
Kevin Serrano	c5f96be98d	Add kovan to config file.	2017-03-22 15:59:46 -04:00
Kevin Serrano	b5b88392b9	Merge branch 'master' into i1237-xmlfix2	2017-03-22 11:33:56 -07:00
Kevin Serrano	9906da86a4	Modify logic for injection conditions.	2017-03-22 14:25:56 -04:00
frankiebee	8c7be43403	Have better error messages	2017-03-22 09:48:41 -07:00
Dan Finlay	b6e2eaf7b1	Remove eth-lightwallet	2017-03-16 11:16:03 -07:00
Frankie	57d1a1f186	Merge branch 'master' into i#1203MainNetSwitch	2017-03-16 11:00:12 -07:00
Kevin Serrano	a186e40d17	Merge branch 'master' into i1165-predictive	2017-03-14 17:52:03 -07:00
kumavis	53efc53a40	Merge branch 'master' into i#1203MainNetSwitch	2017-03-14 17:26:06 -07:00
Kevin Serrano	37ffcfcf0e	Rename variables to proper currency state variables.	2017-03-14 17:06:16 -07:00
Kevin Serrano	177f2dc948	Fix description of some migrations.	2017-03-14 17:05:47 -07:00
frankiebee	f6e551ef5f	Swithch the default network to mainnet	2017-03-13 21:14:19 -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	b34ee4daa1	Allow for adding recently used addresses to address book.	2017-03-09 15:10:27 -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	acc9a2a9d0	Modify message.	2017-03-08 10:53:11 -08:00
Kevin Serrano	6f980cfe10	Add more informative message	2017-03-08 10:46:17 -08:00
Kevin Serrano	b0280dc162	Merge branch 'master' into i1065-removealert	2017-03-08 10:22:08 -08:00
Dan Finlay	67c3126e63	Merge branch 'master' into kumavis-patch-1	2017-03-08 10:16:50 -08:00
Kevin Serrano	529eb25ced	Convert alert to a log.error	2017-03-08 10:13:45 -08:00
Kevin Serrano	86f71d504c	Merge branch 'master' into i1144-moarrpc	2017-03-08 09:28:36 -08:00
Kevin Serrano	cf2268c3d2	Nodeify and promisify calls to background.	2017-03-08 09:06:41 -08:00
kumavis	92b8443824	tx-utils - add encoding utils	2017-03-07 22:51:39 -08:00
kumavis	c063fab993	tx-utils - stricter naming type-based convention	2017-03-07 22:47:35 -08:00
kumavis	17b805c76e	tx-utils - clean and comment	2017-03-07 22:18:14 -08:00
Dan Finlay	0889309bf3	Merge branch 'master' into i1118-IncreaseGasBuffer	2017-03-07 21:30:43 -08:00
jaredpereira	52ee007fcb	Merge branch 'master' into i1118-IncreaseGasBuffer	2017-03-07 22:55:56 -05:00
Jared Pereira	4916331c53	change BN.mul to BN.muln	2017-03-07 22:42:16 -05:00
frankiebee	2f7a95c257	Fix grammar in erro message	2017-03-07 18:56:38 -08:00
frankiebee	af5ad218e2	Merge branch 'master' into i#1032	2017-03-07 17:59:21 -08:00
frankiebee	3e8b584c98	fix issue where account import allows for duplicates	2017-03-07 17:59:03 -08:00
Jared Pereira	4256e631a6	remove constant buffer and add multiplier	2017-03-07 19:57:57 -05:00
Kevin Serrano	e7e024bcdd	Refactor of code into separate reducers and actions.	2017-03-07 16:01:51 -08:00
Kevin Serrano	08ca7dac5a	Merge branch 'master' into i1144-moarrpc	2017-03-07 10:37:31 -08:00
Dan Finlay	51aa95a65c	Merge branch 'master' into i1173-ShowPersonalMessage	2017-03-06 16:34:24 -08:00
Dan Finlay	e66e755766	Fix normalizeMsgData function to always return hex prefixed	2017-03-06 16:33:33 -08:00
Frankie	b84f1b0532	Fix issue where old txMeta object was being used to pass the txHash to the cb	2017-03-06 15:41:11 -08:00
Dan Finlay	9bd8c5f723	Render personal_sign messages as utf-8 text Calls to `personal_sign` are now: - When hex encoded, preserved as hex encoded, but displayed as utf-8 text. - When not hex encoded, decoded as utf-8 text as hex for signing. - The messages proposed for signing are displayed as UTF-8 text. - When the message cannot be rendered as UTF-8 text, it is displayed as hexadecimal. Fixes #1173	2017-03-06 15:04:11 -08:00
Kevin Serrano	e66035254f	More conflict resolution.	2017-03-01 10:04:25 -08:00
Kevin Serrano	0a3849ec84	Fix merge conflicts.	2017-03-01 10:01:21 -08:00
Dan Finlay	ddc136a7c2	Add a couple more debug logs	2017-02-28 15:41:20 -08:00
Dan Finlay	f908aaafbc	Use correct action to update and submit tx	2017-02-28 14:45:21 -08:00
Dan Finlay	e07e4b7bc7	Linted	2017-02-28 14:13:58 -08:00
Dan Finlay	da88481560	Remove gasMultiplier txMeta param This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic. Removed it and the logic that referred to this now-outdated parameter.	2017-02-28 14:08:00 -08:00
Dan Finlay	2e16e1eb94	Fixed bug that made send screen sometimes transition to account detail	2017-02-28 12:00:07 -08:00
Dan Finlay	1eb4a5d62c	Add background method for updating and approving a tx in one call	2017-02-27 18:25:46 -08:00
Dan Finlay	462c7ae213	Merge branch 'master' into i765-gaslimits	2017-02-27 12:59:19 -08:00
Dan Finlay	b5d03cd524	add controllers to root scripts folder	2017-02-27 10:40:37 -08:00
Dan Finlay	5edb3db969	Merge branch 'master' into i1144-moarrpc	2017-02-27 10:36:48 -08:00
Dan Finlay	8c66260bdb	Removed redundant personal_recover logic	2017-02-24 17:07:54 -08:00
Dan Finlay	f2851402f3	Mostly fix personal_recover	2017-02-24 16:36:29 -08:00
Kevin Serrano	dfc89d6c6d	Make gasPrice accessible to the UI.	2017-02-24 15:06:55 -08:00
Dan Finlay	961a83769b	Fix cancel msg signing behavior.	2017-02-23 16:02:58 -08:00
Dan Finlay	4697aca02c	Got personal_sign working Also fixed bug where signing would not close popup.	2017-02-23 14:23:45 -08:00
Kevin Serrano	62854398f1	Tested against code to play nice with unit tests.	2017-02-23 13:56:58 -08:00
Dan Finlay	7ec25526b7	Add alternate UI for pending personal_sign messages	2017-02-23 11:18:49 -08:00
Dan Finlay	564f920ae0	Add personal sign actions and template	2017-02-22 16:30:09 -08:00
Kevin Serrano	7a0ce31bd3	Implemented functionality for displaying recent custom RPCs	2017-02-22 15:12:56 -08:00
Dan Finlay	8684fc40c7	Allow provider to init before keyringController	2017-02-21 14:41:55 -08:00
Dan Finlay	6c0916c28d	Fix reference	2017-02-21 14:37:01 -08:00
Dan Finlay	92fb07999a	Point metamask-controller personalSignRecover method to keyring-controller	2017-02-21 14:32:35 -08:00
Dan Finlay	0584988688	Move sigUtil and keyrings to external modules These external modules now have their own test coverage and build enforcement. This allowed me to somewhat more easily add good tests around our personalSign strategy (held now in [eth-sig-util](https://github.com/flyswatter/eth-sig-util), and allow each of the keyrings to import that, etc.	2017-02-21 14:25:47 -08:00
Kevin Serrano	026e0e3383	Fix naming	2017-02-21 12:51:46 -08:00
Kevin Serrano	db48f8984f	Basic infrasture for RPC list added.	2017-02-21 12:32:13 -08:00
Dan Finlay	48ab446436	Add memstore update after adding new keyring	2017-02-15 16:25:47 -08:00
kumavis	943bcec0d7	keyring controller - update memStore after restoreKeyring	2017-02-15 16:04:40 -08:00
Dan Finlay	352bb5cb39	Merge branch 'master' into dev	2017-02-15 15:49:04 -08:00
Kevin Serrano	75f7c1244a	Made migrations non-destructive; fixed currency migration.	2017-02-15 11:14:53 -08:00
Kevin Serrano	cd75d86187	Add migrations for removing terms of use data.	2017-02-14 13:21:00 -08:00
Dan Finlay	f2486fbdd3	got hash test passing	2017-02-13 21:25:02 -08:00
Kevin Serrano	f9601ac2dd	Merge branch 'dev' into disclaimer-notify	2017-02-09 19:04:17 -08:00
Kevin Serrano	65c84ac4b2	Delete all code related to disclaimers.	2017-02-09 18:17:50 -08:00
Kevin Serrano	1d0fcf129c	Fix bugs with notice. Add disclaimer notice.	2017-02-09 17:47:51 -08:00
Frankie	de6455151e	Revert old style message sighing	2017-02-09 17:32:49 -08:00
Kevin Serrano	4033b620bd	Allowed net_version to be called synchronously	2017-02-08 15:51:22 -08:00
Dan Finlay	c0637f8d6a	Fix typo	2017-02-04 16:32:09 -08:00
Dan Finlay	0c0c0051e4	Remove shapeshift tx list from idStore	2017-02-04 15:20:31 -08:00
Dan Finlay	89bbccb09c	Stop removing old shapeshift txs	2017-02-04 15:15:50 -08:00
Dan Finlay	af439cc6cf	Do not remove completed shapeshift deposits	2017-02-03 21:40:27 -08:00
Dan Finlay	901eeb5c10	Fix bug when clearing old shapeshift txs	2017-02-03 21:39:22 -08:00
Dan Finlay	5d37f90787	Automatically remove shapeshift txs over 11 minutes old with no payment	2017-02-03 21:36:04 -08:00
Dan Finlay	c9024655d3	Add migration to index	2017-02-03 21:35:54 -08:00
Dan Finlay	4dc71ed57b	Got ShapeShiftController back to working	2017-02-03 21:12:18 -08:00
Dan Finlay	13ee92909c	Mostly got shapeshift tx management into its own controller Rendering the list is still having issues, so this isn't done yet.	2017-02-03 20:45:20 -08:00
kumavis	bc4efa1807	eth-store - update store state after manipulating	2017-02-03 16:07:58 -08:00
kumavis	ff87b9dc7a	id mgmt - update to latest eth_sign spec	2017-02-03 14:59:07 -08:00
kumavis	77f8995568	migrations - fix migration #9 and add safety checks to migrator	2017-02-03 14:00:30 -08:00
kumavis	99d6a329a2	eths-store - eagerly set current block	2017-02-03 12:35:01 -08:00
kumavis	970d4fd695	metamask - add missing diskState and memState subscriptions	2017-02-02 23:47:00 -08:00
kumavis	9e4ef45b6a	migration #9 - break out CurrencyController substate	2017-02-02 23:32:24 -08:00
kumavis	b233e7e37c	eth-store - cbs default to noop	2017-02-02 22:32:00 -08:00
kumavis	8b5e3aa287	migration #8 - break out NoticeController substate	2017-02-02 22:23:45 -08:00
kumavis	73edfc9f31	eth-store - convert to obs-store subclass	2017-02-02 22:05:06 -08:00
kumavis	f08f40aee2	txManager - depend on preferencesStore	2017-02-02 21:09:17 -08:00
kumavis	0c6df24ecf	metamask - introduce networkStore	2017-02-02 20:59:47 -08:00
kumavis	99fa9ab13a	migration 7 - break off TransactionManager substate	2017-02-02 20:20:13 -08:00
kumavis	bcb86f38cb	messageManager - move view state to obs-store	2017-02-02 18:21:22 -08:00
kumavis	79ed2e902f	keyring - replace getState with memStore	2017-02-02 17:07:52 -08:00
kumavis	134a4c7bc3	keyring - manage isUnlocked in memStore	2017-02-02 16:59:15 -08:00
kumavis	5c5aa6ea01	keyring - rm config dep	2017-02-02 16:54:16 -08:00
Kevin Serrano	9b6a06e679	Merge branch 'dev' into notice-management	2017-02-02 16:22:44 -08:00
Kevin Serrano	88882f547e	Change filepath for new location of notices.	2017-02-02 15:59:39 -08:00
kumavis	4c0cb9d92e	metamask - memState - adopt configManager.isDisclaimerConfirmed from keyring controller	2017-02-01 16:38:09 -08:00
Frankie	10ce2a781f	emit a update badge	2017-02-01 15:12:15 -08:00
Frankie	d93708b553	put updateBadge back in	2017-02-01 15:08:06 -08:00
Frankie	c7b9adbfcb	swap out set state for updateState	2017-02-01 15:00:41 -08:00
Frankie	a96f892788	Fix messy merge	2017-02-01 13:25:36 -08:00
Frankie	54b1339f6a	Merge branch 'dev' into messageManagerCleanUp	2017-02-01 13:05:58 -08:00
Frankie	ce0c3ed03c	Merge branch 'dev' into messageManagerCleanUp	2017-02-01 12:03:42 -08:00
Frankie	1b16b46241	code clan up and tests	2017-02-01 11:54:01 -08:00
kumavis	1cb730144d	metamask - adopt isInitialized from keyring controller	2017-02-01 00:31:26 -08:00
kumavis	cd5d952600	keyring - move identities into memStore	2017-02-01 00:17:48 -08:00
kumavis	41c93ceb7e	keyring - add keyringtypes to memStore	2017-02-01 00:02:10 -08:00
kumavis	ad060e2678	metamask - inherit some configManager state from keyring controller	2017-01-31 22:35:11 -08:00
kumavis	c0d3db6a8c	keyring - synchronous getState	2017-01-31 20:02:38 -08:00
kumavis	0b9d37c6c8	migration #6 - fix selectedAddress data source	2017-01-30 15:53:21 -08:00
kumavis	7ccaa263d2	inpage - set web3.eth.defaultAccount correctly	2017-01-30 15:38:32 -08:00
kumavis	2fa60cfcbf	continue rename selectedAccount to selectedAddress	2017-01-30 15:25:12 -08:00
kumavis	f9b31fe2c3	rename selectedAccount to selectedAddress	2017-01-30 15:08:31 -08:00
kumavis	b1de2cdefa	metamask - rename getSelectedAccount to getSelectedAddress	2017-01-30 13:09:46 -08:00
kumavis	7a0acb2333	migration #6 - move selectedAccount from keyringController to preferencesController	2017-01-30 13:01:54 -08:00
kumavis	4dafb09db2	metamask - move selectedAccount set/get to preferencesController	2017-01-30 13:01:07 -08:00
kumavis	0a1918f71a	preferences - introduce preferences controller	2017-01-30 12:42:24 -08:00
Frankie	f40629e5ae	Merge branch 'dev' into messageManagerCleanUp	2017-01-30 00:50:02 -08:00
kumavis	dd528d886f	metamask - lookup selectedAccount via keyringController	2017-01-30 00:32:04 -08:00
kumavis	6480c2d8a6	public config - get selectedAccount from keyring controller substate	2017-01-29 23:59:17 -08:00
Frankie	fdee1e3701	Merge branch 'dev' into messageManagerCleanUp	2017-01-28 22:59:28 -08:00
kumavis	13e2003469	metamask - subscribe metamask store to keyringController substate	2017-01-28 22:12:15 -08:00
Frankie	8be68575bb	Clean up message manger includes: Provider egine bump Remove presence of message manger in keyring controller Change the status wording fom conf to approved make Message manager a class fix messages not being apart of the badge re write message manger to better reflect controller pattern	2017-01-28 20:28:20 -08:00
kumavis	4dd6ba9c1b	migration 5 - move keyring controller state to substate	2017-01-28 19:19:03 -08:00
kumavis	e9cdbf4f89	keyring - add and initialize obs-store	2017-01-28 13:12:12 -08:00
kumavis	1fd1746744	metamask - adopt shapeshift txs from keyringController	2017-01-27 23:05:29 -08:00
kumavis	3afd0ef27d	tests - remove persistence and start with initial state	2017-01-27 23:04:34 -08:00
kumavis	ad9531d521	metamask - organize methods	2017-01-27 19:35:03 -08:00
Frankie	a8ed780d9b	Merge branch 'dev' into messageManagerCleanUp	2017-01-27 14:17:12 -08:00
Frankie	451845142e	Rewrite message controller to fit controller pattern	2017-01-27 14:16:35 -08:00
kumavis	efcd22905a	metamask - fix setupProviderConnection	2017-01-26 23:03:11 -08:00
kumavis	95b846ba07	keymanager - small clean	2017-01-26 22:31:06 -08:00
kumavis	9ab8362843	metamask controller - cleanup remote api	2017-01-26 22:30:12 -08:00
kumavis	fc1b11e373	metamask - organize into sections	2017-01-26 21:19:09 -08:00
kumavis	832772414e	metamask - use web3-stream-provider/handler instead of manual wiring	2017-01-26 21:18:17 -08:00
kumavis	2113979be7	metamask controller - adopt setup*Communication from background	2017-01-26 20:52:46 -08:00
kumavis	fc3a53ec7b	background - stream disconnection fix	2017-01-26 20:18:28 -08:00
kumavis	2f79781ab9	metamask controller - adopt clearSeedWords from keyring controller	2017-01-26 20:17:36 -08:00
kumavis	dc86ddebb7	background - graceful publicConfigStore connection teardown	2017-01-26 16:07:35 -08:00
kumavis	af115aa4c1	background - organize metamask instantiation	2017-01-26 15:09:31 -08:00
kumavis	76ce348a04	obs-store - use published module	2017-01-24 19:47:00 -08:00
kumavis	a06ee45404	migrations - rename 005 to stubbed _multi-keyring	2017-01-24 16:30:42 -08:00
kumavis	bb1ee8e649	Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2	2017-01-24 16:09:57 -08:00
kumavis	70b8e640f0	Merge branch 'dev' into i#1048	2017-01-24 15:39:33 -08:00
kumavis	463a56ff54	background controller - extract KeyringC.placeSeedWords to MetamaskC	2017-01-24 15:33:33 -08:00
Frankie	5811f2ab14	Merge pull request #1051 from MetaMask/hotfix1048 hotfix - addNewAccount - dont assume hd keyring position	2017-01-24 13:38:24 -08:00
kumavis	745fff0c80	hotfix - dont assume hd keyring position	2017-01-24 13:29:48 -08:00
kumavis	01c88bb0bd	keyring-controller - cleanup	2017-01-24 13:22:26 -08:00
kumavis	8049c1fc07	keyring-controller - cleanup	2017-01-24 13:21:55 -08:00
Frankie	48ffea0142	Move the assumption of their only being one hd keyring when requesting seed words to metamaskController	2017-01-24 12:28:05 -08:00
Frankie	8642ced310	Fix issue where generating a new account would put it in loose keys	2017-01-24 12:06:59 -08:00
kumavis	74dc20bdf1	Merge branch 'dev' into obs-store2	2017-01-21 10:06:50 -08:00
Frankie	56d400b0f8	Merge branch 'master' into upToDate	2017-01-20 14:01:58 -08:00
kumavis	9c6cf90538	keyring controller - placeSeedWords should use first hdKeyring	2017-01-20 13:52:21 -08:00
Dan Finlay	9f1884145a	Merge branch 'dev' into i715-AddJsonImport	2017-01-18 17:24:12 -08:00
Dan Finlay	5d8a3dd99b	Add ability to import v3 JSON wallets There is now a menu item labeled "JSON File" for importing, and it can digest either: - v1 MyEtherWallet JSON files - v3 Account files (used by Geth, Mist, and MyEtherWallet). Fixes #715	2017-01-18 16:45:39 -08:00
Dan Finlay	b52346388b	Added new modular private key import system Now any strategy for importing a private key that can be described as a pure function can be very easily turned into a MetaMask import strategy. I've created a generic and reusable UI action called `importNewAccount(strategy, args)`. The `strategy` is a unique identifier defined in `app/scripts/account-import-strategies`, and the `args` will be passed to the member of the `strategies` array whose key matches the strategy string. Strategies return private key hex strings, and are used by the metamask-controller to create a new keyring, and select that new account, before calling back. This also implements @frankiebee's idea of showing the imported account when it's been imported (my oversight!). This commit only moves us to this architecture, keeping feature parity for private key import, but has some untested code for importing geth-style JSON files as well!	2017-01-18 15:20:48 -08:00
Dan Finlay	0e01abdf71	Merge branch 'master' into Version-3.1.0	2017-01-18 12:25:35 -08:00
kumavis	b2c52f6b83	Merge branch 'dev' into i715-AddImportMenu	2017-01-18 11:49:15 -08:00
kumavis	3b7301488f	tx-manager - use rpc-specified txHash	2017-01-18 11:33:37 -08:00
Frankie	e3650b336a	Merge branch 'master' into fixSignedVsSubmitted	2017-01-18 11:30:41 -08:00
Frankie	460cbb985f	Fix the dissplay for submitted transactions and the listner wating to hear when tx's were included in a block	2017-01-18 11:24:53 -08:00
Dan Finlay	1ff4894b67	Allow importing of private key strings Fixes #1021 A top-right menu item now allows `Account Import`. It has a menu (with one item for now) that allows importing a private key string. Errors are displayed, and a success navigates the user to their account list, where the imported account is labeled `LOOSE`.	2017-01-17 16:24:45 -08:00
Dan Finlay	c53932a19a	Merge branch 'dev' into conversion-api-err	2017-01-17 12:08:47 -08:00
Dan Finlay	8fcade92d3	Fix bug where signed messages were not dismissed	2017-01-17 00:13:38 -08:00
Dan Finlay	7ae2e005ed	Fix removeHexPrefix to stripHexPrefix	2017-01-17 00:03:56 -08:00
Dan Finlay	d5ad84aa12	Wrote fix for eth.sign	2017-01-16 23:26:48 -08:00
kumavis	82012cbbce	keyring - simple - throw error if wallet not found for address	2017-01-16 11:54:59 -08:00
kumavis	e7cf0f4bdd	keyring - simple - fix address generation	2017-01-16 11:49:31 -08:00
kumavis	ef81bde98b	eth-store - emit update on new account add	2017-01-14 21:46:40 -08:00
kumavis	f49fb149cc	background - txManager - filter txs by network	2017-01-14 21:29:46 -08:00
kumavis	c3d491a37c	background - return txHash to provider-engine on done	2017-01-14 20:51:29 -08:00
Frankie	fdcf03f57d	Fix the inclusion of the txFee in the meta tx object	2017-01-14 13:32:35 -08:00
Frankie	87505e1742	fix for linting	2017-01-13 18:01:50 -08:00
Frankie	580d93188c	Satisfy review needs: removed unnecessary this.query = opts.query from constructor Created a tx error state for errors in approveTransaction validateTxParams has been moved to tx-utils removed "value" arg from _setTxStatus	2017-01-13 17:47:20 -08:00
Frankie	212ef0b850	fix the maxcost not being included in txMeta	2017-01-13 16:53:10 -08:00
kumavis	d06c54e0b7	Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into bug-submitTx	2017-01-13 15:51:36 -08:00
kumavis	d755b66e20	background - metamask controller - fix 'this' ref	2017-01-13 15:51:08 -08:00
kumavis	9f162e72b4	Merge branch 'dev' into bug-submitTx	2017-01-13 13:26:57 -08:00
Frankie	1ffaab1d9b	Merge branch 'dev' into integrateTxManagerUI	2017-01-13 11:31:51 -08:00
Frankie	5ed52eed68	Clean up code	2017-01-13 10:44:22 -08:00
kumavis	29e83d71a8	background - handle tx finalization in controllers instead of provider-engine	2017-01-13 02:00:11 -08:00
kumavis	bc1615f032	background - fix metamaskController store -> diskStore persistence	2017-01-12 14:40:04 -08:00
kumavis	80514d73b5	migrations - wip - 005 multivault migration	2017-01-12 02:24:33 -08:00
kumavis	b33c51c0a6	migrations - introduce promise-based migrator	2017-01-12 01:17:05 -08:00
kumavis	3bc996878b	background - move pojo migrator to outside of metamask controller	2017-01-11 22:47:56 -08:00
kumavis	8012ede126	background - introduce ObservableStore	2017-01-11 19:31:21 -08:00
kumavis	65ba9fc39e	bugfix - portstream - dont wrap cb in try catch	2017-01-11 19:09:49 -08:00
Frankie	f9efb0817d	Merge branch 'dev' into integrateTxManagerUI	2017-01-11 16:07:03 -08:00
Frankie	576e2ad64d	Fix wording and icon of failed txs	2017-01-11 15:44:21 -08:00
Dan Finlay	d87a7b2a76	Send update to UI when changing selected account Fixes #981	2017-01-11 15:15:37 -08:00
kumavis	89a5eff270	currency conversion - less noisy error	2017-01-11 14:40:35 -08:00
Frankie	bbd2f2738b	Add to CHANGELOG	2017-01-11 12:23:00 -08:00
Frankie	0b59dafc34	Merge branch 'dev' into integrateTxManagerUI	2017-01-11 12:17:17 -08:00
Frankie	0fae263a9a	Take some of the tx Logic out of the UI and create a visble state for pending and unaproved transactions	2017-01-11 12:16:37 -08:00
kumavis	26e4ff40e1	rpc - fix sync account cache setting	2017-01-11 02:33:57 -08:00
kumavis	61637c738b	web3 provider - override eth_syncing and web3_clientVersion	2017-01-11 00:46:44 -08:00
Dan Finlay	21e2e4efd8	Remove erroneous OOG estimation logic.	2017-01-10 14:20:46 -08:00
kumavis	b301c0fb48	deps - replace promise-request with fetch	2017-01-10 12:04:26 -08:00
kumavis	4c1b7700ad	Merge branch 'dev' into TearDownOnDisconnect	2017-01-05 14:25:31 -05:00
kumavis	00ac5ca058	Merge branch 'dev' into TearDownOnDisconnect	2017-01-05 14:18:34 -05:00
Dan Finlay	73ee0ae766	Merge branch 'dev' into fixTxManager	2017-01-05 11:18:13 -08:00
Frankie	e62f70660d	MetaMask Controller - Convert to EventEmitter	2017-01-05 11:06:18 -08:00
Dan Finlay	7659f5894a	Combine two identical then blocks	2017-01-05 11:03:30 -08:00
Frankie	cf6817092b	remove unnecessary try statments	2017-01-04 15:03:45 -08:00
Dan Finlay	6c99d09404	Fixed bugs with sanity-checking - Was incorrectly calling some eth-query methods (left over from old local eth-query) - Was still passing block to getAccount in addAccount - Now emitting update only after all account balances are loaded, reducing UI update traffic.	2017-01-04 14:54:40 -08:00
Dan Finlay	ead8a05034	Fix dependency reference	2017-01-04 14:21:36 -08:00
Dan Finlay	a107b66854	Caught typo	2017-01-04 14:15:53 -08:00
Dan Finlay	18e6d266c1	Add descriptive comment	2017-01-04 14:07:08 -08:00
Dan Finlay	381a60695d	Linted	2017-01-04 14:05:00 -08:00
Dan Finlay	3588aabdf2	Removed reliance on eth-store internal custom eth-query	2017-01-04 14:01:32 -08:00
Dan Finlay	08351f801a	Move eth-store@1.1.0 into local repo.	2017-01-04 13:56:21 -08:00
Frankie	32e8063a77	clean up	2017-01-04 13:13:34 -08:00
Frankie	354fa763d4	Merge branch 'dev' into fixtTxManager	2017-01-04 13:05:29 -08:00
Frankie	e6da8e2762	Fix signing of transactions	2017-01-04 13:04:33 -08:00
Dan Finlay	33b4d213f1	Fix sendUpdate for new promisified getState method	2017-01-03 11:15:38 -08:00
Dan Finlay	1b9906372b	Update UI state on ethStore updates UI was remarkably not relying on ethStore for updates, so things like account balances were frozen until user activity. Fixes #963	2017-01-03 11:10:20 -08:00
Dan Finlay	af2c7004b0	Make single letter variables more verbose	2017-01-02 15:08:18 -08:00
Dan Finlay	25d0ac1476	Merge branch 'dev' into ShowDifferentAccounts	2017-01-02 14:04:27 -08:00
Dan Finlay	edc5f9e821	Add tolerance for hex prefixed private keys to simple keychain	2017-01-02 13:55:43 -08:00
kumavis	616721f47d	inpage-provider - add isMetaMask adds `metamaskInpageProvider.isMetaMask === true` Fixes #727	2017-01-02 12:20:09 -08:00
Dan Finlay	21af3de43d	Merge branch 'FixMigrationPasswordBug' into ShowDifferentAccounts	2016-12-23 17:10:56 -08:00
Dan Finlay	e95c937569	Add additional migration test	2016-12-23 17:09:24 -08:00
Frankie	fa3e708f34	Merge branch 'dev' into TxManager	2016-12-23 12:48:36 -08:00
Frankie	fde69ea0ba	fix some minor spelling mistakes and clean up code	2016-12-23 12:43:42 -08:00
Dan Finlay	a10fe6b6f4	Return keyring metadata on metamask state object Required making the getState methods for both keyringController and metamaskController async. They both now return promises, and the main metamask-controller.getState method is now nodeified. Will allow the UI to render loose keys differently than persisted keys.	2016-12-22 17:17:07 -08:00
Dan Finlay	1861bf8e2b	Remove log	2016-12-22 14:46:14 -08:00
Dan Finlay	898e96fd6a	Merge pull request #948 from MetaMask/RecoverLostAccounts Auto-Recover accounts lost to BIP44 derivation fix	2016-12-22 14:43:43 -08:00
Dan Finlay	98527c1c25	Fix account injection bug It seems `selectedAddress` was removed from the keyring-controller’s state, and is used to populate the injected current account. I couldn't help myself, I dug around, I found a PR named [changed all instances of selectedAddress to selectedAccount](`f5b0795ac5`) by @Zanibas. Sorry, Kevin! Had you actually changed all instances, this bug would not have happened. Fixes #908	2016-12-22 14:43:00 -08:00
Dan Finlay	9e54e3baa0	Break up migration function	2016-12-22 13:56:45 -08:00
Dan Finlay	291403c13f	Don't bother changing selected accounts since accounts are recovered	2016-12-22 13:45:45 -08:00
Dan Finlay	cf3951c9df	Remove logs	2016-12-22 13:40:12 -08:00
Dan Finlay	0df656850d	Linted	2016-12-21 17:30:10 -08:00
Dan Finlay	ebeaf3b3d6	Restructured migration Migrator now returns a lostAccount array that includes objects these objects include keys of address and privateKey, this allows the MetamaskController to restore the lost accounts even without customizing the idStore or the KeyringController. Also includes a patch that allows idStore to synchronously export private keys.	2016-12-21 17:21:10 -08:00
Dan Finlay	a3a64afdd5	Return undefined when vault is uninitialized	2016-12-21 17:20:14 -08:00
Dan Finlay	05ce7086f7	Added error when trying to unlock uninitialized vault	2016-12-21 17:19:53 -08:00
Frances Pangilinan	9e1c90eafc	fix merge	2016-12-21 14:46:10 -08:00
Frankie	6f7c23fd28	Merge branch 'dev' into TxManager	2016-12-21 14:31:07 -08:00
Frances Pangilinan	a85c691b71	Remove txManager in keyring controller	2016-12-21 14:06:15 -08:00
Frances Pangilinan	1ebcbe296b	Migrate all tx mutation code out of keyring controller and Fix up txManager to reflect code review requests	2016-12-21 13:41:49 -08:00
Frances Pangilinan	6e78494846	First pass at revision requests	2016-12-21 13:41:32 -08:00
Dan Finlay	48f2ae2154	Move old keystore migration code to metamask controller Allows keyring controller to be more generic, less opinionated, and who knows, maybe sooner publishable as its own thing.	2016-12-21 11:02:04 -08:00
Kevin Serrano	aea263a80d	Lint.	2016-12-20 16:45:22 -08:00
Dan Finlay	931ae5f64a	Make notices confirmation configurable - Confirm button will now dismiss the lost accounts array.	2016-12-20 15:24:08 -08:00
Dan Finlay	674b268982	Merge pull request #916 from MetaMask/i894-DetectBadAccounts I894 detect bad accounts	2016-12-20 11:50:26 -08:00
Dan Finlay	26f1e6cbd2	Remove encryptor in favor of external browser-passworder I broke out the encryptor lib into its own module on npm called browser-passworder.	2016-12-19 21:55:02 -08:00
Dan Finlay	20d2204ce6	Made changes according to feedback.	2016-12-19 19:32:59 -08:00
Dan Finlay	ead8329877	Merge pull request #937 from MetaMask/i900-forgot-password-flow I900 forgot password flow	2016-12-19 16:01:01 -08:00
Kevin Serrano	e9bea92ac3	Lint.	2016-12-19 14:55:52 -08:00
Dan Finlay	77d2deb176	Merged master into dev	2016-12-19 13:37:27 -08:00
kumavis	b4a298e1a3	inpage - temporarily disable ping stream	2016-12-19 12:25:35 -08:00
kumavis	73998feeb2	move notice code from metamask-controller + config-manager, in to notice-controller	2016-12-16 12:44:47 -08:00
Kevin Serrano	1458b8c68e	Deactivate polling for now.	2016-12-16 11:39:41 -08:00
Dan Finlay	2b1d821da3	Cleanup	2016-12-16 11:26:39 -08:00
Kevin Serrano	851ba66cdd	Add ability to show notices to user & get confirmation. Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition.	2016-12-16 10:55:42 -08:00
Kevin Serrano	8819475a2e	Add ability to show notices to user & get confirmation. Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition.	2016-12-16 10:44:52 -08:00
Dan Finlay	83880a5c92	Remove morden testnet provider Instances configured to point at Morden will now point at Ropsten.	2016-12-15 16:12:03 -08:00
Frances Pangilinan	da9349fe63	Clean up and comment functions	2016-12-14 15:04:33 -08:00
Frances Pangilinan	090935f90a	Create a TxManager	2016-12-14 12:55:41 -08:00
Dan Finlay	7b9749e30c	Got bad account detection working and added to state	2016-12-09 12:24:25 -08:00
Dan Finlay	ab9e15b782	Mostly added bad account detection Currently riddled with logs, because the migrator is inexplicably returning before generating the new style accounts for comparison.	2016-12-08 14:22:02 -08:00
kumavis	26b60f1b5a	inpage - correctly listen for incomming messages	2016-12-07 14:42:38 -08:00
Dan Finlay	c431783602	Remove redundant logging block	2016-12-01 10:21:56 -08:00
Dan Finlay	1880cda9b9	Fix vault encrypting & unlocking bug This is only a bug in dev, but was committed yesterday. Sometimes the `encrypt` method was being passed values other than the password as the encryption key, leading to un-unlockable vaults. To find this, and avoid it for all time hereafter, I added several more steps to our oft-neglected integration test suite, which now fully initializes a vault, locks it, and unlocks it again, to make sure all of those steps definitely work always.	2016-11-30 19:36:24 -08:00
Dan Finlay	95bcc21a06	Add useful nodeify error message If a nodified method does not return a Promise, it will throw an error, like this: ``` Error in event handler for (unknown): Error: The function setSelectedAccount did not return a Promise, but was nodeified. ```	2016-11-29 15:54:10 -08:00
Dan Finlay	df0b89074b	Return promise correctly from setSelectedAddress	2016-11-29 15:50:26 -08:00
Dan Finlay	5bf1018d75	Flattened addTx async methods	2016-11-29 14:56:58 -08:00
Dan Finlay	ff3f6cc36a	Bind ethQuery to estimateGas to allow it to be moved around.	2016-11-29 14:13:12 -08:00
Dan Finlay	85d5b12f8d	Fix tx adding code Broken in this commit: `bc39cd7b89` Synchronous methods were added to an `async.waterfall` array. This commit also removes the delegate call checking, since we concluded it was misinformed.	2016-11-29 12:46:08 -08:00
Dan Finlay	4b6b1db4f0	Ordered keyringController methods the same in metamask-controller	2016-11-29 12:05:23 -08:00
Dan Finlay	b81f00849d	Annotated KeyringController	2016-11-29 11:40:49 -08:00
Dan Finlay	9d401f9137	Fix nodeify usage	2016-11-28 17:27:28 -08:00
Dan Finlay	9e764b1935	Fix nodeify	2016-11-28 17:27:20 -08:00
Dan Finlay	80e76b45ee	Denodeify most of KeyringController Mostly Fixes #893 A couple methods cache callbacks, and will require a larger refactor to fully denodeify. Specifically, our methods involving web3 requests to sign a tx, sign a message, and approve or cancel either of those. I think we should postpone those until the TxManager refactor, since it will likely handle this response caching itself.	2016-11-28 16:13:03 -08:00
Dan Finlay	b899119582	Merge branch 'master' into dev	2016-11-23 16:54:27 -08:00
Dan Finlay	d9dc2eac63	Fix more async usage of KeyringController	2016-11-23 14:35:29 -08:00
Dan Finlay	230a0ab876	Fix more keyring asyncifying tests	2016-11-23 11:58:34 -08:00
kumavis	c0a2eb146a	rpc - add sync uninstallFilter support	2016-11-23 10:48:20 -08:00
Dan Finlay	600f5c31db	Mostly got async keyringController tests passing	2016-11-23 00:23:41 -08:00
Dan Finlay	c77d355e98	Complete first pass at asyncrhonizing keyring controller	2016-11-22 23:36:11 -08:00
Dan Finlay	2efab79f5b	Asynced keyrings and started on controller	2016-11-22 23:16:36 -08:00
Dan Finlay	05c8658ff3	Fix new encryptor migration logic	2016-11-22 17:41:54 -08:00
Dan Finlay	822face7a3	Fix password reference	2016-11-22 16:29:46 -08:00
Dan Finlay	6ebdebc0a5	Remove line of cruft	2016-11-22 16:18:18 -08:00
Dan Finlay	4b7b0a86d8	Refine isInitialized derivation method	2016-11-22 15:57:48 -08:00
Dan Finlay	de8da9ddf6	Simplify Encryptor API Surface At least, the portion of it that we use. Moved salting within the encryptor, so it does not need to be managed externally. KeyringController now caches the password instead of a passwordDerivedKey, since it is ignorant of the salt. Encryptor payload is now in a JSON format, so its portions are both base64 encoded and labeled appropriately. The format is `{ "data": "0x0", "iv": "0x0", "salt": "string" }`. Fixes #843 Fixes #859	2016-11-22 15:54:51 -08:00
Dan Finlay	2966d46fa2	Merge branch 'dev' into i843-MoveSaltIntoEncryptor	2016-11-22 15:36:50 -08:00
Dan Finlay	c8176c9439	Merge pull request #875 from MetaMask/i868-estimateGasTooHigh-dev I868 estimate gas too high dev	2016-11-22 14:42:46 -08:00
kumavis	bc39cd7b89	KeyringController - estimateGas->analyzeGasUsage fix gasLimit + detect OOG	2016-11-22 14:28:31 -08:00
kumavis	e14efa8f17	Merge pull request #858 from MetaMask/i842-WaitForSeedWord I842 wait for seed word	2016-11-22 16:18:43 -05:00
Dan Finlay	c4056a861a	Move state update outside of conditional callback block	2016-11-22 13:13:10 -08:00
Dan Finlay	606c0b7618	Remove callback type check	2016-11-22 12:57:15 -08:00
kumavis	4669f262e2	Merge pull request #857 from MetaMask/i841-RenameMethod Rename idStoreMigrator method for clarity	2016-11-22 15:55:48 -05:00
kumavis	e61d792832	Merge pull request #869 from MetaMask/dev-cleanup Dev Cleanup Package	2016-11-22 15:23:55 -05:00
kumavis	49a1f43736	Merge branch 'master' into i868-estimateGasTooHigh	2016-11-22 15:14:25 -05:00
kumavis	fa2f0dee28	idStore - fix estimateGas calculation	2016-11-22 12:10:49 -08:00
Kevin Serrano	6dad4f1f20	Phase out ethereumjs-util from encryptor module.	2016-11-22 11:17:05 -08:00
Dan Finlay	0289444fcb	Merge branch 'dev' into i842-WaitForSeedWord	2016-11-22 10:51:48 -08:00
Kevin Serrano	8261cf232d	Merge branch 'dev' into dev-cleanup	2016-11-22 10:50:15 -08:00
Dan Finlay	ca819781cb	Merge pull request #866 from MetaMask/new-faucet-dev Make ropsten faucet button point at the correct url.	2016-11-22 10:30:50 -08:00
Kevin Serrano	17669e4af8	Make ropsten faucet button point at the correct url.	2016-11-22 10:20:59 -08:00
Kevin Serrano	8d2afccdc0	Ropsten has sole access to the faucet.	2016-11-22 10:13:57 -08:00
Dan Finlay	136296aad6	Began moving salt into encryptor	2016-11-22 09:52:43 -08:00
Kevin Serrano	88ed1f191f	Add to changelog.	2016-11-22 09:45:28 -08:00
Dan Finlay	ea56426b23	Use callback in placeSeedWord method. When displaying seed words, we were not using a callback, which had some race condition potential. This is simply a little cleaner and more correct. Fixes #842	2016-11-21 20:08:36 -08:00
Dan Finlay	9fb96128e6	Rename idStoreMigrator method for clarity Fixes #841	2016-11-21 19:52:56 -08:00
Dan Finlay	ced36eb201	Improve Keyring organization Separated public & private methods. (Fixes #845) Made class method `type()` into a simple property. (Fixes #846)	2016-11-21 19:40:58 -08:00
Kevin Serrano	1cbab788ec	Change fauceting to become a response of an emit.	2016-11-21 16:46:26 -08:00
Kevin Serrano	f5b0795ac5	change all instances of selectedAddress to selectedAccount.	2016-11-21 16:21:16 -08:00
Kevin Serrano	9123e70434	Remove entropy from encryption and project.	2016-11-21 15:49:03 -08:00
Dan Finlay	7ab9d40820	Merge branch 'dev' into i831-AddRopsten-Dev	2016-11-21 11:03:32 -08:00
Dan Finlay	e8a8302624	Begin adding Ropsten support Ropsten links will still not work until Etherscan publishes their ropsten link format. At that time we will need to update ui/lib/account-link.js Otherwise, fixes #831	2016-11-21 10:58:49 -08:00
Kevin Serrano	d6286cd13a	Maintain linting.	2016-11-18 16:27:26 -08:00

... 21 22 23 24 25 ...

2716 Commits