Aggressively backfill the block history controller

src/BlockHistoryController.ts

@@ -87,6 +87,7 @@ export class BlockHistoryController extends BaseController<BlockHistoryState, Bl
 	private internalBlockTracker: any;
 
 	private backfill() {
+		this.backfilled = false;
 		this.internalBlockTracker &&
 			this.internalBlockTracker.once('block', async (block: Block) => {
 				const currentBlockNumber = Number.parseInt(block.number, 16);
@@ -180,7 +181,7 @@ export class BlockHistoryController extends BaseController<BlockHistoryState, Bl
 		this.internalBlockTracker && this.internalBlockTracker.removeAllListeners();
 		this.internalBlockTracker = blockTracker;
 		this.internalBlockTracker.on('block', this.onBlock.bind(this));
-		!this.backfilled && this.backfill();
+		this.backfill();
 	}
 
 	/**
@@ -190,6 +191,7 @@ export class BlockHistoryController extends BaseController<BlockHistoryState, Bl
 	 */
 	set provider(provider: any) {
 		this.ethQuery = new EthQuery(provider);
+		this.backfill();
 	}
 }
 

src/NetworkController.ts

@@ -79,6 +79,12 @@ export class NetworkController extends BaseController<NetworkState, NetworkConfi
 		this.lookupNetwork();
 	}
 
+	private registerProvider() {
+		this.provider.on('block', this.verifyNetwork.bind(this));
+		this.provider.on('error', this.verifyNetwork.bind(this));
+		this.ethQuery = new EthQuery(this.provider);
+	}
+
 	private setupInfuraProvider(type: NetworkType) {
 		const infuraProvider = createInfuraProvider({ network: type });
 		const infuraSubprovider = new Subprovider(infuraProvider);
@@ -109,6 +115,7 @@ export class NetworkController extends BaseController<NetworkState, NetworkConfi
 	private updateProvider(provider: any) {
 		this.provider && this.provider.stop();
 		this.provider = provider;
+		this.registerProvider();
 	}
 
 	private verifyNetwork() {
@@ -144,9 +151,7 @@ export class NetworkController extends BaseController<NetworkState, NetworkConfi
 		this.internalProviderConfig = providerConfig;
 		const { type, rpcTarget } = this.state.provider;
 		this.initializeProvider(type, rpcTarget);
-		this.provider.on('block', this.verifyNetwork.bind(this));
-		this.provider.on('error', this.verifyNetwork.bind(this));
-		this.ethQuery = new EthQuery(this.provider);
+		this.registerProvider();
 		this.lookupNetwork();
 	}