3cb9da2ae5
"fix" hours for message
2017-10-05 11:42:01 -07:00
ec9c528313
pending-tx - check time stamp instead of block number for resubmit
2017-10-05 11:07:22 -07:00
bd99bc2e88
Merge branch 'master' into NewUI-flat
2017-10-03 16:02:58 -07:00
e11ca12890
Merge remote-tracking branch 'upstream/master'
2017-10-03 02:10:47 +03:00
062eaa6a82
pending tx tracker - on tx:warn append error message instead of error obj
2017-10-02 15:39:11 -07:00
ed77304e73
pending tx tracker - tx:warning event includes err obj
2017-10-02 15:20:01 -07:00
22eaf92ec2
pending tx tracker - resubmit - warn dont error on unknown error
2017-10-02 15:00:23 -07:00
7af696bfbe
pending tx tracker - dont throw on load failure
2017-10-02 14:56:59 -07:00
167ad729fd
Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into history-notes
2017-10-02 13:45:47 -07:00
e08a727d44
Merge branch 'master' into history-notes
2017-10-02 13:44:15 -07:00
df59ef9942
tx state history - append note to first op of diff
2017-10-02 13:44:11 -07:00
833da191c3
transaction - provide notes for history
2017-10-02 13:41:29 -07:00
d29b5f10ef
tx state history - fix bug where initial snapshot was mutated on updateTx
2017-10-02 13:14:42 -07:00
ac80eaca1f
pending-tx - dont check the balance to rebrodcast
2017-09-29 12:54:05 -07:00
c2b8dada91
Add eth_signTypedData handler
2017-09-29 19:40:46 +03:00
5a1d50cd43
Merge branch 'master' into mmn
2017-09-27 22:32:07 -07:00
7d499df8e3
account-tracker - remove unused import
2017-09-27 14:12:45 -07:00
4404dfc5d3
Merge branch 'master' into direct-block-tracker
2017-09-27 13:58:54 -07:00
5bbea78306
Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3
...
Transaction controller refractor pt3
2017-09-27 13:57:04 -07:00
b41aad6d1a
style - small whitespace nitpick
2017-09-27 12:33:46 -07:00
89e690fc79
account-tracker - use new block-tracker block format
2017-09-27 12:33:00 -07:00
8d3fec42d0
Fix bug where block gas limit was incorrectly parsed.
2017-09-27 12:09:32 -07:00
e72083f6e8
Merge branch 'master' into filter-fixes-moar
2017-09-27 10:57:02 -07:00
0a94ec41d3
pending-tx - move incrementing of the retryCount on the txMeta outside pending-tx-tracker
2017-09-26 22:42:59 -07:00
80c98b1653
transactions: make evnt names pretty and eaiser to read
2017-09-26 16:55:11 -07:00
9fd5458112
transactions: lint fixes and reveal status-update event for balance controller
2017-09-26 16:54:04 -07:00
8ab23c713d
Merge branch 'master' into transactionControllerRefractorPt3
2017-09-26 16:24:43 -07:00
2eca5455c0
Move obs store into account-tracker instead of inheriting
2017-09-26 14:15:16 -07:00
b654eb9b1f
wrap block tracker in events proxy
2017-09-26 13:38:27 -07:00
3bedcd3582
Restore blockGasLimit to account-tracker
2017-09-26 13:36:41 -07:00
8cd7329c91
Implemented feedback
2017-09-25 14:36:49 -07:00
f9d2f523c6
Merge branch 'master' into AddBalanceController
2017-09-22 14:12:41 -07:00
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
977405fc7d
Remove dead code from eth-store
2017-09-22 13:33:53 -07:00
a67d3ecd46
Merge branch 'master' into NewUI-flat
2017-09-18 18:13:15 -07:00
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
6c5865d564
Merge branch 'master' into nm
2017-09-18 11:28:10 -07:00
d7097db022
createOriginMiddleware - fix var name
2017-09-13 15:29:44 -07:00
245c0f0c27
metamask controller - move middleware into seperate files
2017-09-13 15:17:26 -07:00
a01921758b
Add computed balance to account detail view
2017-09-13 15:06:04 -07:00
77a48fb0b1
ensure that values written to txParams are hex strings
2017-09-13 14:27:27 -07:00
9e0c0745ab
linting && format fixing
2017-09-12 12:19:26 -07:00
3ad67d1b14
match other controller patterns
2017-09-12 09:59:59 -07:00
4738746968
Merge branch 'i1746-BalanceBasedOnPending' into AddBalanceController
2017-09-11 15:19:17 -07:00
41164f61db
Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix
2017-09-11 14:21:09 -07:00
62f26c5ba8
fix miss type
2017-09-08 15:02:36 -07:00
9b9df41724
more tests and craete a getPendingTransactions function
2017-09-08 14:24:40 -07:00
d03b0547bb
inpage provider - define sendAsync on the prototype
2017-09-08 11:52:00 -07:00
ef3bf810bf
inpage - use obj-multiplex module
2017-09-07 22:47:08 -07:00
671dafea9e
Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix
2017-09-07 22:37:44 -07:00
70401626e2
lint - remove dead code
2017-09-07 22:35:38 -07:00
0e8e655fdb
inpage - distinguish pump vs pipe
2017-09-07 21:19:24 -07:00
57e4805c62
streams - use pump and published obj-multiplex
2017-09-07 21:17:49 -07:00
d4d7c6d89e
Linted
2017-09-07 12:54:28 -07:00
fadc0617df
Make tx calculations account for gas prices
2017-09-07 12:52:49 -07:00
c616581001
Remove logs
2017-09-07 12:47:52 -07:00
a95a3c7e4f
Fix balance calc test
2017-09-07 12:47:27 -07:00
74c6de7d23
Add constructor comment
2017-09-07 12:45:00 -07:00
7b92268428
Fix valueFor test
2017-09-07 12:43:10 -07:00
4058574436
Add basic test for valueFor
2017-09-07 12:30:25 -07:00
b6e8791bc2
test not passing
2017-09-07 11:59:15 -07:00
440a42bbc3
inpage - add idRemapMiddleware
2017-09-07 10:08:07 -07:00
00fca4f1f2
remove unused variable
2017-09-06 14:38:39 -07:00
74f7fc4613
Check balances in parallel
2017-09-06 14:37:46 -07:00
f9a052deed
Add first passing balance calc test
2017-09-06 14:36:15 -07:00
a73aecc796
fix merge and errors disaperaing on update
2017-09-06 14:01:07 -07:00
6c83ba762e
Merge branch 'master' into transactionControllerRefractorPt3
2017-09-06 13:45:03 -07:00
15c12ca4bb
add better comments
2017-09-05 21:50:36 -07:00
00bd5b143f
rename tx-utils.js -> tx-gas-utils.js
2017-09-05 20:33:50 -07:00
4c554f32ec
remove #buildEthTxFromParams
2017-09-05 20:13:43 -07:00
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
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
76de053b0b
Merge branch 'master' into inpage-provider-fixes
2017-08-28 11:29:47 -07:00
e294aa7e0d
inpage - lint fix
2017-08-28 10:41:01 -07:00
cc56d0d2f6
inpage - use json-rpc-engine for inpage-provider
2017-08-24 15:44:40 -07:00
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
c2624dd1a0
fall back to `latest` if blockNumber is null
2017-08-24 00:02:06 -07:00
0ad310e096
Fail transactions after a day of retries
2017-08-23 22:29:08 -07:00
c620123fab
Enforce nonces as type string
2017-08-23 21:50:28 -07:00
a122ec1f8b
Use toNumber method
2017-08-23 21:37:07 -07:00
55c1a259b1
Fix network nonce parsing
2017-08-23 21:14:46 -07:00
855f4eeacb
Pass nonce tests
2017-08-23 20:43:47 -07:00
04d40b114d
Got all tests but one passing
2017-08-23 20:11:37 -07:00
221575a191
Fix new test, break an older maybe wrong one
2017-08-23 20:04:03 -07:00
c4ab7a5779
Linted
2017-08-23 19:35:49 -07:00
1f0223d0a0
Simplify nonce calculation
2017-08-23 19:34:20 -07:00
4019f318fe
inpage provider - autoreload - improve readability
2017-08-23 16:44:57 -07:00
44dc2ba712
inpage provider - only warn web3 usage once per session
2017-08-23 16:26:55 -07:00
53e410167b
inpage provider - sync rpc - default to null values
2017-08-23 16:13:33 -07:00
b3b62d97a3
Merge branch 'master' into useLocalNonce
2017-08-23 11:12:46 -07:00
247965ebbe
nonce-tracker - more debugging numbers for nonceDetails
2017-08-22 15:34:30 -07:00
0a93b65a3d
remove unused code
2017-08-22 15:06:54 -07:00
fb2c6cc8ac
nonce-tracker - use ethjs-query
2017-08-22 14:33:54 -07:00
dc3e8d60ef
nonce-tracker - fix var name
2017-08-22 14:24:09 -07:00
6d596bd9e6
nonce-tracker - getlocalNextNonce - add entry to nonceDetails
2017-08-22 14:17:00 -07:00
a7e3dc8327
nonce-tracker - simplify _getlocalNextNonce
2017-08-22 14:15:56 -07:00
e43da3e4aa
nonce-tracker - simplify getHighestNonce
2017-08-22 14:04:31 -07:00
b191649ef5
nonce-tracker - getHighestNonce doesnt need uniqued input
2017-08-22 13:58:26 -07:00
98bc9b6656
nonce-tracker - make nonce strategy api and naming more symmetical
2017-08-22 13:52:15 -07:00
604c91f7b2
nonce-tracker - pass tests
2017-08-21 18:04:05 -07:00
7d34b22d78
clean up code
2017-08-21 17:04:47 -07:00
5c74f316a8
nonce-tracker - pass tests
2017-08-21 16:45:10 -07:00
fbba3a1ac8
Merge branch 'master' into transactionControllerRefractorPt3
2017-08-21 11:35:22 -07:00
7ea83b6bae
Create TxStateManager
2017-08-21 10:29:10 -07:00
1ffb406480
break out network nonce calc.
2017-08-18 16:05:21 -07:00
37f86e874f
fix 0x0 nonce calc.
2017-08-18 15:44:32 -07:00
f8eca95ca5
include pendingTxs in localNonce
2017-08-18 15:01:05 -07:00
e9712a13ec
Create tests for TxStateManager
2017-08-18 14:11:18 -07:00
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
1af797b1b3
tx controller - tx state history various small fixes
2017-08-14 19:15:36 -07:00
fdffb6fedc
introduce tx-state-history-helper and diff-based history
2017-08-14 18:46:04 -07:00
dbc539ac55
Merge remote-tracking branch 'mm/master' into NewUI-flat
2017-08-14 11:06:14 +02:00
66a012550e
fix wording
2017-08-11 15:54:52 -07:00
ac9e84ff40
add deprecation warning for web3
2017-08-11 15:52:03 -07:00
b4052cd5e6
tx utils - detect estimateGas err and set simulationFailed
2017-08-08 23:34:18 -07:00
0188e7b94d
Merge branch 'master' into NewUI-flat
2017-08-08 23:30:58 -07:00
5418813ed1
util - sufficientBalance - validate input
2017-08-08 21:05:59 -07:00
5bb84f6e21
fix getPendingTransactions function for pendingTxTracker
2017-08-08 21:49:48 -04:00
a13643bdb5
fix class names
2017-08-08 18:30:49 -04:00
59124eb6fd
remove logging of the message and log the error
2017-08-07 14:45:43 -04:00
fb9866b4e1
fix spelling
2017-08-07 14:37:20 -04:00
02c2106c3b
Merge branch 'master' into feat/mm-ui-5
2017-08-06 19:55:34 -07:00
89a4fef1e4
Merge branch 'master' into transactionControllerRefractor
2017-08-04 14:45:22 -04:00
087cd9fb1a
break out tx status pendding watchers
2017-08-04 14:41:35 -04:00
caee2a9e35
move util functions to util.js
2017-08-04 13:55:00 -04:00
c4cb371ce8
Merge pull request #1857 from MetaMask/hotFixCancleTx
...
fix cancelTransaction not receiving a callback
2017-08-03 21:01:13 -07:00
7de58c8709
fix cancelTransaction not reciving a callback
2017-08-03 21:22:08 -04:00
d4877cb4e2
blacklist - use module eth-phishing-detect
2017-08-03 14:25:02 -07:00
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
dd4586ee84
Adjust sidebar transition using @cjeria\'s feedback
2017-08-02 19:26:46 -07:00
61b4b1f947
Ensure app-header is rendered in responsive layout
2017-08-02 19:13:17 -07:00
340dbe75fc
use async with #publishTransaction
2017-08-02 19:09:37 -04:00
b80c7e417b
move newUnapprovedTransaction to transactions.js
2017-08-02 18:59:34 -04:00
8c6f01b910
blacklist controller - breakout from metamask and infura controllers
2017-08-02 15:54:59 -07:00
ecaa235b5e
phishing detection - move phishing detection into contentscript and metamask controller
2017-08-02 14:26:10 -07:00
aea5735b29
obj-multiplex - missing name error + prefer const over var
2017-08-02 14:25:28 -07:00
25bc15ba17
lint fixes
2017-08-02 11:47:13 -04:00
25cffd21f8
Merge branch 'master' into transactionControllerRefractor
2017-08-02 11:41:29 -04:00
3a4726018e
fix addTxDefaults
2017-08-02 11:35:35 -04:00
432f516ab0
make addUnapprovedTransaction async function and use promise based ethQuery
2017-08-02 10:26:25 -04:00
6675241fa9
Merge branch 'master' into i1805-LiveBlacklistUpdating
2017-07-26 16:46:59 -07:00
35a128db1e
nonce-tracker - hotfix for provider proxying
2017-07-26 11:37:00 -07:00
b15a2baaf3
nonce-tracker - add raw baseNonceHex to nonceDetails
2017-07-26 11:09:02 -07:00
0ef90fb1f0
tx controller + nonce tracker - record nonce components on txMeta
2017-07-26 10:40:08 -07:00
39d28922de
nonce-tracker - validation - add validation failing value type to error message
2017-07-26 10:16:08 -07:00
f16802e2d4
nonce-tracker - validation - add validation failing value to error message
2017-07-26 10:15:35 -07:00
ab01358a48
Add stack traces both in errors and as a way to track txMetas
2017-07-25 16:08:31 -04:00
12d6f21627
transactions - block nonce-tracker while updating pending transactions
2017-07-18 15:27:15 -07:00
aa48ed34c4
nonce-tracker - fix lock mechanism to be a real mutex
2017-07-18 15:11:29 -07:00
d249da77d7
nonce-tracker - return nonce as integer
2017-07-18 13:59:56 -07:00
frankiebee
Chi Kei Chan
Sergey Ukustov
kumavis
kumavis
Dan Finlay
Dan Finlay
sdtsui