aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2018-01-31 06:01:28 +0800
committerfrankiebee <frankie.diamond@gmail.com>2018-01-31 06:07:32 +0800
commitf13ad6bd6a3b57851e20b6abe2715ef3dacc1e66 (patch)
tree91a43508bab8d483dce3223b1bc10d500380c64d
parent5f2d8eb5d2923b5b5658a49aafe5f36ccdf408c8 (diff)
downloadtangerine-wallet-browser-f13ad6bd6a3b57851e20b6abe2715ef3dacc1e66.tar
tangerine-wallet-browser-f13ad6bd6a3b57851e20b6abe2715ef3dacc1e66.tar.gz
tangerine-wallet-browser-f13ad6bd6a3b57851e20b6abe2715ef3dacc1e66.tar.bz2
tangerine-wallet-browser-f13ad6bd6a3b57851e20b6abe2715ef3dacc1e66.tar.lz
tangerine-wallet-browser-f13ad6bd6a3b57851e20b6abe2715ef3dacc1e66.tar.xz
tangerine-wallet-browser-f13ad6bd6a3b57851e20b6abe2715ef3dacc1e66.tar.zst
tangerine-wallet-browser-f13ad6bd6a3b57851e20b6abe2715ef3dacc1e66.zip
remove BlacklistController from disk state
-rw-r--r--app/scripts/metamask-controller.js7
-rw-r--r--app/scripts/migrations/index.js1
2 files changed, 2 insertions, 6 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 672ec7403..adc681f6f 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -86,9 +86,7 @@ module.exports = class MetamaskController extends EventEmitter {
})
this.infuraController.scheduleInfuraNetworkCheck()
- this.blacklistController = new BlacklistController({
- initState: initState.BlacklistController,
- })
+ this.blacklistController = new BlacklistController()
this.blacklistController.scheduleUpdates()
// rpc provider
@@ -200,9 +198,6 @@ module.exports = class MetamaskController extends EventEmitter {
this.networkController.store.subscribe((state) => {
this.store.updateState({ NetworkController: state })
})
- this.blacklistController.store.subscribe((state) => {
- this.store.updateState({ BlacklistController: state })
- })
this.recentBlocksController.store.subscribe((state) => {
this.store.updateState({ RecentBlocks: state })
})
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index 9d0631042..a0cf5f4d4 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -31,4 +31,5 @@ module.exports = [
require('./018'),
require('./019'),
require('./020'),
+ require('./021'),
]