1472 Commits

Author	SHA1	Message	Date
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