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
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
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
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
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
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
