tangerine-wallet-browser - Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser)

	Commit message (Collapse)	Author	Age	Files	Lines
*	sentry - extractErrorMessage - fix comment formatting	kumavis	2018-03-01	1	-1/+1
\|
*	sentry - failed tx - improve ethjs-rpc error formating	kumavis	2018-03-01	1	-0/+38
\|
*	sentry - clean - move setupRaven to lib	kumavis	2018-03-01	1	-0/+26
\|
*	Merge branch 'master' into uat-master	Dan Finlay	2018-02-22	2	-2/+12
\|\
\| *	Merge pull request #3250 from MetaMask/i#3136	kumavis	2018-02-16	1	-2/+3
\| \|\ \| \| \| \| \| \|	fix - hex prefix estimatedGas on txMeta
\| \| *	fix - hex prefix estimatedGas on txMeta	frankiebee	2018-02-15	1	-2/+3
\| \| \|
\| * \|	Fix incorrect promise instantiation	Dan Finlay	2018-02-16	1	-1/+1
\| \| \|
\| * \|	metamask mesh - inject mesh testing container	kumavis	2018-02-11	1	-0/+9
\| \|/
* \|	Fix promise construction	Dan Finlay	2018-02-21	1	-1/+1
\| \|
* \|	Merge branch 'uat' into uat-next	Dan	2018-02-08	1	-0/+11
\|\ \
\| * \|	Merge branch 'master' into uat	Dan	2018-02-08	1	-0/+11
\| \|\\|
\| \| *	preserve other networks TXs	Bruno Barbieri	2018-02-01	1	-3/+4
\| \| \|
\| \| *	use txMeta.txParams	Bruno Barbieri	2018-01-31	1	-1/+1
\| \| \|
\| \| *	wipe only transactions for current account	Bruno Barbieri	2018-01-31	1	-3/+9
\| \| \|
\| \| *	clean up	Bruno Barbieri	2018-01-31	1	-3/+3
\| \| \|
\| \| *	added reset account feature	Bruno Barbieri	2018-01-31	1	-0/+4
\| \| \|
* \| \|	[NewUI] Opens to full screen when restoring from seed. (#3201)	Dan J Miller	2018-02-08	1	-0/+11
\|/ / \| \| \| \| \| \| \| \| \| \|	* Opens to full screen when restoring from seed. * Remove redundant parameter in actions.markPasswordForgotten call.
* \|	Merge branch 'uat' into newmaster	Chi Kei Chan	2018-01-20	3	-2/+15
\|\ \ \| \|/ \|/\|
\| *	Merge branch 'uat' into uat-master-011618	Alexander Tseung	2018-01-17	3	-2/+15
\| \|\
\| \| *	Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c	Alexander Tseung	2018-01-04	3	-2/+15
\| \| \|\
\| \| \| *	Merge branch 'NewUI-flat' into merge-master	Alexander Tseung	2017-12-23	3	-2/+15
\| \| \| \|\
\| \| \| \| *	Merge branch 'master' into NewUI-flat	Dan	2017-12-21	3	-4/+10
\| \| \| \| \|\
\| \| \| \| * \	Merge branch 'master' into NewUI-flat	Chi Kei Chan	2017-12-07	1	-3/+15
\| \| \| \| \|\ \
\| \| \| \| * \| \|	Merge branch 'master' into NewUI-flat-merge-with-master	Dan	2017-12-07	1	-1/+3
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Sign Typed Request styling fixes	Chi Kei Chan	2017-10-26	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Signature request fixes.	Dan	2017-10-26	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Merge branch 'master' into NewUI-flat	Chi Kei Chan	2017-10-25	11	-26/+25
\| \| \| \| \|\ \ \
\| \| \| \| * \ \ \	Merge branch 'master' into NewUI-flat	Chi Kei Chan	2017-10-21	1	-0/+23
\| \| \| \| \|\ \ \ \
\| \| \| \| * \ \ \ \	Merge branch 'NewUI-flat' into merge	Chi Kei Chan	2017-10-19	2	-1/+14
\| \| \| \| \|\ \ \ \ \
\| \| \| \| \| * \| \| \| \|	UI for send screen container without form rows.	Dan	2017-10-09	1	-1/+4
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \|	Merge branch 'master' into NewUI-flat	Chi Kei Chan	2017-10-04	3	-28/+19
\| \| \| \| \| \|\ \ \ \ \
\| \| \| \| \| * \ \ \ \ \	Merge branch 'master' into mmn	Chi Kei Chan	2017-09-28	7	-175/+444
\| \| \| \| \| \|\ \ \ \ \ \
\| \| \| \| \| * \ \ \ \ \ \	Merge branch 'master' into NewUI-flat	Chi Kei Chan	2017-09-19	1	-3/+9
\| \| \| \| \| \|\ \ \ \ \ \ \
\| \| \| \| \| * \ \ \ \ \ \ \	Merge branch 'master' into nm	Chi Kei Chan	2017-09-19	11	-175/+250
\| \| \| \| \| \|\ \ \ \ \ \ \ \
\| \| \| \| \| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'mm/master' into NewUI-flat	sdtsui	2017-08-14	2	-4/+15
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \
\| \| \| \| \| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into NewUI-flat	kumavis	2017-08-09	3	-33/+209
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \
\| \| \| \| \| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into feat/mm-ui-5	sdtsui	2017-08-07	5	-93/+28
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Adjust sidebar transition using @cjeria\'s feedback	sdtsui	2017-08-03	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Ensure app-header is rendered in responsive layout	sdtsui	2017-08-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	test - tx controller - fix txGasUtil reference	kumavis	2018-01-18	1	-1/+2
\|/ / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create new flag for simple sends to avoid overloading other flag	Dan Finlay	2018-01-17	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set gas limit to 21k for recipients with no code	Dan Finlay	2018-01-16	1	-5/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2907
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Account for 0x/empty string address and contract creation	Thomas	2018-01-08	1	-0/+11
\|/ / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2783 from MetaMask/tx-param-vaalidation	kumavis	2018-01-03	1	-2/+9
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	transactions - throw error if txParams.value contains a decimal
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tx-gas-utils - tx-param-validation - use more intuitive check	kumavis	2018-01-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	transactions - throw error if dapp provides txParams whos value has a decimal	frankiebee	2017-12-21	1	-2/+9
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2817 from MetaMask/i#2810	Frankie	2017-12-29	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	only check nonces of transactions who's from address match the txMeta
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	transactions:pending - only check nonces of transactions who's from adress ↵	frankiebee	2017-12-28	1	-1/+2
\| \| \|/ / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	match the txMeta
* / \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix some silly linting issues.	Kevin Serrano	2017-12-28	1	-1/+1
\|/ / / / / / / / / / / / / /
* / / / / / / / / / / / / /	Stop failing pending transactions after any period of time	Dan Finlay	2017-12-22	1	-7/+0
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	transactions:gas-utils - handle new type of estimateGas error	frankiebee	2017-12-15	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	dont aggresively query account data	frankiebee	2017-12-14	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	tx-controller - failed state is a finished state	kumavis	2017-12-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Add retry background method and action	Dan Finlay	2017-12-07	1	-0/+4
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta ↵	Dan	2017-12-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in _resubmitTx
* \| \| \| \| \| \| \| \| \| \| \|	Fix undefined latestBlockNumber in _resubmitTx	Dan	2017-12-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Exponentional backoff on transaction retry in pending-tx-tracker	Dan	2017-12-06	1	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	deps - obs-store@3 + migrate stream plumbing	kumavis	2017-11-29	1	-1/+3
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Fix lint warnings	Daijiro Wachi	2017-10-22	11	-26/+25
\| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 ```
* \| \| \| \| \| \| \| \| \|	Linted	Dan Finlay	2017-10-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault	Dan Finlay	2017-10-19	3	-27/+12
\|\\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Revert "NetworkController refactor for new EthClient interface"	kumavis	2017-10-19	3	-27/+12
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Make account tracking much more reactive	Dan Finlay	2017-10-19	1	-3/+8
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Make account tracking more reactive	Dan Finlay	2017-10-19	1	-0/+18
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We were doing a lot of conditional observation & updating. Pulled out a bunch of that for generic observer/syncers.
* \| \| \| \| \| \| \| \|	nonce-tracker - use blockTracker directly	kumavis	2017-10-12	1	-7/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	util - add obj-proxy	kumavis	2017-10-11	1	-0/+19
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	events-proxy - clean up	kumavis	2017-10-11	1	-5/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2223 from ukstv/master	Dan Finlay	2017-10-10	1	-0/+123
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add eth_signTypedData handler
\| * \| \| \| \| \| \| \| \|	Validate data format for eth_signTypedData	Sergey Ukustov	2017-10-07	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into SignTypedData	Dan Finlay	2017-10-07	2	-1/+28
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into SignTypedData	Dan Finlay	2017-10-06	1	-3/+5
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Add signTypedData input validations	Dan Finlay	2017-10-06	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into SignTypedData	Dan Finlay	2017-10-06	1	-5/+7
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/master'	Sergey Ukustov	2017-10-03	3	-23/+12
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Add eth_signTypedData handler	Sergey Ukustov	2017-09-30	1	-0/+108
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #2305 from MetaMask/nodeify	Frankie	2017-10-07	1	-2/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	nodeify - allow callback to be optional
\| * \| \| \| \| \| \| \| \| \| \|	lint fix - nodeify	kumavis	2017-10-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	nodeify - allow callback to be optional	kumavis	2017-10-07	1	-2/+10
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInit	kumavis	2017-10-07	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update status of pending transactions on startup
\| * \| \| \| \| \| \| \| \| \| \|	Check status of pending transactions on startup	Dan Finlay	2017-10-07	1	-0/+1
\| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #1531
* \| \| \| \| \| \| \| \| \| \|	When checking pending txs, check for successful txs with same nonce.	Dan Finlay	2017-10-07	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a successful tx with the same nonce exists, transition tx to the failed state. Fixes #2294
* \| \| \| \| \| \| \| \| \| \|	Provide method for tx tracker to refer to all txs	Dan Finlay	2017-10-07	1	-1/+7
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	"fix" hours for message	frankiebee	2017-10-06	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	pending-tx - check time stamp instead of block number for resubmit	frankiebee	2017-10-06	1	-3/+4
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	pending tx tracker - on tx:warn append error message instead of error obj	kumavis	2017-10-03	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	pending tx tracker - tx:warning event includes err obj	kumavis	2017-10-03	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	pending tx tracker - resubmit - warn dont error on unknown error	kumavis	2017-10-03	1	-2/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	pending tx tracker - dont throw on load failure	kumavis	2017-10-03	1	-1/+0
\| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into ↵	kumavis	2017-10-03	1	-1/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	history-notes
\| * \ \ \ \ \ \ \	Merge branch 'master' into history-notes	frankiebee	2017-10-03	1	-1/+2
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	tx state history - fix bug where initial snapshot was mutated on updateTx	kumavis	2017-10-03	2	-2/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	tx state history - append note to first op of diff	kumavis	2017-10-03	1	-2/+5
\|/ / / / / / / / /
* / / / / / / / /	transaction - provide notes for history	frankiebee	2017-10-03	1	-5/+5
\|/ / / / / / / /
* / / / / / / /	pending-tx - dont check the balance to rebrodcast	frankiebee	2017-09-30	1	-15/+0
\|/ / / / / / /
* \| \| \| \| \| \|	account-tracker - remove unused import	kumavis	2017-09-28	1	-1/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'master' into direct-block-tracker	kumavis	2017-09-28	4	-37/+261
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3	kumavis	2017-09-28	3	-36/+257
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Transaction controller refractor pt3
\| \| * \| \| \| \| \| \|	pending-tx - move incrementing of the retryCount on the txMeta outside ↵	frankiebee	2017-09-27	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pending-tx-tracker
\| \| * \| \| \| \| \| \|	transactions: make evnt names pretty and eaiser to read	frankiebee	2017-09-27	1	-8/+8
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	transactions: lint fixes and reveal status-update event for balance controller	frankiebee	2017-09-27	1	-6/+6
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'master' into transactionControllerRefractorPt3	frankiebee	2017-09-27	11	-185/+163
\| \| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	ensure that values written to txParams are hex strings	frankiebee	2017-09-14	1	-0/+9
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	linting && format fixing	frankiebee	2017-09-13	1	-5/+4
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	match other controller patterns	frankiebee	2017-09-13	1	-8/+13
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	fix miss type	frankiebee	2017-09-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	more tests and craete a getPendingTransactions function	frankiebee	2017-09-09	1	-0/+6
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	remove unused variable	frankiebee	2017-09-07	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	fix merge and errors disaperaing on update	frankiebee	2017-09-07	1	-2/+5
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' into transactionControllerRefractorPt3	frankiebee	2017-09-07	4	-52/+136
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	add better comments	frankiebee	2017-09-06	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	rename tx-utils.js -> tx-gas-utils.js	frankiebee	2017-09-06	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	remove #buildEthTxFromParams	frankiebee	2017-09-06	1	-17/+0
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' into transactionControllerRefractorPt3	frankiebee	2017-08-22	3	-12/+56
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Create TxStateManager	frankiebee	2017-08-22	1	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Create tests for TxStateManager	frankiebee	2017-08-19	1	-0/+201
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix bug where block gas limit was incorrectly parsed.	Dan Finlay	2017-09-28	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	style - small whitespace nitpick	kumavis	2017-09-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	account-tracker - use new block-tracker block format	kumavis	2017-09-28	1	-4/+2
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into filter-fixes-moar	Dan Finlay	2017-09-28	2	-55/+72
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Move obs store into account-tracker instead of inheriting	Dan Finlay	2017-09-27	1	-13/+18
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Restore blockGasLimit to account-tracker	Dan Finlay	2017-09-27	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Implemented feedback	Dan Finlay	2017-09-26	1	-5/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into AddBalanceController	Dan Finlay	2017-09-23	8	-124/+82
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Refactor eth-store into account-tracker	Dan Finlay	2017-09-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \| \| \| \| \| \| \| \| \|	Remove dead code from eth-store	Dan Finlay	2017-09-23	1	-43/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add computed balance to account detail view	Dan Finlay	2017-09-14	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController	Dan Finlay	2017-09-12	1	-0/+51
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Linted	Dan Finlay	2017-09-08	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Make tx calculations account for gas prices	Dan Finlay	2017-09-08	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Remove logs	Dan Finlay	2017-09-08	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Fix balance calc test	Dan Finlay	2017-09-08	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Add constructor comment	Dan Finlay	2017-09-08	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Fix valueFor test	Dan Finlay	2017-09-08	1	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Add basic test for valueFor	Dan Finlay	2017-09-08	1	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	test not passing	Dan Finlay	2017-09-08	1	-1/+17
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Check balances in parallel	Dan Finlay	2017-09-07	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Add first passing balance calc test	Dan Finlay	2017-09-07	1	-0/+18
\| \| \| \|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	wrap block tracker in events proxy	frankiebee	2017-09-27	1	-0/+31
\| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Do not mark a retry tx failed that has been broadcast successfully	Dan Finlay	2017-09-19	1	-3/+9
\| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \| \|	createOriginMiddleware - fix var name	kumavis	2017-09-14	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	metamask controller - move middleware into seperate files	kumavis	2017-09-14	3	-0/+37
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵	kumavis	2017-09-12	1	-8/+12
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	filter-leak-fix
\| * \| \| \| \| \| \| \|	inpage provider - define sendAsync on the prototype	kumavis	2017-09-09	1	-25/+27
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	inpage - use obj-multiplex module	kumavis	2017-09-08	1	-6/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵	kumavis	2017-09-08	2	-24/+44
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	filter-leak-fix
\| * \| \| \| \| \| \|	inpage - bug fix	kumavis	2017-09-06	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	prevents mutation of original message object which causes problems with web3 1.0
\| * \| \| \| \| \| \|	Make web3 deprecation notice more useful	Dan Finlay	2017-09-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Linking to a descriptive & precriptive article on a path forward.
\| * \| \| \| \| \| \|	Merge branch 'master' into inpage-provider-fixes	kumavis	2017-08-29	2	-32/+50
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	inpage - lint fix	kumavis	2017-08-29	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	inpage provider - autoreload - improve readability	kumavis	2017-08-24	1	-15/+32
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	inpage provider - only warn web3 usage once per session	kumavis	2017-08-24	1	-6/+11
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	inpage provider - sync rpc - default to null values	kumavis	2017-08-24	1	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	lint - remove dead code	kumavis	2017-09-08	1	-1/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	inpage - distinguish pump vs pipe	kumavis	2017-09-08	1	-4/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	streams - use pump and published obj-multiplex	kumavis	2017-09-08	3	-73/+14
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	inpage - add idRemapMiddleware	kumavis	2017-09-08	1	-1/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	inpage - use json-rpc-engine for inpage-provider	kumavis	2017-08-25	1	-36/+10
\| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #1973 from MetaMask/hotfix-migration019	kumavis	2017-08-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	hotfix - fail submitted txs whos nonce is out of bound
\| * \| \| \| \| \| \| \|	fall back to `latest` if blockNumber is null	frankiebee	2017-08-24	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fail transactions after a day of retries	Dan Finlay	2017-08-24	1	-1/+7
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Enforce nonces as type string	Dan Finlay	2017-08-24	1	-2/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Use toNumber method	Dan Finlay	2017-08-24	1	-2/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix network nonce parsing	Dan Finlay	2017-08-24	1	-4/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Pass nonce tests	Dan Finlay	2017-08-24	1	-8/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Got all tests but one passing	Dan Finlay	2017-08-24	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix new test, break an older maybe wrong one	Dan Finlay	2017-08-24	1	-26/+24
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Linted	Dan Finlay	2017-08-24	1	-1/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Simplify nonce calculation	Dan Finlay	2017-08-24	1	-4/+5
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'master' into useLocalNonce	Dan Finlay	2017-08-24	1	-0/+37
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	tx controller - tx state history various small fixes	kumavis	2017-08-15	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	introduce tx-state-history-helper and diff-based history	kumavis	2017-08-15	1	-0/+37
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	nonce-tracker - more debugging numbers for nonceDetails	kumavis	2017-08-23	1	-10/+8
\| \| \| \| \| \|
* \| \| \| \| \|	remove unused code	kumavis	2017-08-23	1	-15/+0
\| \| \| \| \| \|
* \| \| \| \| \|	nonce-tracker - use ethjs-query	kumavis	2017-08-23	1	-11/+2
\| \| \| \| \| \|
* \| \| \| \| \|	nonce-tracker - fix var name	kumavis	2017-08-23	1	-4/+4
\| \| \| \| \| \|
* \| \| \| \| \|	nonce-tracker - getlocalNextNonce - add entry to nonceDetails	kumavis	2017-08-23	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	nonce-tracker - simplify _getlocalNextNonce	kumavis	2017-08-23	1	-20/+29
\| \| \| \| \| \|
* \| \| \| \| \|	nonce-tracker - simplify getHighestNonce	kumavis	2017-08-23	1	-5/+3
\| \| \| \| \| \|
* \| \| \| \| \|	nonce-tracker - getHighestNonce doesnt need uniqued input	kumavis	2017-08-23	1	-4/+4
\| \| \| \| \| \|
* \| \| \| \| \|	nonce-tracker - make nonce strategy api and naming more symmetical	kumavis	2017-08-23	1	-19/+21
\| \| \| \| \| \|
* \| \| \| \| \|	nonce-tracker - pass tests	frankiebee	2017-08-22	1	-5/+4
\| \| \| \| \| \|
* \| \| \| \| \|	clean up code	frankiebee	2017-08-22	1	-39/+43
\| \| \| \| \| \|
* \| \| \| \| \|	nonce-tracker - pass tests	frankiebee	2017-08-22	1	-11/+38
\| \| \| \| \| \|
* \| \| \| \| \|	break out network nonce calc.	frankiebee	2017-08-19	1	-17/+21
\| \| \| \| \| \|
* \| \| \| \| \|	fix 0x0 nonce calc.	frankiebee	2017-08-19	1	-8/+18
\| \| \| \| \| \|
* \| \| \| \| \|	include pendingTxs in localNonce	frankiebee	2017-08-19	1	-10/+9
\| \| \| \| \| \|
* \| \| \| \| \|	use "localNonce" when the network returns a nonce that is lower then a known ↵	frankiebee	2017-08-19	1	-3/+20
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	confirmed tx
* \| \| \| \|	fix wording	frankiebee	2017-08-12	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	add deprecation warning for web3	frankiebee	2017-08-12	1	-1/+4
\|/ / / /
* \| \| /	tx utils - detect estimateGas err and set simulationFailed	kumavis	2017-08-09	1	-3/+11
\| \|_\|/ \|/\| \|
* \| \|	util - sufficientBalance - validate input	kumavis	2017-08-09	1	-1/+6
\| \| \|
* \| \|	fix getPendingTransactions function for pendingTxTracker	frankiebee	2017-08-09	1	-1/+1
\| \| \|
* \| \|	fix class names	frankiebee	2017-08-09	2	-2/+3
\| \| \|
* \| \|	remove logging of the message and log the error	frankiebee	2017-08-08	1	-1/+1
\| \| \|
* \| \|	fix spelling	frankiebee	2017-08-08	1	-6/+3
\| \| \|
* \| \|	Merge branch 'master' into transactionControllerRefractor	frankiebee	2017-08-05	4	-45/+15
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge pull request #1857 from MetaMask/hotFixCancleTx	kumavis	2017-08-04	1	-1/+2
\| \|\ \ \| \| \| \| \| \| \| \|	fix cancelTransaction not receiving a callback
\| \| * \|	fix cancelTransaction not reciving a callback	frankiebee	2017-08-04	1	-1/+2
\| \| \| \|
\| * \| \|	blacklist - use module eth-phishing-detect	kumavis	2017-08-04	1	-23/+0
\| \|/ /
\| * \|	Merge pull request #1848 from MetaMask/transactionControllerRefractor	kumavis	2017-08-03	1	-48/+13
\| \|\ \ \| \| \| \| \| \| \| \|	Transaction controller refractor part 1: promises for everyone and more tests!
\| * \| \|	blacklist controller - breakout from metamask and infura controllers	kumavis	2017-08-03	1	-22/+7
\| \| \| \|
\| * \| \|	phishing detection - move phishing detection into contentscript and metamask ↵	kumavis	2017-08-03	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	controller
\| * \| \|	obj-multiplex - missing name error + prefer const over var	kumavis	2017-08-03	1	-6/+10
\| \| \|/ \| \|/\|
* \| \|	break out tx status pendding watchers	frankiebee	2017-08-05	1	-0/+165
\| \| \|
* \| \|	move util functions to util.js	frankiebee	2017-08-05	2	-32/+40
\| \|/ \|/\|
* \|	use async with #publishTransaction	frankiebee	2017-08-03	1	-2/+2
\| \|
* \|	move newUnapprovedTransaction to transactions.js	frankiebee	2017-08-03	1	-8/+4
\| \|
* \|	lint fixes	frankiebee	2017-08-02	1	-6/+1
\| \|
* \|	Merge branch 'master' into transactionControllerRefractor	frankiebee	2017-08-02	2	-9/+57
\|\\|
\| *	Merge branch 'master' into i1805-LiveBlacklistUpdating	Dan Finlay	2017-07-27	1	-0/+38
\| \|
\| *	nonce-tracker - hotfix for provider proxying	kumavis	2017-07-27	1	-4/+11
\| \|
\| *	nonce-tracker - add raw baseNonceHex to nonceDetails	kumavis	2017-07-27	1	-1/+1
\| \|
\| *	tx controller + nonce tracker - record nonce components on txMeta	kumavis	2017-07-27	1	-2/+5
\| \|
\| *	nonce-tracker - validation - add validation failing value type to error message	kumavis	2017-07-27	1	-3/+3
\| \|
\| *	nonce-tracker - validation - add validation failing value to error message	kumavis	2017-07-27	1	-3/+3
\| \|
* \|	fix addTxDefaults	frankiebee	2017-08-02	1	-1/+2
\| \|
* \|	make addUnapprovedTransaction async function and use promise based ethQuery	frankiebee	2017-08-02	1	-44/+17
\|/
*	Add stack traces both in errors and as a way to track txMetas	frankiebee	2017-07-26	1	-0/+8
\|
*	transactions - block nonce-tracker while updating pending transactions	kumavis	2017-07-19	1	-14/+29
\|
*	nonce-tracker - fix lock mechanism to be a real mutex	kumavis	2017-07-19	1	-11/+15
\|
*	nonce-tracker - return nonce as integer	kumavis	2017-07-19	1	-1/+1
\|
*	nonce-tracker - validate nonce calc components	kumavis	2017-07-19	1	-3/+9
\|
*	turn off auto faucet and remove file	frankiebee	2017-07-18	1	-20/+0
\|
*	make publishTransaction and signTransaction async methods	frankiebee	2017-07-14	1	-2/+7
\|
*	Fix test to match behavior	frankiebee	2017-07-13	1	-1/+1
\|
*	use new nodeify	frankiebee	2017-07-13	1	-21/+6
\|
*	Use txParams	frankiebee	2017-07-12	1	-4/+4
\|
*	Merge branch 'master' into nonce-tracker	frankiebee	2017-07-12	1	-0/+9
\|\
\| *	Improve insufficient balance checking in retry loop	Dan Finlay	2017-07-12	1	-0/+9
\| \|
* \|	fix nonce calculation order	frankiebee	2017-07-06	1	-6/+7
\| \|
* \|	nonce-tracker: only check transactions that are not supposed to be ignored	frankiebee	2017-06-28	1	-6/+7
\| \|
* \|	fix nonceTracker	frankiebee	2017-06-22	1	-8/+6
\| \|
* \|	add a test for #getNonceLock	frankiebee	2017-06-22	1	-6/+16
\| \|
* \|	introduce nonce-tracker	kumavis	2017-06-15	1	-0/+49
\|/
*	Linting	Thomas Huang	2017-06-13	1	-2/+2
\|
*	Update gasblocklimit params with every block.	Kevin Serrano	2017-06-03	2	-9/+2
\|
*	Convert gasLimit to not use muln in BN	Kevin Serrano	2017-06-02	1	-2/+8
\|
*	Merge pull request #1500 from MetaMask/RemoveStreamingSubprovider	Thomas Huang	2017-05-26	1	-17/+5
\|\ \| \| \| \|	Remove streaming subprovider
\| *	Remove stream subprovider	Dan Finlay	2017-05-26	1	-17/+5
\| \| \| \| \| \| \| \|	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.
* \|	fix spelling	frankiebee	2017-05-25	1	-2/+2
\| \|
* \|	Merge branch 'master' into reloadDapp	frankiebee	2017-05-25	2	-2/+14
\|\\|
\| *	Merge pull request #1494 from MetaMask/1472-gasceiling	Dan Finlay	2017-05-25	1	-1/+12
\| \|\ \| \| \| \| \| \|	Add Max GasLimit Ceiling
\| \| *	Add new blockGasLimit property to txMeta object.	Kevin Serrano	2017-05-25	1	-1/+12
\| \| \|
\| * \|	inpage-provider - disable polling after first block	kumavis	2017-05-25	1	-1/+2
\| \|/
* /	Reload the page when switching networks for sites that use web3	frankiebee	2017-05-25	1	-22/+25
\|/
*	Merge branch 'master' into networkController	Frankie	2017-05-24	1	-5/+17
\|\
\| *	clean - remove console logs	kumavis	2017-05-23	1	-2/+0
\| \|
\| *	deps - use stream-subprovider from provider-engine	kumavis	2017-05-23	1	-1/+1
\| \|
\| *	Rename stream to streamSubprovider	Dan Finlay	2017-05-23	1	-4/+4
\| \|
\| *	Use filter subprovider in-page to avoid filter leaks	Dan Finlay	2017-05-23	1	-2/+6
\| \|