Commit Graph

429 Commits

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