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

	Commit message (Collapse)	Author	Age	Files	Lines
*	preferences controller - jsdoc fix	kumavis	2018-06-04	1	-2/+2
\|
*	metamask - update preferences controller identities on keyring controller update	kumavis	2018-06-04	1	-3/+28
\|
*	Version 4.7.1v4.7.1	Dan Finlay	2018-06-02	1	-0/+17
\|
*	Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵	kumavis	2018-05-30	2	-10/+19
\|\ \| \| \| \| \| \|	merge-master
\| *	cleanErrorStack moved to separate library module	Anton	2018-05-29	1	-12/+4
\| \| \| \| \| \| \| \|	more errors traces cleaned up
\| *	error message fix	Anton	2018-05-29	1	-2/+1
\| \|
\| *	Clean up user rejection error message	Anton	2018-05-28	1	-3/+14
\| \|
\| *	Merge pull request #4140 from MetaMask/v4.6.1	Thomas Huang	2018-05-01	1	-1/+5
\| \|\ \| \| \| \| \| \|	Version 4.6.1
\| * \|	require log	frankiebee	2018-05-01	1	-0/+1
\| \| \|
\| * \|	log emitter errors	frankiebee	2018-04-30	1	-6/+10
\| \| \|
\| * \|	transactions - run event emitters outside context of _setTxStatus	frankiebee	2018-04-30	1	-7/+9
\| \| \|
* \| \|	controllers - recent-blocks - pull first historical blocks in parallel	kumavis	2018-05-22	1	-15/+7
\| \| \|
* \| \|	Reveal get filtered tx list (#4332)	Frankie	2018-05-22	1	-15/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* add getFilteredTxList from txController to getApi * transactions - remove dead code (isNonceTaken)
* \| \|	Add PreferencesController#setAddresses to update ids	Whymarrh Whitby	2018-05-17	1	-0/+10
\| \| \|
* \| \|	Update AddressBookController to read from preferences store	Whymarrh Whitby	2018-05-17	1	-21/+6
\| \| \|
* \| \|	Move setAccountLabel into PreferencesController	Whymarrh Whitby	2018-05-17	1	-2/+18
\| \| \|
* \| \|	Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵	kumavis	2018-05-17	3	-140/+43
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	scsaba-transaction-history-timestamps
\| * \| \|	network - remove debugging console.log	kumavis	2018-05-17	1	-1/+0
\| \| \| \|
\| * \| \|	Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵	kumavis	2018-05-17	2	-1/+16
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	network-controller-remove-setNetworkEndpoints
\| * \| \| \|	lint - cleanup some unused variables	kumavis	2018-05-03	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	controllers - network - move default config out of first-time-state	kumavis	2018-05-03	1	-2/+15
\| \| \| \| \|
\| * \| \| \|	network - refactor to remove unnecesary code	kumavis	2018-05-01	3	-124/+29
\| \| \| \| \|
\| * \| \| \|	network - remove setNetworkEndpoints	kumavis	2018-05-01	1	-13/+0
\| \| \| \| \|
\| * \| \| \|	controllers - network - more semantic assert	kumavis	2018-05-01	1	-1/+1
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	tx-state-history-helper - use more readable Date.now method	kumavis	2018-05-17	1	-1/+1
\| \| \| \|
* \| \| \|	fix lint issues	Csaba Solya	2018-05-10	2	-2/+2
\| \| \| \|
* \| \| \|	remove unnecessary lib	Csaba Solya	2018-05-10	1	-1/+0
\| \| \| \|
* \| \| \|	revert unnecessary change in state manager	Csaba Solya	2018-05-10	1	-13/+7
\| \| \| \|
* \| \| \|	add time stamps to transaction history log entries	Csaba Solya	2018-05-10	2	-16/+28
\| \|/ / \|/\| \|
* \| \|	Fix documentation typo	bitpshr	2018-05-08	1	-1/+1
\| \| \|
* \| \|	transactions - add a nonce check utility for ui use	frankiebee	2018-05-02	1	-0/+15
\| \| \|
* \| \|	fix - getTxsByMetaData check if the key is in the object not if the value is ↵	frankiebee	2018-05-02	1	-1/+1
\|/ / \| \| \| \| \| \|	truthy
* \|	Merge pull request #4110 from MetaMask/master	kumavis	2018-04-28	8	-144/+1402
\|\\| \| \| \| \|	Develop - Add commits to develop that are already in Master
\| *	Merge pull request #4095 from MetaMask/v4.6.0v4.6.0	Thomas Huang	2018-04-27	2	-2/+2
\| \|\ \| \| \| \| \| \|	Version 4.6.0
\| * \	Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3	kumavis	2018-04-26	8	-144/+1402
\| \|\ \ \| \| \| \| \| \| \| \|	docs and file organization for txController
\| \| * \|	transactions - more docs and clean ups	frankiebee	2018-04-26	6	-55/+116
\| \| \| \|
\| \| * \|	Cleaned up some typos and JSDocs in Transactions	Dan Finlay	2018-04-24	3	-38/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Nonce tracker is not fully documented yet. Have not yet touched: - tx-state-manager - tx-state-history-helper - util - tx-gas-utils - pending-tx-tracker
\| \| * \|	transactions - fix refernces	frankiebee	2018-04-20	2	-1/+2
\| \| \| \|
\| \| * \|	Merge branch 'master' into tx-controller-rewrite-v3	frankiebee	2018-04-20	10	-17/+398
\| \| \|\ \
\| \| * \| \|	meta - transactions - docs yo!	frankiebee	2018-04-20	8	-73/+351
\| \| \| \| \|
\| \| * \| \|	fix up - more docs	frankiebee	2018-04-14	3	-38/+77
\| \| \| \| \|
\| \| * \| \|	meta - transactions - code clean up and jsDoc	frankiebee	2018-04-14	1	-41/+109
\| \| \| \| \|
\| \| * \| \|	transactions - code cleanup	frankiebee	2018-04-13	2	-58/+59
\| \| \| \| \|
\| \| * \| \|	transactions - lint fixes	frankiebee	2018-04-11	3	-12/+12
\| \| \| \| \|
\| \| * \| \|	meta - transactions - create a transactions dir in controller and move ↵	frankiebee	2018-04-11	7	-61/+869
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	relevant files into it
* \| \| \| \|	Return 0 for token rate fetch failures	bitpshr	2018-04-27	1	-1/+5
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	rpc - bump provider-engine + eth-json-rpc-filters	kumavis	2018-04-26	1	-1/+1
\| \| \| \|
* \| \| \|	Merge pull request #4069 from MetaMask/i4056-LatestPriceApi	Dan Finlay	2018-04-26	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Use latest balanc3 api for prices
\| * \| \|	Use latest balanc3 api for prices	Dan Finlay	2018-04-25	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'master' into dm-docs-2	Dan	2018-04-24	6	-17/+186
\|\\| \| \|
\| * \| \|	Use the metamask balanc3 dev price api	Dan Finlay	2018-04-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #4056
\| * \| \|	Clean up network config	Alexander Tseung	2018-04-24	4	-12/+138
\| \| \| \|
\| * \| \|	Merge pull request #4020 from MetaMask/i3941-jsdoc-bitpshr	Dan Finlay	2018-04-21	2	-4/+47
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|	Documentation
\| \| * \|	Clean up JSDoc for background scripts	bitpshr	2018-04-20	1	-2/+10
\| \| \| \|
\| \| * \|	Add more documentation to computed balances controller	bitpshr	2018-04-20	1	-1/+36
\| \| \| \|
\| \| * \|	Add generated docs	bitpshr	2018-04-19	1	-3/+3
\| \| \| \|
* \| \| \|	Fix nits.	Dan	2018-04-24	1	-1/+1
\| \| \| \|
* \| \| \|	Minor fixes in a number of docs.	Dan	2018-04-21	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'master' into dm-docs-2	Dan	2018-04-20	8	-136/+219
\|\\| \| \|
\| * \| \|	Missing bracket in docblock.	Dan	2018-04-19	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' into dm-docs-1	Dan	2018-04-19	8	-0/+84
\| \|\\| \|
\| \| * \|	Merge branch 'master' into i3981-contract-rates	Dan Finlay	2018-04-17	7	-0/+7
\| \| \|\ \
\| \| \| * \|	Require loglevel singleton in each module that uses it	bitpshr	2018-04-14	7	-0/+7
\| \| \| \|/
\| \| * \|	Disable token price polling when no client is active	bitpshr	2018-04-17	1	-0/+1
\| \| \| \|
\| \| * \|	Maintain token prices using a background service	bitpshr	2018-04-16	1	-0/+76
\| \| \|/
\| * \|	NO MIXED TABS AND SPACES	Dan	2018-04-19	3	-137/+137
\| \| \|
\| * \|	Documentation fix: @constant -> @property	Dan	2018-04-19	1	-1/+1
\| \| \|
* \| \|	Even more documentation for various controllers and libs.	Dan	2018-04-19	4	-9/+171
\|/ /
* \|	Improve documentation of promises that return undefined.	Dan	2018-04-17	2	-4/+4
\| \|
* \|	Typo fixes, type fixes on the return clauses of the buyEthUrl and ↵	Dan	2018-04-17	4	-4/+4
\| \| \| \| \| \| \| \|	getPrefferedLangCode functions.
* \|	Spell deprecated correctly.	Dan	2018-04-17	1	-2/+2
\| \|
* \|	@params -> @param fix	Dan	2018-04-17	2	-6/+6
\| \|
* \|	Documentation for various controllers and libs	Dan	2018-04-17	4	-16/+313
\|/
*	transactions - _normalizeTxParams will now return a new object for txParams	frankiebee	2018-04-06	1	-31/+18
\|
*	transactions - remove unnecessary keys on txParams	frankiebee	2018-04-05	1	-0/+12
\|
*	transactions - make #_validateTxParams not async and "linting" wink wink ↵	frankiebee	2018-04-05	1	-7/+12
\| \| \| \|	nudge nudge
*	transactions - normalize txParams	frankiebee	2018-04-05	1	-2/+52
\|
*	app - currency - fix typo + prefer log over console	kumavis	2018-04-04	1	-2/+3
\|
*	app - currency - fix typo	kumavis	2018-04-04	1	-1/+1
\|
*	app - warn on fetch errors instead of spamming sentry	kumavis	2018-04-04	4	-32/+28
\|
*	transactions gasLimit - use the block gasLimit if getCode fails	frankiebee	2018-04-03	1	-2/+3
\|
*	transactions#newUnapprovedTransaction - dont default origin to metamask	frankiebee	2018-03-31	1	-1/+1
\|
*	transactions - put the origing on the txMeta to help with debugging	frankiebee	2018-03-31	1	-1/+3
\|
*	Merge pull request #3777 from MetaMask/etc-fixes	Frankie	2018-03-29	1	-1/+1
\|\ \| \| \| \|	Sentry spam fix and etc fixes
\| *	controllers - currency - warn currency and encountered error	kumavis	2018-03-29	1	-1/+1
\| \|
* \|	tx controller - explode on non-hex txParams + dont add chainId to txParams + ↵	kumavis	2018-03-28	1	-4/+6
\|/ \| \| \|	sign with chainId as number
*	Use extension api to get initial locale.	Dan	2018-03-22	1	-1/+1
\|
*	Merge branch 'master' into i18n-translator-redux	Dan	2018-03-22	1	-0/+4
\|\
\| *	Merge pull request #3504 from lazaridiscom/laz/i3427	kumavis	2018-03-21	1	-0/+4
\| \|\ \| \| \| \| \| \|	adds READMEs to folders, re #3427
\| \| *	add READMEs to folders, re #3427	Lazaridis	2018-03-14	1	-0/+4
\| \| \|
* \| \|	Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵	kumavis	2018-03-21	1	-21/+32
\|\\| \| \| \| \| \| \| \| \| \| \|	i18n-translator-redux
\| * \|	Fix TransactionStateManager spelling.	Dan	2018-03-14	1	-2/+2
\| \| \|
\| * \|	transactions - return the txMeta in retryTransaction	frankiebee	2018-03-14	1	-2/+3
\| \| \|
\| * \|	Merge branch 'master' into retry-tx-refractor	Dan	2018-03-09	1	-2/+2
\| \|\\|
\| * \|	fix marking of confirmed transaction as dropped	frankiebee	2018-03-09	1	-1/+1
\| \| \|
\| * \|	transactions - make _markNonceDuplicatesDropped	frankiebee	2018-03-08	1	-21/+20
\| \| \|
\| * \|	refactor retrytx with higher gas price:	frankiebee	2018-03-08	1	-16/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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
* \| \|	Handle i18n with redux.	Dan	2018-03-16	1	-0/+5
\| \|/ \|/\|
* \|	fix typo in transaction.js	Jeffrey Tong	2018-03-07	1	-2/+2
\|/
*	Merge branch 'master' into uat	Dan	2018-02-08	1	-0/+4
\|\
\| *	wipe only transactions for current account	Bruno Barbieri	2018-01-31	1	-2/+2
\| \|
\| *	added reset account feature	Bruno Barbieri	2018-01-31	1	-0/+4
\| \|
* \|	Merge branch 'uat' into newmaster	Chi Kei Chan	2018-01-20	3	-6/+75
\|\ \ \| \|/ \|/\|
\| *	Merge branch 'uat' into uat-master-011618	Alexander Tseung	2018-01-17	3	-6/+75
\| \|\
\| \| *	Merge branch 'NewUI-flat' into merge-master	Alexander Tseung	2017-12-23	3	-6/+75
\| \| \|\
\| \| \| *	Track usage of old and new UI (#2794)	Alexander Tseung	2017-12-23	1	-6/+34
\| \| \| \| \| \| \| \| \| \| \| \|	[NewUI] Track usage of old and new UI
\| \| \| *	Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20	Chi Kei Chan	2017-12-21	1	-0/+4
\| \| \| \|\
\| \| \| \| *	Adds updateTransaction to background and used it to update after editing in ↵	Dan	2017-12-21	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	send-v2.
\| \| \| \| *	Canceled, edited transactions show edited amount.	Dan	2017-12-21	1	-0/+5
\| \| \| \| \|
\| \| \| * \|	Merge branch 'master' into NewUI-flat	Dan	2017-12-21	4	-17/+125
\| \| \| \|\ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| \| * \|	Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI	Chi Kei Chan	2017-12-08	2	-1/+7
\| \| \| \|\ \
\| \| \| \| * \	Merge branch 'master' into NewUI-flat	Chi Kei Chan	2017-12-07	1	-0/+6
\| \| \| \| \|\ \
\| \| \| \| * \| \|	Merge branch 'master' into NewUI-flat-merge-with-master	Dan	2017-12-07	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Lint fix	Dan	2017-12-05	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Add UI selection	Dan	2017-12-05	1	-0/+17
\| \| \| \|/ / /
\| \| \| * \| \|	Fixes changes requested in pullrequestreview-79088534	Jason Clark	2017-11-27	1	-0/+1
\| \| \| \| \| \|
\| \| \| * \| \|	toggle wired up to preferences property store	Jason Clark	2017-11-25	1	-2/+2
\| \| \| \| \| \|
\| \| \| * \| \|	incremental commit	Clark, Jason (Contractor)	2017-11-24	1	-0/+8
\| \| \| \| \| \|
\| \| \| * \| \|	Merge branch 'master' into merge-master	Chi Kei Chan	2017-11-16	1	-1/+2
\| \| \| \|\ \ \
\| \| \| * \| \| \|	Lint fixes for NewUI-flat.	Dan	2017-11-02	1	-2/+0
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Merge branch 'master' into NewUI-flat	Chi Kei Chan	2017-10-25	2	-5/+5
\| \| \| \|\ \ \ \
\| \| \| * \ \ \ \	Merge branch 'master' into NewUI-flat	Chi Kei Chan	2017-10-25	1	-0/+4
\| \| \| \|\ \ \ \ \
\| \| \| * \ \ \ \ \	Merge branch 'master' into NewUI-flat	Chi Kei Chan	2017-10-21	2	-6/+27
\| \| \| \|\ \ \ \ \ \
\| \| \| * \ \ \ \ \ \	Merge branch 'NewUI-flat' into merge	Chi Kei Chan	2017-10-19	1	-1/+12
\| \| \| \|\ \ \ \ \ \ \
\| \| \| \| * \ \ \ \ \ \	Merge branch 'master' into NewUI-flat	Chi Kei Chan	2017-10-04	3	-36/+42
\| \| \| \| \|\ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \|	Enables remove token and ensures add/remove update the list without need for ↵	Dan	2017-10-04	1	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refresh.
* \| \| \| \| \| \| \| \| \| \| \|	Update transactions.js	kumavis	2018-01-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	transactions - transtion approved transactions to failed transactions on boot	frankiebee	2018-01-18	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	transactions - fail txs on boot who fail addTxDefaults	frankiebee	2018-01-18	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	transactions - wrap addTxDefaults in a try catch and re try addTxDefaults on ↵	frankiebee	2018-01-18	1	-2/+20
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	boot if they did not complete
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into open-popup	Frankie	2018-01-16	2	-9/+78
\|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge pull request #2936 from MetaMask/i2925-BetterGasEstimation	Dan Finlay	2018-01-16	1	-7/+73
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve gas price estimation by backfilling recent-blocks
\| \| * \| \| \| \| \| \| \| \| \| \|	Prefer passing a provider over an ethQuery instance	Dan Finlay	2018-01-13	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Improve gas price estimation by backfilling recent-blocks	Dan Finlay	2018-01-12	1	-7/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \| \| \|	provider - infura - use infura REST api	kumavis	2018-01-09	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	bugfix - transactions controller - breakout logic and fix order of ↵	kumavis	2018-01-09	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	operations bug
* \| \| \| \| \| \| \| \| \| \| \| \|	transactions - emit 'newUnapprovedTx' before estimateGas finishes	frankiebee	2018-01-15	1	-2/+6
\| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	bugfix - transactions controller - breakout logic and fix order of ↵	kumavis	2018-01-09	1	-2/+4
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	operations bug
* \| \| \| \| \| \| \| \| \| \|	Fix feature to work	Dan Finlay	2018-01-06	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Derive gas price estimate from previous transactions	Dan Finlay	2018-01-06	2	-1/+3
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return the 50th percentile lowest gas price of the previous 20 blocks.
* \| \| \| \| \| \| \| \| /	Remove retryTimePeriod from tx controller	Dan Finlay	2017-12-22	1	-1/+0
\| \|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2763 from MetaMask/AddRecentBlocksController	Thomas Huang	2017-12-21	1	-0/+44
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Recent Blocks controller
\| * \| \| \| \| \| \| \| \|	Do not log whole txs in recent block controller.	Dan Finlay	2017-12-20	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only record gas prices, because that has a current use.
\| * \| \| \| \| \| \| \| \|	Add Recent Blocks controller	Dan Finlay	2017-12-18	1	-0/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tracks recent blocks, useful for estimating recent successful gas prices.
* \| \| \| \| \| \| \| \| \|	Allow updating token details	Dan Finlay	2017-12-19	1	-4/+4
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2173
* \| \| \| \| \| \| \| \|	Change console.log for opts in _configureInfuraProvider	Thomas Huang	2017-12-16	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Revert "Revert "network - for infura networks use the infura block tracker ↵	kumavis	2017-12-14	1	-7/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	provider"" This reverts commit 5df7dcd758c5a16b503a5ee237970c05c7e990c9.
* \| \| \| \| \| \| \| \|	Revert "network - for infura networks use the infura block tracker provider"	Frankie	2017-12-14	1	-50/+7
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	network - for infura networks use the infura block tracker provider	kumavis	2017-12-14	1	-7/+50
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Pass polling interval to zero client provider	Dan Finlay	2017-12-10	1	-1/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	tx-controller - failed state is a finished state	kumavis	2017-12-08	1	-6/+8
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Do not allow nonces larger than the next valid nonce	Dan Finlay	2017-12-08	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To avoid situations where a user signs a transaction that will become surprisingly valid in the future.
* \| \| \| \| \| \| \| \|	Merge branch 'master' into patch-2	Dan Finlay	2017-12-08	1	-0/+7
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Enforce retry tx at minimum gas of previous tx	Dan Finlay	2017-12-07	1	-1/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add retry background method and action	Dan Finlay	2017-12-07	1	-0/+4
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	A more expressive way	vicnaum	2017-12-07	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	replaced ifs with ? :
* \| \| \| \| \| \| \| \|	Fix for #2644 - Specified Nonce isn't used	vicnaum	2017-12-07	1	-1/+6
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added nonceSpecified. And a check if nonce was specified - then we should use the specified nonce instead of generating a new one.
* \| \| \| \| \| \| \|	Correct note for updateTx after block-update event in transaction.js	Dan	2017-12-07	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Exponentional backoff on transaction retry in pending-tx-tracker	Dan	2017-12-06	1	-0/+6
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #2441 from MetaMask/kumavis-patch-3	Dan Finlay	2017-11-28	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|	NetworkController - add warning when aborting lookupNetwork
\| * \| \| \| \| \| \|	network controller - warn via log.warn	kumavis	2017-11-28	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update network.js	kumavis	2017-10-24	1	-1/+1
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	newUnaprovedTx => newUnapprovedTx	Dora E. Mondrian	2017-11-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This typo tripped me up when I was reading through the code and trying to understand what's going on.
* \| \| \| \| \| \|	Merge pull request #2291 from MetaMask/gasPriceSpecified	Kevin Serrano	2017-10-28	1	-0/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|	Add boolean for specified gas price
\| * \| \| \| \| \|	Add indicator for specified gas price	Kevin Serrano	2017-10-06	1	-0/+1
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #2422 from watilde/fixes-lint	Kevin Serrano	2017-10-25	2	-5/+5
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Fixes lint warnings
\| * \| \| \| \|	Fix lint warnings	Daijiro Wachi	2017-10-22	2	-5/+5
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 ```
* / \| \| \|	Try to fix intermittent test failure in NonceTracker tests	Dan Finlay	2017-10-23	1	-0/+4
\|/ / / /
* \| \| \|	Allow computed balances to enumerate its own view	Dan Finlay	2017-10-20	1	-2/+3
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault	Dan Finlay	2017-10-19	2	-28/+27
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Revert "NetworkController refactor for new EthClient interface"	kumavis	2017-10-19	2	-28/+27
\| \| \| \|
* \| \| \|	Make account tracking more reactive	Dan Finlay	2017-10-19	1	-8/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We were doing a lot of conditional observation & updating. Pulled out a bunch of that for generic observer/syncers.
* \| \| \|	Refresh computed balances controller when restoring vault	Dan Finlay	2017-10-19	1	-0/+4
\| \| \| \|
* \| \| \|	Add validation to balance constructor	Dan Finlay	2017-10-19	1	-0/+10
\|/ / /
* \| \|	nonce-tracker - use blockTracker directly	kumavis	2017-10-12	1	-0/+1
\| \| \|
* \| \|	network-controller - use obj-proxy for providerProxy	kumavis	2017-10-11	1	-3/+4
\| \| \|
* \| \|	lint fixes	kumavis	2017-10-11	1	-7/+2
\| \| \|
* \| \|	network controller - refactor to use eth-rpc-client	kumavis	2017-10-11	1	-26/+30
\| \| \|
* \| \|	Provide method for tx tracker to refer to all txs	Dan Finlay	2017-10-07	1	-0/+1
\| \| \|
* \| \|	pending-tx - check time stamp instead of block number for resubmit	frankiebee	2017-10-06	1	-1/+1
\|/ /
* \|	transaction - provide notes for history	frankiebee	2017-10-03	1	-7/+9
\| \|
* \|	Version 3.10.8 - Fix Currency Conversionv3.10.8	Dan Finlay	2017-09-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	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
* \|	Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactions	kumavis	2017-09-30	1	-10/+1
\|\ \ \| \| \| \| \| \|	pending-tx - dont check the balance to rebrodcast
\| * \|	pending-tx - dont check the balance to rebrodcast	frankiebee	2017-09-30	1	-10/+1
\| \|/
* \|	network - make network controller internal network switching explicit	kumavis	2017-09-30	1	-2/+3
\| \|
* \|	network - convert localhost from custom rpc to network type	kumavis	2017-09-30	1	-0/+1
\| \|
* \|	network controller - small refactor	kumavis	2017-09-30	1	-18/+29
\|/
*	Merge branch 'master' into new-currency-test	kumavis	2017-09-28	5	-328/+261
\|\
\| *	Merge pull request #2194 from MetaMask/network-controller-refactor	kumavis	2017-09-28	1	-31/+33
\| \|\ \| \| \| \| \| \|	Network controller refactor
\| \| *	network controller - move _setProvider to bottom	kumavis	2017-09-28	1	-18/+18
\| \| \|
\| \| *	network controller - refactor to use _setProvider	kumavis	2017-09-28	1	-17/+28
\| \| \|
\| \| *	network - remove getter/setter	kumavis	2017-09-28	1	-23/+14
\| \| \|
\| * \|	Fix Account Selection	Dan Finlay	2017-09-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not select accounts on restore, only on creation and deliberate selection. Fixes #2164
\| * \|	Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3	kumavis	2017-09-28	2	-282/+98
\| \|\ \ \| \| \| \| \| \| \| \|	Transaction controller refractor pt3
\| \| * \|	pending-tx - move incrementing of the retryCount on the txMeta outside ↵	frankiebee	2017-09-27	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pending-tx-tracker
\| \| * \|	transactions: reveal #getFilteredTxList from txStateManage and fix ↵	frankiebee	2017-09-27	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	accountTracker.store reference
\| \| * \|	transactions: make evnt names pretty and eaiser to read	frankiebee	2017-09-27	1	-3/+3
\| \| \| \|
\| \| * \|	transactions: lint fixes and reveal status-update event for balance controller	frankiebee	2017-09-27	2	-5/+15
\| \| \| \|
\| \| * \|	Merge branch 'master' into transactionControllerRefractorPt3	frankiebee	2017-09-27	3	-3/+130
\| \| \|\ \
\| \| * \| \|	ensure that values written to txParams are hex strings	frankiebee	2017-09-14	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	linting && format fixing	frankiebee	2017-09-13	1	-7/+3
\| \| \| \| \|
\| \| * \| \|	match other controller patterns	frankiebee	2017-09-13	1	-14/+8
\| \| \| \| \|
\| \| * \| \|	more tests and craete a getPendingTransactions function	frankiebee	2017-09-09	1	-11/+4
\| \| \| \| \|
\| \| * \| \|	fix messy merge	frankiebee	2017-09-07	1	-4/+4
\| \| \| \| \|
\| \| * \| \|	fix merge and errors disaperaing on update	frankiebee	2017-09-07	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Merge branch 'master' into transactionControllerRefractorPt3	frankiebee	2017-09-07	1	-1/+12
\| \| \|\ \ \
\| \| * \| \| \|	add better comments	frankiebee	2017-09-06	1	-31/+41
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'master' into transactionControllerRefractorPt3	frankiebee	2017-08-22	1	-1/+1
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Create TxStateManager	frankiebee	2017-08-22	1	-45/+28
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Create tests for TxStateManager	frankiebee	2017-08-19	1	-192/+17
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix accountTracker store references	Dan Finlay	2017-09-28	1	-1/+1
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into filter-fixes-moar	Dan Finlay	2017-09-28	3	-3/+131
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| \| * \| \| \|	Move obs store into account-tracker instead of inheriting	Dan Finlay	2017-09-27	2	-5/+5
\| \| \| \| \| \|
\| \| * \| \| \|	Make blockTracker an independent param	Dan Finlay	2017-09-26	2	-3/+6
\| \| \| \| \| \|
\| \| * \| \| \|	Implemented feedback	Dan Finlay	2017-09-26	1	-2/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Made some requested changes	Dan Finlay	2017-09-26	1	-7/+7
\| \| \| \| \| \|
\| \| * \| \| \|	Fix account-tracker references	Dan Finlay	2017-09-23	2	-8/+8
\| \| \| \| \| \|
\| \| * \| \| \|	Refactor eth-store into account-tracker	Dan Finlay	2017-09-23	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| \| * \| \| \|	Add computed balance to account detail view	Dan Finlay	2017-09-14	2	-7/+11
\| \| \| \| \| \|
\| \| * \| \| \|	Got pending balance updating correctly	Dan Finlay	2017-09-14	2	-81/+65
\| \| \| \| \| \|
\| \| * \| \| \|	Add state-labeled events to allow subscribing to any transaction's state change	Dan Finlay	2017-09-14	1	-0/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Some progress	Dan Finlay	2017-09-13	2	-0/+136
\| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	network contoller - clean up unused code	frankiebee	2017-09-27	1	-6/+0
\| \| \| \| \|
\| * \| \| \|	listen for the blocke event on the block tracker instead of rawBlock on the ↵	frankiebee	2017-09-27	2	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	provider
\| * \| \| \|	wrap block tracker in events proxy	frankiebee	2017-09-27	1	-14/+8
\| \|/ / /
* \| \| \|	Comply with current currency API and add additional styling.	Kevin Serrano	2017-09-19	1	-2/+2
\| \| \| \|
* \| \| \|	integrate infura currency	Kevin Serrano	2017-08-30	1	-3/+3
\|/ / /
* \| \|	Fail transactions after a day of retries	Dan Finlay	2017-08-24	1	-1/+5
\| \| \|
* \| \|	Merge branch 'master' into useLocalNonce	Dan Finlay	2017-08-24	1	-16/+19
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	tx controller - tx state history various small fixes	kumavis	2017-08-15	1	-1/+0
\| \| \|
\| * \|	introduce tx-state-history-helper and diff-based history	kumavis	2017-08-15	1	-15/+19
\| \|/
* /	use "localNonce" when the network returns a nonce that is lower then a known ↵	frankiebee	2017-08-19	1	-0/+7
\|/ \| \| \|	confirmed tx
*	tx controller - fix error serialization	kumavis	2017-08-09	1	-2/+5
\|
*	tx controller - fix getBalance fn	kumavis	2017-08-09	1	-1/+1
\|
*	filter by network for pending txs	frankiebee	2017-08-09	1	-0/+2
\|
*	fix getPendingTransactions function for pendingTxTracker	frankiebee	2017-08-09	1	-2/+1
\|
*	fix class names	frankiebee	2017-08-09	1	-16/+22
\|
*	fix the bind on pending tx watchers	frankiebee	2017-08-08	1	-3/+3
\|
*	Merge branch 'master' into transactionControllerRefractor	frankiebee	2017-08-08	1	-2/+3
\|\
\| *	blacklist - update phishing on boot and speed up polling to 4 min	kumavis	2017-08-05	1	-2/+3
\| \|
* \|	remove unnecessary if statment for error message	frankiebee	2017-08-08	1	-1/+0
\| \|
* \|	fix spelling	frankiebee	2017-08-08	1	-9/+9
\| \|
* \|	rename PendingTransactionUtils -> PendingTransactionWatchers	frankiebee	2017-08-05	1	-8/+8
\| \|
* \|	Merge branch 'master' into transactionControllerRefractor	frankiebee	2017-08-05	3	-18/+59
\|\\|
\| *	Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵	kumavis	2017-08-04	1	-3/+0
\| \|\ \| \| \| \| \| \| \| \| \|	blacklist-refactor2
\| \| *	remove stack from txs	frankiebee	2017-08-04	1	-3/+0
\| \| \|
\| * \|	blacklist - use module eth-phishing-detect	kumavis	2017-08-04	1	-10/+18
\| \|/
\| *	Merge pull request #1848 from MetaMask/transactionControllerRefractor	kumavis	2017-08-03	1	-172/+173
\| \|\ \| \| \| \| \| \|	Transaction controller refractor part 1: promises for everyone and more tests!
\| * \|	blacklist controller - breakout from metamask and infura controllers	kumavis	2017-08-03	2	-15/+51
\| \| \|
* \| \|	break out tx status pendding watchers	frankiebee	2017-08-05	1	-145/+27
\| \| \|