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
a10a600cce
Linted
2017-10-19 12:33:43 -07:00
Dan Finlay
3b4c679ffc
Fix bug where new account was not immediately selected
2017-10-19 12:15:26 -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
21bde66e16
Remove account-tracker from keyringController
2017-10-18 17:14:26 -07:00
Dan Finlay
bbe2c9f48d
Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault
2017-10-18 17:07:25 -07:00
Dan Finlay
d89394a7c9
Make account tracking much more reactive
2017-10-18 17:07:22 -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
Dan Finlay
7032edf32b
Stop tracking old account balances after restore vault
...
Per @kgserrano note
2017-10-18 11:13:14 -07:00
Dan Finlay
50e8599988
Promisify metamask-controller vault creating methods
2017-10-17 13:25:27 -07:00
Dan Finlay
d7f384485d
Select first account when restoring seed
...
Fixes #2348
2017-10-17 13:19:57 -07:00
Dan Finlay
ab31eb6a17
Select first account on new vault creation
2017-10-17 13:09:41 -07:00
kumavis
53a360b65d
contentscript - fix inpage require and bundling
2017-10-12 12:51:48 -07:00
Dan Finlay
c9a984a237
Break up inpage file read into multiple lines
2017-10-12 14:16:40 -04:00
Dan Finlay
d0d082d70c
Merge branch 'master' into i1340-SynchronousInjection
2017-10-12 13:25:19 -04: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
7d50a56198
util - add obj-proxy
2017-10-10 17:15:52 -07:00
kumavis
e32d75965f
events-proxy - clean up
2017-10-10 17:15:14 -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
kumavis
ff4e9a0d11
metamask controller - define this.newTransaction to ease instantiation order
2017-10-10 10:50:45 -07:00
kumavis
f7c1bc804d
metamask controller - simplify provider init
2017-10-10 10:39:31 -07:00
kumavis
e79037261e
metamask controller - breakout getAccounts method
2017-10-10 10:26:59 -07:00
Kevin Serrano
1816eca914
Merge branch 'master' into version-debugging
2017-10-10 08:38:27 -07:00
Kevin Serrano
24a55cf777
Make the function callback friendly.
2017-10-10 08:36:15 -07:00
Dan Finlay
7f70c866c3
Merge pull request #2223 from ukstv/master
...
Add eth_signTypedData handler
2017-10-09 12:18:43 -07:00
Dan
bbe893a0d8
UI for send screen container without form rows.
2017-10-08 17:48:09 -07:00
Sergey Ukustov
a1696f89a8
Validate data format for eth_signTypedData
2017-10-07 00:38:13 +03:00
Frankie
4a4338c1f4
Merge pull request #2305 from MetaMask/nodeify
...
nodeify - allow callback to be optional
2017-10-06 14:08:58 -07:00
Dan Finlay
0c61695656
Merge branch 'master' into SignTypedData
2017-10-06 14:03:04 -07:00
kumavis
fa11bbf996
Merge pull request #2304 from MetaMask/i1531-UpdateTxStatesOnInit
...
Update status of pending transactions on startup
2017-10-06 13:40:43 -07:00
kumavis
bc396a7417
lint fix - nodeify
2017-10-06 13:02:34 -07:00
Dan Finlay
a417fab0eb
When checking pending txs, check for successful txs with same nonce.
...
If a successful tx with the same nonce exists, transition tx to the failed state.
Fixes #2294
2017-10-06 12:51:13 -07:00
Dan Finlay
94513cae7b
Provide method for tx tracker to refer to all txs
2017-10-06 12:50:33 -07:00
kumavis
be4f7b33f4
nodeify - allow callback to be optional
2017-10-06 12:36:08 -07:00
Dan Finlay
0146b55d6d
Check status of pending transactions on startup
...
Fixes #1531
2017-10-06 11:41:28 -07:00
Kevin Serrano
f6821781d2
Simplify try catch
2017-10-05 17:17:34 -07:00
Kevin Serrano
106af9ec5b
Catch an error if this is not defined.
2017-10-05 17:13:58 -07:00
Kevin Serrano
b9012a62e5
Merge branch 'master' into version-debugging
2017-10-05 17:06:55 -07:00
Dan Finlay
cf178341c1
Merge branch 'master' into SignTypedData
2017-10-05 14:50:19 -07:00
Dan Finlay
9bc80d998e
Add signTypedData input validations
2017-10-05 14:39:35 -07:00
Dan Finlay
c5b7880f05
Merge branch 'master' into SignTypedData
2017-10-05 11:55:23 -07:00
frankiebee
3cb9da2ae5
"fix" hours for message
2017-10-05 11:42:01 -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
Dan Finlay
1cba6543a4
Begin implementing sync injection idea
2017-10-04 15:35:04 -07:00
Kevin Serrano
3d80565339
Configured for callback-required function.'
2017-10-04 10:55:10 -07:00
Kevin Serrano
147b81068a
Include OS version
2017-10-04 09:56:18 -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
Frankie
948a0b1078
Merge pull request #2250 from interfect/master
...
Don't pass origin as an HTTP header
2017-10-03 10:36:39 -07:00
Sergey Ukustov
e11ca12890
Merge remote-tracking branch 'upstream/master'
2017-10-03 02:10:47 +03:00
kumavis
062eaa6a82
pending tx tracker - on tx:warn append error message instead of error obj
2017-10-02 15:39:11 -07:00
kumavis
ed77304e73
pending tx tracker - tx:warning event includes err obj
2017-10-02 15:20:01 -07:00
kumavis
22eaf92ec2
pending tx tracker - resubmit - warn dont error on unknown error
2017-10-02 15:00:23 -07:00
kumavis
7af696bfbe
pending tx tracker - dont throw on load failure
2017-10-02 14:56:59 -07:00
kumavis
167ad729fd
Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into history-notes
2017-10-02 13:45:47 -07:00
frankiebee
e08a727d44
Merge branch 'master' into history-notes
2017-10-02 13:44:15 -07:00
kumavis
df59ef9942
tx state history - append note to first op of diff
2017-10-02 13:44:11 -07:00
frankiebee
833da191c3
transaction - provide notes for history
2017-10-02 13:41:29 -07:00
kumavis
d29b5f10ef
tx state history - fix bug where initial snapshot was mutated on updateTx
2017-10-02 13:14:42 -07:00
Adam Novak
8cc8fecdac
Don't pass origin as an HTTP header
...
Requests with this nonstandard header are being blocked by CORS when
made against Parity.
Not sending it ought to fix #1779 .
2017-10-01 18:55:52 -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
Dan Finlay
861bd877f3
Ensure selected account is always set if possible
...
Fixes #2218
Subscribes to keyringController, and if only one account exists, sets it as selected.
2017-09-29 11:19:54 -07:00
Sergey Ukustov
c2b8dada91
Add eth_signTypedData handler
2017-09-29 19:40:46 +03:00
Chi Kei Chan
5a1d50cd43
Merge branch 'master' into mmn
2017-09-27 22:32:07 -07:00
kumavis
cdf41c2857
Merge pull request #2124 from MetaMask/breakout-mascara
...
require metamascara
2017-09-27 16:27:01 -07:00
frankiebee
b24e16d346
re-enabled x-metamask-origin for mascara
2017-09-27 16:14:58 -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
Dan Finlay
a246770866
Commit to the eth-keyring-controller module
2017-09-27 14:55:34 -07:00
Dan Finlay
aefd17ef94
Remove dead reference
2017-09-27 14:45:24 -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
7d499df8e3
account-tracker - remove unused import
2017-09-27 14:12:45 -07:00
kumavis
c781e11c7a
network - remove getter/setter
2017-09-27 14:10:58 -07:00
kumavis
7e9c6e96a1
metamask - improve comment
2017-09-27 14:10:17 -07:00
kumavis
4404dfc5d3
Merge branch 'master' into direct-block-tracker
2017-09-27 13:58:54 -07:00
kumavis
5bbea78306
Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3
...
Transaction controller refractor pt3
2017-09-27 13:57:04 -07:00
kumavis
b41aad6d1a
style - small whitespace nitpick
2017-09-27 12:33:46 -07:00
kumavis
89e690fc79
account-tracker - use new block-tracker block format
2017-09-27 12:33:00 -07:00
Dan Finlay
1983e161c6
Fix accountTracker store references
2017-09-27 12:29:09 -07:00
Dan Finlay
8d3fec42d0
Fix bug where block gas limit was incorrectly parsed.
2017-09-27 12:09:32 -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
kumavis
1877c0766c
Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOutKeyringController
2017-09-26 21:42:30 -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
651098c70d
Remove duplicate instantiation of account-tracker
2017-09-26 14:30:29 -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
3bedcd3582
Restore blockGasLimit to account-tracker
2017-09-26 13:36:41 -07:00
Dan Finlay
9e3648c668
Pass blocktracker to balances controller
2017-09-26 11:33:36 -07:00
Kevin Serrano
16ba2e6a30
Merge branch 'master' into new-currency-test
2017-09-26 09:51:20 -07:00
Dan Finlay
1968d61431
Make encryptor configurable for keyring-controller
2017-09-25 15:23:37 -07:00
Dan Finlay
674aac83ce
Make blockTracker an independent param
2017-09-25 14:39:54 -07:00
Dan Finlay
d9c92cdbd1
Merge branch 'AddBalanceController' of github.com:MetaMask/metamask-plugin into AddBalanceController
2017-09-25 14:37:11 -07:00
Dan Finlay
8cd7329c91
Implemented feedback
2017-09-25 14:36:49 -07:00
Dan Finlay
dfbdb99858
Merge branch 'master' into AddBalanceController
2017-09-25 11:49:38 -07:00
Dan Finlay
40f1d08684
Made some requested changes
2017-09-25 11:42:08 -07:00
Dan Finlay
443b1a8eb7
Remove keyring controller from project
2017-09-22 14:38:40 -07:00
Dan Finlay
aa2abc00eb
Merge branch 'AddBalanceController' into BreakOutKeyringController
2017-09-22 14:30:31 -07:00
kumavis
dd45592641
metamask - use provider-engines block tracker
2017-09-22 14:22:07 -07:00
Dan Finlay
128cf40f91
Fix accont-tracker merge bug
2017-09-22 14:16:19 -07:00
Dan Finlay
f01b0a818b
Fix account-tracker references
2017-09-22 14:13:56 -07:00
Dan Finlay
f9d2f523c6
Merge branch 'master' into AddBalanceController
2017-09-22 14:12:41 -07:00
Dan Finlay
d2a747e57e
Fix computed-balances controller reference
2017-09-22 14:06:54 -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
Dan Finlay
977405fc7d
Remove dead code from eth-store
2017-09-22 13:33:53 -07:00
Dan Finlay
08b36b9b58
Allow metamaskController to define keyring types
2017-09-22 13:29:13 -07:00
Dan Finlay
4c971ebfd1
Define encryptor in constructor params instead of platform object
2017-09-22 13:25:08 -07:00
kumavis
0a5ae39509
bug - fix event emitter mem leak warning
2017-09-21 17:37:30 -07:00
Dan Finlay
bd117d6b71
Merge branch 'master' into ConfigurableEncryption
2017-09-21 15:56:24 -07:00
Dan Finlay
e9043f22df
Allow custom encryptor to be passed to MetaMaskController and KeyringControllers.
2017-09-21 15:47:25 -07:00
frankiebee
14b9d16ece
platforms: put context for extension in platform extension class
2017-09-21 11:12:04 -07:00
Kevin Serrano
b22783a223
Merge branch 'master' into new-currency-test
2017-09-20 09:40:33 -07:00
frankiebee
90482934f1
Merge branch 'master' into breakout-mascara
2017-09-19 10:45:51 -07:00
frankiebee
bfd75107f1
add context to platform to not have X-Metamask-Origin in mascara
2017-09-19 10:45:32 -07:00
Chi Kei Chan
a67d3ecd46
Merge branch 'master' into NewUI-flat
2017-09-18 18:13:15 -07:00
Kevin Serrano
bd8428e9ed
Comply with current currency API and add additional styling.
2017-09-18 16:09:01 -07:00
Dan Finlay
2b7b1db851
Do not mark a retry tx failed that has been broadcast successfully
...
Fixes #2115
If a tx has been braodcast, the only failures we should accept are:
- Never mined
- On chain failure
We had a section of code that would mark a tx failed during any unknown error during a retry.
Now no retry > 1 will ever mark a tx failed, since it has been broadcast, and may be mined.
2017-09-18 14:34:25 -07:00
Kevin Serrano
51f0911f87
Merge branch 'master' into new-currency-test
2017-09-18 11:46:10 -07:00
Chi Kei Chan
6c5865d564
Merge branch 'master' into nm
2017-09-18 11:28:10 -07:00
Kevin Serrano
cb8856597c
Merge branch 'master' into new-currency-test
2017-09-14 08:35:48 -07:00
kumavis
d7097db022
createOriginMiddleware - fix var name
2017-09-13 15:29:44 -07:00
kumavis
765ef64061
metamask controller - destroy filter polyfill on disconnect
2017-09-13 15:19:44 -07:00
kumavis
245c0f0c27
metamask controller - move middleware into seperate files
2017-09-13 15:17:26 -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
kumavis
96d1175834
debug - prefer logger over console
2017-09-13 10:28:29 -07:00
kumavis
a265144176
metamask cont - standardize multiplex stream naming
2017-09-13 10:21:00 -07:00
Chi Kei Chan
8b5f2a95df
Improve styling in Confirmation Screen; Show decoded send token data
2017-09-12 23:04:01 -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
Chi Kei Chan
7eb6dae418
Added signTokenTx; Adding token confirmation screen
2017-09-12 02:22:23 -07:00
Dan Finlay
4738746968
Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController
2017-09-11 15:19:17 -07:00
kumavis
8545453a9d
contentscript - fix obj-multiplex instantiation and use pump for streams
2017-09-11 14:30:30 -07:00
kumavis
41164f61db
Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix
2017-09-11 14:21:09 -07:00
frankiebee
62f26c5ba8
fix miss type
2017-09-08 15:02:36 -07:00
frankiebee
9b9df41724
more tests and craete a getPendingTransactions function
2017-09-08 14:24:40 -07:00
kumavis
5fa0b992a7
Merge pull request #2057 from MetaMask/Version-3.9.13
...
Version 3.9.13
2017-09-08 13:06:59 -07:00
kumavis
d03b0547bb
inpage provider - define sendAsync on the prototype
2017-09-08 11:52:00 -07:00
kumavis
ef3bf810bf
inpage - use obj-multiplex module
2017-09-07 22:47:08 -07:00
kumavis
671dafea9e
Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix
2017-09-07 22:37:44 -07:00
kumavis
70401626e2
lint - remove dead code
2017-09-07 22:35:38 -07:00
kumavis
9d4c02e57f
metamask - add jsonrpc filter middleware on per-connection engine
2017-09-07 21:26:25 -07:00
kumavis
0e8e655fdb
inpage - distinguish pump vs pipe
2017-09-07 21:19:24 -07:00
kumavis
57e4805c62
streams - use pump and published obj-multiplex
2017-09-07 21:17:49 -07:00
Dan Finlay
d4d7c6d89e
Linted
2017-09-07 12:54:28 -07:00
Dan Finlay
fadc0617df
Make tx calculations account for gas prices
2017-09-07 12:52:49 -07:00
Dan Finlay
c616581001
Remove logs
2017-09-07 12:47:52 -07:00
Dan Finlay
a95a3c7e4f
Fix balance calc test
2017-09-07 12:47:27 -07:00
Dan Finlay
74c6de7d23
Add constructor comment
2017-09-07 12:45:00 -07:00
Dan Finlay
7b92268428
Fix valueFor test
2017-09-07 12:43:10 -07:00
Dan Finlay
4058574436
Add basic test for valueFor
2017-09-07 12:30:25 -07:00
Dan Finlay
b6e8791bc2
test not passing
2017-09-07 11:59:15 -07:00
kumavis
440a42bbc3
inpage - add idRemapMiddleware
2017-09-07 10:08:07 -07:00
frankiebee
50075c6df5
fix messy merge
2017-09-07 00:55:21 -07:00
frankiebee
00fca4f1f2
remove unused variable
2017-09-06 14:38:39 -07:00
Dan Finlay
74f7fc4613
Check balances in parallel
2017-09-06 14:37:46 -07:00
Dan Finlay
f9a052deed
Add first passing balance calc test
2017-09-06 14:36:15 -07:00
frankiebee
a73aecc796
fix merge and errors disaperaing on update
2017-09-06 14:01:07 -07:00
Kevin Serrano
0217984a40
Merge branch 'master' into readd-loose
2017-09-06 13:59:52 -07:00
Kevin Serrano
b5f48730cd
Properly update keyring state on new account addition.
2017-09-06 13:59:41 -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
frankiebee
00bd5b143f
rename tx-utils.js -> tx-gas-utils.js
2017-09-05 20:33:50 -07:00
frankiebee
4c554f32ec
remove #buildEthTxFromParams
2017-09-05 20:13:43 -07:00
kumavis
ea7e46ed38
inpage - bug fix
...
prevents mutation of original message object which causes problems with web3 1.0
2017-09-05 16:46:21 -07:00
Dan Finlay
70a61f8712
Make web3 deprecation notice more useful
...
Linking to a descriptive & precriptive article on a path forward.
2017-09-05 11:35:33 -07:00
Kevin Serrano
ae8486d5cf
Merge branch 'master' into new-currency-test
2017-08-29 16:36:19 -07:00
Kevin Serrano
056276af02
integrate infura currency
2017-08-29 16:36:05 -07:00
kumavis
76de053b0b
Merge branch 'master' into inpage-provider-fixes
2017-08-28 11:29:47 -07:00
kumavis
e294aa7e0d
inpage - lint fix
2017-08-28 10:41:01 -07:00
kumavis
cc56d0d2f6
inpage - use json-rpc-engine for inpage-provider
2017-08-24 15:44:40 -07:00
kumavis
9ce82640f2
Merge pull request #1973 from MetaMask/hotfix-migration019
...
hotfix - fail submitted txs whos nonce is out of bound
2017-08-24 00:15:24 -07:00
frankiebee
c2624dd1a0
fall back to latest if blockNumber is null
2017-08-24 00:02:06 -07:00
Dan Finlay
803e696cdc
Make method return a number
2017-08-23 23:24:01 -07:00
Dan Finlay
17a71a9b4c
Only cancel pending txs with non continuously high nonces
2017-08-23 23:13:42 -07:00
frankiebee
f42687d25f
fix description
2017-08-23 22:53:29 -07:00
frankiebee
dadee1ed79
hotfix - fail submitted txs whos nonce is out of bound
2017-08-23 22:50:40 -07:00
Dan Finlay
0ad310e096
Fail transactions after a day of retries
2017-08-23 22:29:08 -07:00
Dan Finlay
c620123fab
Enforce nonces as type string
2017-08-23 21:50:28 -07:00
Dan Finlay
a122ec1f8b
Use toNumber method
2017-08-23 21:37:07 -07:00
Dan Finlay
55c1a259b1
Fix network nonce parsing
2017-08-23 21:14:46 -07:00
Dan Finlay
855f4eeacb
Pass nonce tests
2017-08-23 20:43:47 -07:00
Dan Finlay
04d40b114d
Got all tests but one passing
2017-08-23 20:11:37 -07:00
Dan Finlay
221575a191
Fix new test, break an older maybe wrong one
2017-08-23 20:04:03 -07:00
Dan Finlay
c4ab7a5779
Linted
2017-08-23 19:35:49 -07:00
Dan Finlay
1f0223d0a0
Simplify nonce calculation
2017-08-23 19:34:20 -07:00
kumavis
4019f318fe
inpage provider - autoreload - improve readability
2017-08-23 16:44:57 -07:00
kumavis
44dc2ba712
inpage provider - only warn web3 usage once per session
2017-08-23 16:26:55 -07:00
kumavis
53e410167b
inpage provider - sync rpc - default to null values
2017-08-23 16:13:33 -07:00
Dan Finlay
b3b62d97a3
Merge branch 'master' into useLocalNonce
2017-08-23 11:12:46 -07:00
kumavis
247965ebbe
nonce-tracker - more debugging numbers for nonceDetails
2017-08-22 15:34:30 -07:00
kumavis
0a93b65a3d
remove unused code
2017-08-22 15:06:54 -07:00
kumavis
fb2c6cc8ac
nonce-tracker - use ethjs-query
2017-08-22 14:33:54 -07:00
kumavis
dc3e8d60ef
nonce-tracker - fix var name
2017-08-22 14:24:09 -07:00
kumavis
6d596bd9e6
nonce-tracker - getlocalNextNonce - add entry to nonceDetails
2017-08-22 14:17:00 -07:00
kumavis
a7e3dc8327
nonce-tracker - simplify _getlocalNextNonce
2017-08-22 14:15:56 -07:00
kumavis
e43da3e4aa
nonce-tracker - simplify getHighestNonce
2017-08-22 14:04:31 -07:00
kumavis
b191649ef5
nonce-tracker - getHighestNonce doesnt need uniqued input
2017-08-22 13:58:26 -07:00
kumavis
98bc9b6656
nonce-tracker - make nonce strategy api and naming more symmetical
2017-08-22 13:52:15 -07:00
frankiebee
604c91f7b2
nonce-tracker - pass tests
2017-08-21 18:04:05 -07:00
frankiebee
7d34b22d78
clean up code
2017-08-21 17:04:47 -07:00
frankiebee
5c74f316a8
nonce-tracker - pass tests
2017-08-21 16:45:10 -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
1ffb406480
break out network nonce calc.
2017-08-18 16:05:21 -07:00
frankiebee
37f86e874f
fix 0x0 nonce calc.
2017-08-18 15:44:32 -07:00
frankiebee
f8eca95ca5
include pendingTxs in localNonce
2017-08-18 15:01:05 -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
588b8f0d39
migration 18 - activate
2017-08-14 20:06:15 -07:00
kumavis
ac2b572c34
migration 18 - fix an oops
2017-08-14 20:05:57 -07:00
kumavis
1af797b1b3
tx controller - tx state history various small fixes
2017-08-14 19:15:36 -07:00
kumavis
accd057b1a
migration 18 - move to diff-based history
2017-08-14 18:46:18 -07:00
kumavis
fdffb6fedc
introduce tx-state-history-helper and diff-based history
2017-08-14 18:46:04 -07:00
sdtsui
dbc539ac55
Merge remote-tracking branch 'mm/master' into NewUI-flat
2017-08-14 11:06:14 +02:00
frankiebee
66a012550e
fix wording
2017-08-11 15:54:52 -07:00
frankiebee
ac9e84ff40
add deprecation warning for web3
2017-08-11 15:52:03 -07:00
Thomas Huang
1071a35f7b
Merge pull request #1883 from MetaMask/estimateGas-fix
...
tx utils - detect estimateGas err and set simulationFailed
2017-08-09 14:03:02 -07:00
kumavis
245125eb18
ui - buy eth - formatting and moved network names to config
2017-08-09 12:25:38 -07:00
kumavis
b4052cd5e6
tx utils - detect estimateGas err and set simulationFailed
2017-08-08 23:34:18 -07:00
kumavis
0188e7b94d
Merge branch 'master' into NewUI-flat
2017-08-08 23:30:58 -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
kumavis
5418813ed1
util - sufficientBalance - validate input
2017-08-08 21:05:59 -07:00
Frankie
d40bd9a726
Merge pull request #1880 from MetaMask/pendingFix
...
fix getPendingTransactions function for pendingTxTracker
2017-08-08 22:00:17 -04: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
