add fixes for factory

Idle-Labs · May 20, 2024 · 327180e · 327180e
1 parent 92790c2
commit 327180e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/src/dex/uniswap-v3/uniswap-v3-factory.ts b/src/dex/uniswap-v3/uniswap-v3-factory.ts
@@ -35,7 +35,7 @@ export class UniswapV3Factory extends StatefulEventSubscriber<FactoryState> {
     parentName: string,
     protected readonly factoryAddress: Address,
     logger: Logger,
-    protected readonly onPoolCreated: OnPoolCreatedCallback,
+    public readonly onPoolCreated: OnPoolCreatedCallback,
     mapKey: string = '',
   ) {
     super(

diff --git a/src/dex/uniswap-v3/uniswap-v3.ts b/src/dex/uniswap-v3/uniswap-v3.ts
@@ -150,18 +150,7 @@ export class UniswapV3
     this.notExistingPoolSetKey =
       `${CACHE_PREFIX}_${network}_${dexKey}_not_existings_pool_set`.toLowerCase();
 
-    const factoryImplementation =
-      this.config.factoryImplementation !== undefined
-        ? this.config.factoryImplementation
-        : UniswapV3Factory;
-
-    this.factory = new factoryImplementation(
-      dexHelper,
-      dexKey,
-      this.config.factory,
-      this.logger,
-      this.onPoolCreatedDeleteFromNonExistingSet,
-    );
+    this.factory = this.getFactoryInstance();
   }
 
   get supportedFees() {
@@ -401,6 +390,21 @@ export class UniswapV3
     );
   }
 
+  protected getFactoryInstance(): UniswapV3Factory {
+    const factoryImplementation =
+      this.config.factoryImplementation !== undefined
+        ? this.config.factoryImplementation
+        : UniswapV3Factory;
+
+    return new factoryImplementation(
+      this.dexHelper,
+      this.dexKey,
+      this.config.factory,
+      this.logger,
+      this.onPoolCreatedDeleteFromNonExistingSet.bind(this),
+    );
+  }
+
   async addMasterPool(poolKey: string, blockNumber: number): Promise<boolean> {
     const _pairs = await this.dexHelper.cache.hget(
       PoolsRegistryHashKey,