feat: decouple blockListener and blockProcessor into a new blockManager

instance

apps/main-chain/src/amplifyClient.ts

@@ -5,5 +5,7 @@ const amplifyClient = new AmplifyClient(
   process.env.AWS_APPSYNC_KEY || '',
 );
 
+// @TODO stop exporting mutate and query like this because "this.methodName" loses context
 const { mutate, query } = amplifyClient;
 export { mutate, query };
+export default amplifyClient;

apps/main-chain/src/blockManager.ts

@@ -0,0 +1,8 @@
+import { BlockManager } from '@joincolony/blocks';
+import eventManager from '~eventManager';
+import rpcProvider from '~provider';
+import statsManager from '~statsManager';
+
+const blockManager = new BlockManager(eventManager, rpcProvider, statsManager);
+
+export default blockManager;

apps/main-chain/src/eventManager.ts

@@ -1,5 +1,6 @@
 import { EventManager } from '@joincolony/blocks';
+import rpcProvider from '~provider';
 
-const eventManager = new EventManager();
+const eventManager = new EventManager(rpcProvider);
 
 export default eventManager;

apps/main-chain/src/handlers/colonies/colonyAdded.ts

@@ -11,10 +11,10 @@ import {
 import { coloniesSet } from '~stats';
 import { ContractEvent, ContractEventsSignatures } from '~types';
 import {
-  updateStats,
   createColonyFounderInitialRoleEntry,
   getAllRoleEventsFromTransaction,
 } from '~utils';
+import statsManager from '~statsManager';
 import { getColonyContributorId } from '~utils/contributors';
 import { tryFetchGraphqlQuery } from '~utils/graphql';
 import { createUniqueColony } from './helpers/createUniqueColony';
@@ -50,8 +50,9 @@ export default async (event: ContractEvent): Promise<void> => {
   /*
    * Add it to the Set
    */
+  // @NOTE seems to not be working, is it borken on master too?
   coloniesSet.add(JSON.stringify({ colonyAddress, tokenAddress }));
-  await updateStats({ trackedColonies: coloniesSet.size });
+  await statsManager.updateStats({ trackedColonies: coloniesSet.size });
 
   output(
     'Found new Colony:',

apps/main-chain/src/handlers/expenditures/stagedPaymentReleased.ts

@@ -1,7 +1,6 @@
 import { utils } from 'ethers';
 import { ExtensionEventListener } from '~eventListeners';
 import { ColonyActionType } from '@joincolony/graphql';
-import { getInterfaceByListener } from '~interfaces';
 import rpcProvider from '~provider';
 import { ContractEventsSignatures, EventHandler } from '~types';
 import {
@@ -12,6 +11,7 @@ import {
   toNumber,
   writeActionFromEvent,
 } from '~utils';
+import eventManager from '~eventManager';
 
 export const handleStagedPaymentReleased: EventHandler = async (
   event,
@@ -47,7 +47,7 @@ export const handleStagedPaymentReleased: EventHandler = async (
     topics: [utils.id(ContractEventsSignatures.StagedPaymentReleased)],
   });
 
-  const iface = getInterfaceByListener(listener);
+  const iface = eventManager.getInterfaceByListener(listener);
   if (!iface) {
     return;
   }

apps/main-chain/src/index.ts

@@ -1,9 +1,10 @@
 import 'cross-fetch/polyfill';
 import { utils } from 'ethers';
 
-import { startBlockListener } from '~blockListener';
 import '~amplifyClient';
+import '~statsManager';
 import '~eventManager';
+import blockManager from '~blockManager';
 import { startStatsServer } from '~stats';
 import {
   setupListenersForColonies,
@@ -16,6 +17,7 @@ import { setupNotificationsClient } from '~utils/notifications';
 utils.Logger.setLogLevel(utils.Logger.levels.ERROR);
 
 const start = async (): Promise<void> => {
+  await rpcProvider.initialiseProvider();
   /**
    * Setup the notifications provider so that notifications can be sent when needed
    */
@@ -36,9 +38,7 @@ const start = async (): Promise<void> => {
   /**
    * Start the main block listener
    */
-  startBlockListener();
-
-  await rpcProvider.initialiseProvider();
+  blockManager.startBlockListener();
 
   /**
    * In development, where both the chain and the DB gets reset everytime,