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