m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-23 03:36:18 +02:00
Code
6,577 Commits 2 Branches 0 Tags 265 MiB
6351b7bb88
Commit Graph

327 Commits

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