m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-23 11:46:13 +02:00
Code
10,148 Commits 2 Branches 0 Tags 265 MiB
e02a0221fc
Commit Graph

716 Commits

Author SHA1 Message Date
kumavis
dc96b1eb93 Merge branch 'network-remove-provider-engine' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-05-23 22:34:00 -07:00
kumavis
22e59af741 controllers - recent-blocks - ensure full blocks 2018-05-23 22:32:33 -07:00
kumavis
3d8f41e912
Merge pull request #4347 from MetaMask/transactions-use-new-block-tracker 
Transactions use new block tracker
 2018-05-23 16:33:02 -07:00
kumavis
53b946362a controllers - recent-blocks - doc update 2018-05-23 16:20:35 -07:00
frankiebee
61caee9d94 Merge branch 'network-remove-provider-engine' of https://github.com/MetaMask/metamask-extension into transactions-use-new-block-tracker 2018-05-22 16:45:20 -07:00
frankiebee
c4b09da34e transactions - update pending-tx-tracker to use the new block tracker 2018-05-22 16:42:06 -07:00
frankiebee
10aecf4922 remove dependance on the even tx:confirmed 2018-05-22 16:40:01 -07:00
kumavis
145016be4c Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-05-22 16:22:10 -07:00
kumavis
3a80f3dd83 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine 2018-05-22 13:20:04 -07:00
kumavis
fa37ba3992 controllers - recent-blocks - pull first historical blocks in parallel 2018-05-22 01:58:36 -07:00
Frankie
e8b2e11c56 Reveal get filtered tx list (#4332) 
* add getFilteredTxList from txController to getApi

* transactions - remove dead code (isNonceTaken)
 2018-05-21 16:00:44 -07:00
Whymarrh Whitby
c54e4c7191 Add PreferencesController#setAddresses to update ids 2018-05-17 12:57:39 -02:30
Whymarrh Whitby
cbe4d0d88c Update AddressBookController to read from preferences store 2018-05-17 12:57:39 -02:30
Whymarrh Whitby
924cc1fcf7 Move setAccountLabel into PreferencesController 2018-05-17 12:57:39 -02:30
kumavis
3084dc47d1 recent-blocks - fix backfill blockNumber tracking 2018-05-17 00:13:20 -07:00
kumavis
41c04ef721 controllers - recent-blocks - fix pifyd setTimeout args 2018-05-16 23:13:25 -07:00
kumavis
08dc238c9f deps - fix incorrect dep paths and versions 2018-05-16 22:46:11 -07:00
kumavis
32b3b8f2a7 controllers - balance - update for eth-block-tracker@4 2018-05-16 21:16:05 -07:00
kumavis
623533ab15 recent-blocks - update for eth-block-tracker@4 2018-05-16 21:13:53 -07:00
kumavis
3e04840a71 remove unused events-proxy, was replaced with module swappable-obj-proxy 2018-05-16 21:10:41 -07:00
kumavis
b6eff15bd2 lint fix 2018-05-16 21:08:19 -07:00
kumavis
088d7930e0 network - create provider and block-tracker via json-rpc-engine 2018-05-16 20:46:34 -07:00
kumavis
44f31f9a7e Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-transaction-history-timestamps 2018-05-16 13:56:32 -07:00
kumavis
8e1cad5ff6
tx-state-history-helper - use more readable Date.now method 2018-05-16 13:05:07 -07:00
kumavis
d62fc22611 network - remove debugging console.log 2018-05-16 11:59:50 -07:00
kumavis
c27d9162d7 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-controller-remove-setNetworkEndpoints 2018-05-16 11:57:07 -07:00
Csaba Solya
2081768fc5 fix lint issues 2018-05-10 13:43:31 +02:00
Csaba Solya
3642810584 remove unnecessary lib 2018-05-10 13:34:56 +02:00
Csaba Solya
349fb9e0bc revert unnecessary change in state manager 2018-05-10 13:33:40 +02:00
Csaba Solya
9026651224 add time stamps to transaction history log entries 2018-05-10 13:26:02 +02:00
bitpshr
6351b7bb88 Fix documentation typo 2018-05-07 15:08:43 -04:00
kumavis
a1d13d45cf lint - cleanup some unused variables 2018-05-02 18:23:55 -07:00
kumavis
fec4c50657 controllers - network - move default config out of first-time-state 2018-05-02 18:03:59 -07:00
frankiebee
a45cb75435 transactions - add a nonce check utility for ui use 2018-05-01 13:57:43 -07:00
frankiebee
62bf76db53 fix - getTxsByMetaData check if the key is in the object not if the value is truthy 2018-05-01 13:57:14 -07:00
kumavis
53caa49666 network - refactor to remove unnecesary code 2018-04-30 17:59:53 -07:00
kumavis
6f316ca450 network - remove setNetworkEndpoints 2018-04-30 16:36:17 -07:00
kumavis
bfedd2776d controllers - network - more semantic assert 2018-04-30 16:23:16 -07:00
Thomas Huang
3180b69b97
Merge pull request #4140 from MetaMask/v4.6.1 
Version 4.6.1
 2018-04-30 14:37:22 -07:00
frankiebee
98ae853b6c require log 2018-04-30 09:57:36 -07:00
frankiebee
706647785c log emitter errors 2018-04-29 16:35:08 -07:00
frankiebee
7eb735651b transactions - run event emitters outside context of _setTxStatus 2018-04-29 16:32:16 -07:00
kumavis
2b9925a9e4
Merge pull request #4110 from MetaMask/master 
Develop - Add commits to develop that are already in Master
 2018-04-27 16:17:46 -06:00
bitpshr
8c5994abc9 Return 0 for token rate fetch failures 2018-04-26 18:31:54 -04:00
Thomas Huang
4e7b0ff15c
Merge pull request #4095 from MetaMask/v4.6.0 
Version 4.6.0
 2018-04-26 14:16:35 -07:00
kumavis
dcd04091cc
Merge pull request #4042 from MetaMask/tx-controller-rewrite-v3 
docs and file organization for txController
 2018-04-25 16:52:46 -06:00
kumavis
1c63b11e3f rpc - bump provider-engine + eth-json-rpc-filters 2018-04-25 14:02:41 -07:00
frankiebee
8ffce8b59d transactions - more docs and clean ups 2018-04-25 11:13:51 -07:00
Dan Finlay
f6653b9f94
Merge pull request #4069 from MetaMask/i4056-LatestPriceApi 
Use latest balanc3 api for prices
 2018-04-25 10:42:03 -07:00
Dan Finlay
7ec775d614 Use latest balanc3 api for prices 2018-04-24 14:12:57 -07:00
Dan
ed264d3479 Merge branch 'master' into dm-docs-2 2018-04-24 12:36:30 -02:30
Dan Finlay
a833f02f33 Use the metamask balanc3 dev price api 
Fixes #4056
 2018-04-23 16:39:33 -07:00
Alexander Tseung
9e41f58af2 Clean up network config 2018-04-23 10:18:05 -07:00
Dan Finlay
621e9334bc Cleaned up some typos and JSDocs in Transactions 
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
 2018-04-23 09:43:18 -07:00
Dan
0c26df9653 Fix nits. 2018-04-23 14:11:02 -02:30
Dan Finlay
74c419f9b6
Merge pull request #4020 from MetaMask/i3941-jsdoc-bitpshr 
Documentation
 2018-04-20 14:10:05 -07:00
Dan
69920045e9 Minor fixes in a number of docs. 2018-04-20 15:48:58 -02:30
Dan
71b0de76ff Merge branch 'master' into dm-docs-2 2018-04-20 13:23:17 -02:30
bitpshr
8636f3bae5 Clean up JSDoc for background scripts 2018-04-19 15:14:00 -04:00
frankiebee
e862a5091e transactions - fix refernces 2018-04-19 12:07:45 -07:00
frankiebee
c20c97ce62 Merge branch 'master' into tx-controller-rewrite-v3 2018-04-19 11:49:11 -07:00
frankiebee
eeb9390de8 meta - transactions - docs yo! 2018-04-19 11:46:15 -07:00
bitpshr
9c7eafc86f Add more documentation to computed balances controller 2018-04-19 14:37:08 -04:00
Dan
9f12c26d44 Even more documentation for various controllers and libs. 2018-04-19 13:08:56 -02:30
bitpshr
6dbdc87713 Add generated docs 2018-04-18 17:24:36 -04:00
Dan
164f9c4662 Missing bracket in docblock. 2018-04-18 16:17:06 -02:30
Dan
649d2f8b22 Merge branch 'master' into dm-docs-1 2018-04-18 16:15:48 -02:30
Dan
e80bd230b9 NO MIXED TABS AND SPACES 2018-04-18 16:11:39 -02:30
Dan
6d96b1a2ab Documentation fix: @constant -> @property 2018-04-18 16:08:08 -02:30
Dan
128cb1af46 Improve documentation of promises that return undefined. 2018-04-17 00:54:16 -02:30
Dan
e9ca7199ab Typo fixes, type fixes on the return clauses of the buyEthUrl and getPrefferedLangCode functions. 2018-04-16 21:23:29 -02:30
Dan Finlay
0668976514
Merge branch 'master' into i3981-contract-rates 2018-04-16 16:32:56 -07:00
Dan
cc7e71488e Spell deprecated correctly. 2018-04-16 19:47:52 -02:30
Dan
23acddf8f6 @params -> @param fix 2018-04-16 19:45:27 -02:30
bitpshr
b4912f29cd Disable token price polling when no client is active 2018-04-16 18:12:05 -04:00
Dan
20a075657f Documentation for various controllers and libs 2018-04-16 14:38:04 -02:30
bitpshr
d0447f9058 Maintain token prices using a background service 2018-04-16 11:47:06 -04:00
bitpshr
7129d7c0f3 Require loglevel singleton in each module that uses it 2018-04-13 17:56:28 -04:00
frankiebee
943eea043c fix up - more docs 2018-04-13 13:18:45 -07:00
frankiebee
88f4212363 meta - transactions - code clean up and jsDoc 2018-04-13 12:38:07 -07:00
frankiebee
3aaa28531e transactions - code cleanup 2018-04-12 12:24:16 -07:00
frankiebee
5494aa4f9c transactions - lint fixes 2018-04-10 14:54:30 -07:00
frankiebee
2d7c3c2b00 meta - transactions - create a transactions dir in controller and move relevant files into it 2018-04-10 14:28:05 -07:00
frankiebee
c02da0f27c transactions - _normalizeTxParams will now return a new object for txParams 2018-04-05 12:12:02 -07:00
frankiebee
343f0e9e80 transactions - remove unnecessary keys on txParams 2018-04-04 22:29:43 -07:00
frankiebee
245c01bc0f transactions - make #_validateTxParams not async and "linting" wink wink nudge nudge 2018-04-04 14:57:27 -07:00
frankiebee
457a47bf62 transactions - normalize txParams 2018-04-04 14:27:20 -07:00
kumavis
038ad91454 app - currency - fix typo + prefer log over console 2018-04-03 10:39:23 -07:00
kumavis
79d63332ee app - currency - fix typo 2018-04-03 10:35:41 -07:00
kumavis
ecbab14cae app - warn on fetch errors instead of spamming sentry 2018-04-03 10:33:10 -07:00
frankiebee
ab126b8c78 transactions gasLimit - use the block gasLimit if getCode fails 2018-04-02 15:43:32 -07:00
frankiebee
3def45004a transactions#newUnapprovedTransaction - dont default origin to metamask 2018-03-30 16:00:11 -07:00
frankiebee
03b123a85d transactions - put the origing on the txMeta to help with debugging 2018-03-30 15:48:39 -07:00
Frankie
8766420f19
Merge pull request #3777 from MetaMask/etc-fixes 
Sentry spam fix and etc fixes
 2018-03-28 12:57:01 -07:00
kumavis
c4c459c8d7 controllers - currency - warn currency and encountered error 2018-03-28 09:41:25 -07:00
kumavis
21fbaed97c tx controller - explode on non-hex txParams + dont add chainId to txParams + sign with chainId as number 2018-03-27 23:55:18 -07:00
Dan
b9309f689b Use extension api to get initial locale. 2018-03-22 12:49:19 -02:30
Dan
be845fd190 Merge branch 'master' into i18n-translator-redux 2018-03-21 22:28:58 -02:30
kumavis
1a60094d50
Merge pull request #3504 from lazaridiscom/laz/i3427 
adds READMEs to folders, re #3427
 2018-03-20 16:28:47 -07:00
kumavis
29cc2f8ab9 Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux 2018-03-20 13:01:08 -07:00
Dan
5fe0be722b Handle i18n with redux. 2018-03-15 21:59:45 -02:30
Dan
106ce091a9 Fix TransactionStateManager spelling. 2018-03-14 11:45:04 -02:30
Lazaridis
2d3763d709 add READMEs to folders, re #3427 2018-03-14 15:33:22 +02:00
frankiebee
9d7640996a transactions - return the txMeta in retryTransaction 2018-03-13 14:42:26 -07:00
Dan
81e72147ef Merge branch 'master' into retry-tx-refractor 2018-03-09 02:07:27 -03:30
frankiebee
5572345b78 fix marking of confirmed transaction as dropped 2018-03-08 10:37:47 -08:00
frankiebee
4a3288fec9 transactions - make _markNonceDuplicatesDropped 2018-03-07 22:01:14 -08:00
frankiebee
62febac876 refactor retrytx with higher gas price: 
- create a new tx instead of overwriting the tx hash
- add a new state 'dropped' to the txStateManager
- mark duplicate txs as dropped when one gets confirmed in a block
 2018-03-07 17:16:16 -08:00
Jeffrey Tong
57dc5a6e9b fix typo in transaction.js 2018-03-06 20:37:26 -08:00
Dan
d8896a8c31 Merge branch 'master' into uat 2018-02-07 16:32:47 -03:30
Bruno Barbieri
03d17c75ae wipe only transactions for current account 2018-01-31 04:25:32 -05:00
Bruno Barbieri
e6fda855a5 added reset account feature 2018-01-31 03:33:15 -05:00
Chi Kei Chan
77c545336b Merge branch 'uat' into newmaster 2018-01-19 15:29:36 -08:00
kumavis
96fc916024
Update transactions.js 2018-01-17 17:56:31 -08:00
frankiebee
234c2417ca transactions - transtion approved transactions to failed transactions on boot 2018-01-17 16:49:38 -08:00
frankiebee
be8d924432 transactions - fail txs on boot who fail addTxDefaults 2018-01-17 15:48:37 -08:00
frankiebee
9f19fea8e0 transactions - wrap addTxDefaults in a try catch and re try addTxDefaults on boot if they did not complete 2018-01-17 15:42:01 -08:00
Alexander Tseung
81f86cfab6 Merge branch 'uat' into uat-master-011618 2018-01-16 18:17:28 -08:00
Frankie
f18ed8bfd4
Merge branch 'master' into open-popup 2018-01-15 15:25:14 -08:00
Dan Finlay
582634d9fa
Merge pull request #2936 from MetaMask/i2925-BetterGasEstimation 
Improve gas price estimation by backfilling recent-blocks
 2018-01-15 14:35:59 -08:00
frankiebee
f0dd4f1923 transactions - emit 'newUnapprovedTx' before estimateGas finishes 2018-01-14 14:00:17 -08:00
Dan Finlay
7cb66ce4cb Prefer passing a provider over an ethQuery instance 2018-01-12 10:25:36 -08:00
Dan Finlay
4a9dad7c40 Improve gas price estimation by backfilling recent-blocks 
When first initializing, recent-block controller now back-fills up to
its desired history length. This makes estimated gas prices reflect a
longer recent history, even when first switching to a new network.

Fixes #2925
 2018-01-11 15:04:54 -08:00
kumavis
ab7701efb3 provider - infura - use infura REST api 2018-01-08 14:57:57 -08:00
kumavis
63ae7fb589 bugfix - transactions controller - breakout logic and fix order of operations bug 2018-01-08 13:20:38 -08:00
kumavis
9a8670309d bugfix - transactions controller - breakout logic and fix order of operations bug 2018-01-08 13:19:18 -08:00
Dan Finlay
aec24ec81e Fix feature to work 2018-01-05 22:08:03 -08:00
Dan Finlay
4bca98d588 Derive gas price estimate from previous transactions 
Return the 50th percentile lowest gas price of the previous 20 blocks.
 2018-01-05 21:24:20 -08:00
Alexander Tseung
06410381d4 Merge branch 'NewUI-flat' into merge-master 2017-12-22 11:00:46 -08:00
Alexander Tseung
a218008adf
Track usage of old and new UI (#2794) 
[NewUI] Track usage of old and new UI
 2017-12-22 10:43:02 -08:00
Dan Finlay
33dbee3db9 Remove retryTimePeriod from tx controller 2017-12-21 14:15:17 -08:00
Chi Kei Chan
9959aea598
Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 2017-12-20 17:38:28 -08:00
Dan
bf4043c59b Adds updateTransaction to background and used it to update after editing in send-v2. 2017-12-20 17:37:18 -08:00
Dan
1f1fc2c49e Canceled, edited transactions show edited amount. 2017-12-20 17:37:18 -08:00
Dan
7915e62d65 Merge branch 'master' into NewUI-flat 2017-12-20 19:16:12 -03:30
Thomas Huang
d3f5ad874e
Merge pull request #2763 from MetaMask/AddRecentBlocksController 
Add Recent Blocks controller
 2017-12-20 13:07:34 -05:00
Dan Finlay
30b45c8a38 Do not log whole txs in recent block controller. 
Only record gas prices, because that has a current use.
 2017-12-19 12:23:59 -08:00
Dan Finlay
975f7279c7 Allow updating token details 
Fixes #2173
 2017-12-18 15:57:04 -08:00
Dan Finlay
10ff77477c Add Recent Blocks controller 
Tracks recent blocks, useful for estimating recent successful gas
prices.
 2017-12-17 16:36:55 -08:00
Thomas Huang
fb8744771a Change console.log for opts in _configureInfuraProvider 2017-12-15 14:43:55 -06:00
kumavis
161aa66cb4 Revert "Revert "network - for infura networks use the infura block tracker provider"" 
This reverts commit 5df7dcd758.
 2017-12-13 18:57:27 -08:00
Frankie
5df7dcd758
Revert "network - for infura networks use the infura block tracker provider" 2017-12-13 17:46:56 -08:00
kumavis
33e6befdaa network - for infura networks use the infura block tracker provider 2017-12-13 13:51:36 -08:00
Dan Finlay
542e0035dd Pass polling interval to zero client provider 2017-12-09 19:58:47 -05:00
kumavis
a91200fd08 tx-controller - failed state is a finished state 2017-12-07 18:04:14 -05:00
Dan Finlay
950ec9596c Do not allow nonces larger than the next valid nonce 
To avoid situations where a user signs a transaction that will become
surprisingly valid in the future.
 2017-12-07 16:13:40 -05:00
Dan Finlay
89e640afcb Merge branch 'master' into patch-2 2017-12-07 16:05:17 -05:00
Chi Kei Chan
845aec82b9
Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI 2017-12-07 09:46:28 -08:00
vicnaum
553d713636
A more expressive way 
replaced ifs with ? :
 2017-12-07 15:30:05 +01:00
Chi Kei Chan
373f8b72d0
Merge branch 'master' into NewUI-flat 2017-12-06 21:13:29 -08:00
Dan
ec6c3c33bd Merge branch 'master' into NewUI-flat-merge-with-master 2017-12-06 21:11:52 -08:00
Dan Finlay
0e25129028 Enforce retry tx at minimum gas of previous tx 2017-12-06 23:42:47 -05:00
Dan Finlay
6ff580584a Add retry background method and action 2017-12-06 22:20:58 -05:00
vicnaum
7854321fae
Fix for #2644 - Specified Nonce isn't used 
Added nonceSpecified.
And a check if nonce was specified - then we should use the specified nonce instead of generating a new one.
 2017-12-06 22:49:24 +01:00
Dan
ea23da9e75 Correct note for updateTx after block-update event in transaction.js 2017-12-06 13:07:31 -03:30
Dan
ae2a4d78e8 Exponentional backoff on transaction retry in pending-tx-tracker 2017-12-05 17:21:14 -03:30
Dan
84321b2d9b Lint fix 2017-12-04 23:08:23 -03:30
Dan
7f79524070 Add UI selection 2017-12-04 23:08:23 -03:30
Dan Finlay
725277dbdb
Merge pull request #2441 from MetaMask/kumavis-patch-3 
NetworkController - add warning when aborting lookupNetwork
 2017-11-27 16:21:25 -08:00
kumavis
634102df63
network controller - warn via log.warn 2017-11-27 13:59:32 -10:00
Jason Clark
a34362b776 Fixes changes requested in pullrequestreview-79088534 2017-11-27 08:11:48 -07:00
Jason Clark
fc46a16a32 toggle wired up to preferences property store 2017-11-24 10:35:17 -07:00
Clark, Jason (Contractor)
90fc4812bc incremental commit 2017-11-23 18:33:44 -07:00
Chi Kei Chan
e61ba93194 Merge branch 'master' into merge-master 2017-11-15 12:03:13 -08:00
Dora E. Mondrian
41fea44af3 newUnaprovedTx => newUnapprovedTx 
This typo tripped me up when I was reading through the code and trying to understand what's going on.
 2017-11-06 04:35:51 -08:00
Dan
5a94775b3f Lint fixes for NewUI-flat. 2017-11-02 00:00:33 -02:30
Kevin Serrano
e0030a8bf8
Merge pull request #2291 from MetaMask/gasPriceSpecified 
Add boolean for specified gas price
 2017-10-27 14:01:08 -07:00
Chi Kei Chan
301c737bbc Merge branch 'master' into NewUI-flat 2017-10-24 16:56:49 -07:00
Kevin Serrano
1767dceba4 Merge pull request #2422 from watilde/fixes-lint 
Fixes lint warnings
 2017-10-24 16:53:54 -07:00
Chi Kei Chan
7c20011023 Merge branch 'master' into NewUI-flat 2017-10-24 16:50:25 -07:00
kumavis
b17a799de6 Update network.js 2017-10-23 12:10:49 -07:00
Dan Finlay
6d05238469 Try to fix intermittent test failure in NonceTracker tests 2017-10-22 22:24:50 -07:00
Daijiro Wachi
43b1cb9100 Fix lint warnings 
Fixed warnings:
```md
app/scripts/controllers/computed-balances.js
+ 35:27  warning  Missing space before function parentheses            space-before-function-paren
+ 41:14  warning  'address' is never reassigned. Use 'const' instead   prefer-const
+ 61:9   warning  'updater' is never reassigned. Use 'const' instead   prefer-const
+ 68:11  warning  'newState' is never reassigned. Use 'const' instead  prefer-const

app/scripts/controllers/network.js
+ 104:29  warning  Missing space before function parentheses  space-before-function-paren

app/scripts/lib/createLoggerMiddleware.js
+ 4:32  warning  Missing space before function parentheses      space-before-function-paren
+ 15:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/createOriginMiddleware.js
+ 4:32  warning  Missing space before function parentheses      space-before-function-paren
+ 9:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/createProviderMiddleware.js
+ 5:34  warning  Missing space before function parentheses      space-before-function-paren
+ 13:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/events-proxy.js
+ 1:50  warning  Missing space before function parentheses      space-before-function-paren
+ 31:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/nodeify.js
+ 2:22  warning  Missing space before function parentheses  space-before-function-paren
+ 2:24  warning  Missing space before opening brace         space-before-blocks
+ 5:18  warning  Missing space before function parentheses  space-before-function-paren
+ 5:20  warning  Missing space before opening brace         space-before-blocks

app/scripts/lib/pending-balance-calculator.js
+ 16:19  warning  Missing space before function parentheses  space-before-function-paren

app/scripts/lib/pending-tx-tracker.js
+ 85:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 87:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 88:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 90:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 91:11  warning  '||' should be placed at the end of the line  operator-linebreak

app/scripts/lib/port-stream.js
+ 3:22  warning  Missing space before function parentheses  space-before-function-paren
+ 3:24  warning  Missing space before opening brace         space-before-blocks

app/scripts/lib/tx-gas-utils.js
+ 84:2  warning  Newline required at end of file but not found  eol-last

app/scripts/lib/tx-state-history-helper.js
+ 12:37  warning  Missing space before function parentheses      space-before-function-paren
+ 23:30  warning  Missing space before function parentheses      space-before-function-paren
+ 30:23  warning  Missing space before function parentheses      space-before-function-paren
+ 35:28  warning  Missing space before function parentheses      space-before-function-paren
+ 41:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/tx-state-manager.js
+ 94:13  warning  'value' is never reassigned. Use 'const' instead  prefer-const

ui/app/reducers.js
+ 45:7  warning  'state' is never reassigned. Use 'const' instead        prefer-const
+ 53:7  warning  'stateString' is never reassigned. Use 'const' instead  prefer-const

ui/lib/tx-helper.js
+ 27:2  warning  Newline required at end of file but not found  eol-last

ui/app/components/account-dropdowns.js
+ 163:1  warning  More than 2 blank lines not allowed  no-multiple-empty-lines

ui/app/components/menu-droppo.js
+ 22:7  warning  'style' is never reassigned. Use 'const' instead  prefer-const

ui/app/components/shapeshift-form.js
+ 135:11  warning  '&&' should be placed at the end of the line  operator-linebreak

ui/app/components/typed-message-renderer.js
+ 35:25  warning  Missing space before function parentheses      space-before-function-paren
+ 42:2   warning  Newline required at end of file but not found  eol-last

mascara/server/index.js
+ 11:42  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 12:36  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 13:33  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 14:40  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 20:29  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 21:29  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 26:40  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
```
 2017-10-21 21:06:39 +02:00
Chi Kei Chan
344b467d03 Merge branch 'master' into NewUI-flat 2017-10-20 11:05:10 -07:00
Dan Finlay
0ae406e489 Allow computed balances to enumerate its own view 2017-10-19 09:59:57 -07:00
Chi Kei Chan
c8c773d641 Merge branch 'NewUI-flat' into merge 2017-10-18 22:58:46 -07:00
Dan Finlay
bbe2c9f48d Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault 2017-10-18 17:07:25 -07:00
kumavis
8da0d0b28a Revert "NetworkController refactor for new EthClient interface" 2017-10-18 15:09:32 -07:00
Dan Finlay
75177ce34c Make account tracking more reactive 
We were doing a lot of conditional observation & updating.
Pulled out a bunch of that for generic observer/syncers.
 2017-10-18 15:08:34 -07:00
Dan Finlay
9cc1e8a6d8 Refresh computed balances controller when restoring vault 2017-10-18 14:22:04 -07:00
Dan Finlay
ea79eca8eb Add validation to balance constructor 2017-10-18 12:21:22 -07:00
kumavis
dcf10f3d75 nonce-tracker - use blockTracker directly 2017-10-11 18:33:36 -07:00
kumavis
0f8d7dacb1 network-controller - use obj-proxy for providerProxy 2017-10-10 17:26:44 -07:00
kumavis
4d273d3cea lint fixes 2017-10-10 14:14:43 -07:00
kumavis
efa92a7fc5 network controller - refactor to use eth-rpc-client 2017-10-10 14:13:12 -07:00
Dan Finlay
94513cae7b Provide method for tx tracker to refer to all txs 2017-10-06 12:50:33 -07:00
frankiebee
ec9c528313 pending-tx - check time stamp instead of block number for resubmit 2017-10-05 11:07:22 -07:00
Kevin Serrano
15809894ff
Add indicator for specified gas price 2017-10-05 09:58:04 -07:00
Chi Kei Chan
bd99bc2e88 Merge branch 'master' into NewUI-flat 2017-10-03 16:02:58 -07:00
Dan
ac4868170f Enables remove token and ensures add/remove update the list without need for refresh. 2017-10-03 15:46:01 -07:00
frankiebee
833da191c3 transaction - provide notes for history 2017-10-02 13:41:29 -07:00
Dan Finlay
d5b0d8af4f Version 3.10.8 - Fix Currency Conversion 
In our conversion to the new Infura API, somehow we were sending upper-cased conversions to their lower-case sensitive API.

Fixes the first part of #2240
 2017-09-29 20:57:15 -07:00
kumavis
7bdf73b1dd Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactions 
pending-tx - dont check the balance to rebrodcast
 2017-09-29 17:36:49 -07:00
kumavis
1ad8a9a0ff network - make network controller internal network switching explicit 2017-09-29 17:10:34 -07:00
kumavis
d6ea2fa425 network - convert localhost from custom rpc to network type 2017-09-29 16:35:58 -07:00
kumavis
b88d11f86e network controller - small refactor 2017-09-29 16:09:38 -07:00
frankiebee
ac80eaca1f pending-tx - dont check the balance to rebrodcast 2017-09-29 12:54:05 -07:00
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
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
c781e11c7a network - remove getter/setter 2017-09-27 14:10:58 -07:00
kumavis
5bbea78306 Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3 
Transaction controller refractor pt3
 2017-09-27 13:57:04 -07:00
Dan Finlay
1983e161c6 Fix accountTracker store references 2017-09-27 12:29:09 -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
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
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
674aac83ce Make blockTracker an independent param 2017-09-25 14:39:54 -07:00
Dan Finlay
8cd7329c91 Implemented feedback 2017-09-25 14:36:49 -07:00
Dan Finlay
40f1d08684 Made some requested changes 2017-09-25 11:42:08 -07:00
Dan Finlay
f01b0a818b Fix account-tracker references 2017-09-22 14:13:56 -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
Kevin Serrano
bd8428e9ed
Comply with current currency API and add additional styling. 2017-09-18 16:09:01 -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
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
frankiebee
9b9df41724 more tests and craete a getPendingTransactions function 2017-09-08 14:24:40 -07:00
frankiebee
50075c6df5 fix messy merge 2017-09-07 00:55:21 -07:00
frankiebee
a73aecc796 fix merge and errors disaperaing on update 2017-09-06 14:01:07 -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
Kevin Serrano
056276af02
integrate infura currency 2017-08-29 16:36:05 -07:00
Dan Finlay
0ad310e096 Fail transactions after a day of retries 2017-08-23 22:29:08 -07:00
Dan Finlay
b3b62d97a3 Merge branch 'master' into useLocalNonce 2017-08-23 11:12:46 -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
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
1af797b1b3 tx controller - tx state history various small fixes 2017-08-14 19:15:36 -07:00
kumavis
fdffb6fedc introduce tx-state-history-helper and diff-based history 2017-08-14 18:46:04 -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
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
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
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
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
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
frankiebee
b471afcdb3 use error for #approveTransaction when setting failed 2017-08-02 19:24:34 -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
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
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
f147b928b2 Merge branch 'master' into i1805-LiveBlacklistUpdating 2017-07-26 15:32:19 -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
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
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
67fdba5e42 transaction - promisify _checkPendingTxs 2017-07-18 14:00:43 -07: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
frankiebee
27cb02bc58 add "nonce too low" to the ignored errs list for tx retrys 2017-07-12 19:03:34 -07:00
frankiebee
bd26ec46aa mv updateAndApproveTx to txController 2017-07-12 15:07: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
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
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
frankiebee
0ee4502d71 calculate nonce based on local pending txs w/o error state. 2017-06-27 15:26:04 -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
Thomas Huang
8b5b2d8329 Merge pull request #1663 from MetaMask/infura-status 
Add Infura Status Information to UI State
 2017-06-26 12:06:23 -07:00
Kevin Serrano
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
92df9965eb fix nonceTracker 2017-06-21 19:51:00 -07:00
Dan Finlay
41d992cca9 Merge branch 'AddTokenList' into i1616-AddTokenAdding 2017-06-19 19:03:49 -07:00
Thomas Huang
235cb1f2d7 Keeps dapp gas price if set 2017-06-19 17:50:06 -07:00
Kevin Serrano
9da243f42d
Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTokenList 2017-06-19 13:51:38 -07:00
frankiebee
0d8c02db35 Merge branch 'master' into nonce-tracker 2017-06-16 17:07:12 -07:00
Frankie
ac728189e1 Merge branch 'master' into i1567-FixInaccurateError 2017-06-16 16:46:13 -07:00
frankiebee
9c2ead3d52 put event back on the "blockTracker:/provider" 2017-06-16 16:43:38 -07:00
frankiebee
5f8e74e0aa put the block listeners back on the provider 2017-06-16 16:36:32 -07:00
Dan Finlay
48789f2a3d Add ability to add tokens to token list 
Fiex #1616
 2017-06-15 16:22:53 -07:00
frankiebee
f76a555c09 Merge branch 'master' into i1567-FixInaccurateError 2017-06-15 14:28:10 -07:00
kumavis
41a1ce037b Merge pull request #1611 from MetaMask/checkTxsOnSync 
add a check for weather a tx is included in a block when jumping blocks
 2017-06-15 14:12:14 -07:00
kumavis
27b874f2c4 transactions controller - add comments 2017-06-15 14:08:07 -07:00
frankiebee
2e5deef2b0 check nonce and balance when resubmiting tx 2017-06-15 13:48:48 -07:00
Dan Finlay
39c7ed230d Merge remote-tracking branch 'origin/master' into AddTokenList 2017-06-15 13:44:58 -07:00
kumavis
b3492d9c17 transaction controller - use nonce-tracker 2017-06-14 23:44:02 -07:00
frankiebee
07539a63e4 remove unnecessary log 2017-06-14 21:52:49 -07:00
frankiebee
a10740af7e add a check for weather a tx is included in a block when jumping blocks 2017-06-14 20:17:59 -07:00
frankiebee
6ae97290f0 check for the tx in the block that provider engine gives us 2017-06-14 17:43:04 -07:00
Dan Finlay
6fda78cd2b Refresh token balance on network change 2017-06-14 15:21:51 -07:00
Dan Finlay
b7b9e0c1ac Persist selected account tab 
Also improve error handling with token balances.
 2017-06-14 14:21:50 -07:00
Dan Finlay
0fd32e67d4 Do not mark slowly mined txs as failed. 
Fixes #1567

Also seems to fix #1556

Also improves resubmit performance by only resubmitting on `latest`.
 2017-06-14 12:01:45 -07:00
Dan Finlay
dd7e11d196 Merge pull request #1598 from MetaMask/txRetry 
put tx resubmission on the block event
 2017-06-13 10:45:21 -07:00
frankiebee
ec3383c162 rename continuallyResubmitPendingTxs to resubmitPendingTxs 2017-06-13 09:50:01 -07:00
Thomas Huang
ae7c296669 Fix networkState in chain id 2017-06-12 17:44:11 -07:00
Dan Finlay
a741cc4fc4 Merge branch 'master' into AddTokenList 2017-06-12 17:17:16 -07:00
frankiebee
96fa29ffbc put tx resubmission on the block event 2017-06-12 16:11:37 -07:00
Kevin Serrano
203a573f3f
Use new URL for currency API from cryptonator. 2017-06-05 16:23:56 -07:00
frankiebee
db982cf795 stop polling when switching networks 2017-05-24 11:52:18 -04:00
Frankie
97ea7454b3 Merge branch 'master' into networkController 2017-05-23 20:36:11 -04:00
frankiebee
243eeff7cb Fix for tests 2017-05-23 19:49:57 -04:00
Dan Finlay
e4d09aebf4 Cleanup 2017-05-23 14:49:10 -07:00
Dan Finlay
cd2ad1733d Continually resubmit pending txs 2017-05-23 12:22:15 -07:00
frankiebee
529304c005 Wrap the provider in a proxy 2017-05-23 01:56:10 -04:00
frankiebee
13a41f3129 Merge branch 'master' into networkController 2017-05-22 19:48:10 -04:00
frankiebee
f87ea49b5a Create a network controller to manage switcing networks an updating the provider 2017-05-19 00:14:10 +02:00
Dan Finlay
68d6ea44a0 Fix path references 2017-05-16 11:39:00 -07:00
Dan Finlay
2df9344be5 Rename tx manager to tx controller 2017-05-16 10:35:28 -07:00
Thomas Huang
6bdb4c8728 Fix linting warnings 2017-04-26 21:05:45 -07:00
Kevin Serrano
4933e2e2ee Limit the number of addresses stored in our book. 2017-03-13 16:37:53 -07:00
Kevin Serrano
7dcab52a9e Connect keyring controller to address book to prevent additional duplicates. 2017-03-10 10:34:46 -08:00
Kevin Serrano
7182a2be43 Improve duplicate checking in address book. 2017-03-10 10:05:10 -08:00
Kevin Serrano
2ab86b001d Add comments. 2017-03-10 09:34:13 -08:00
Kevin Serrano
b296640f1b Rename functions for consistency. 2017-03-09 15:09:50 -08:00
Kevin Serrano
9f6c040554
Create persistence address book. 2017-03-09 13:58:42 -08:00
Kevin Serrano
d270cbc9d2
Create distinct labels and names for addresses. 2017-03-09 13:07:38 -08:00
Kevin Serrano
e7e024bcdd
Refactor of code into separate reducers and actions. 2017-03-07 16:01:51 -08:00
Kevin Serrano
e66035254f
More conflict resolution. 2017-03-01 10:04:25 -08:00
Dan Finlay
b5d03cd524 add controllers to root scripts folder 2017-02-27 10:40:37 -08:00