solve merge conflicts

paraswap · Dec 9, 2024 · fcdb964 · fcdb964
2 parents 15f9767 + 27b3526
commit fcdb964
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 0 deletions.
diff --git a/src/dex/pancakeswap-v3/pancakeswap-v3-pool.ts b/src/dex/pancakeswap-v3/pancakeswap-v3-pool.ts
@@ -250,6 +250,36 @@ export class PancakeSwapV3EventPool extends StatefulEventSubscriber<PoolState> {
     return TICK_BITMAP_TO_USE + TICK_BITMAP_BUFFER;
   }
 
+  async getOrGenerateState(
+    blockNumber: number,
+  ): Promise<DeepReadonly<PoolState> | null> {
+    const state = this.getState(blockNumber);
+    if (state) {
+      return state;
+    }
+
+    this.logger.error(
+      `PancakeV3: No state found for ${this.name} ${this.addressesSubscribed[0]}, generating new one`,
+    );
+    try {
+      const newState = await this.generateState(blockNumber);
+
+      if (!newState) {
+        this.logger.error(
+          `PancakeV3: Could not generate state for ${this.name} ${this.addressesSubscribed[0]}`,
+        );
+        return null;
+      }
+      this.setState(newState, blockNumber);
+      return newState;
+    } catch (error) {
+      this.logger.error(
+        `PancakeV3: Failed to generate state for ${this.name} ${this.addressesSubscribed[0]}`,
+      );
+      return null;
+    }
+  }
+
   async generateState(blockNumber: number): Promise<Readonly<PoolState>> {
     const callData = this._getStateRequestCallData();
 

diff --git a/src/dex/pancakeswap-v3/pancakeswap-v3.ts b/src/dex/pancakeswap-v3/pancakeswap-v3.ts
@@ -613,6 +613,10 @@ export class PancakeswapV3
 
       if (selectedPools.length === 0) return null;
 
+      await Promise.all(
+        selectedPools.map(pool => pool.getOrGenerateState(blockNumber)),
+      );
+
       const poolsToUse = selectedPools.reduce(
         (acc, pool) => {
           let state = pool.getState(blockNumber);
@@ -632,6 +636,12 @@ export class PancakeswapV3
         },
       );
 
+      poolsToUse.poolWithoutState.forEach(pool => {
+        this.logger.warn(
+          `PancakeV3: Pool ${pool.name} on ${this.dexKey} has no state. Fallback to rpc`,
+        );
+      });
+
       const rpcResultsPromise = this.getPricingFromRpc(
         _srcToken,
         _destToken,

diff --git a/src/dex/uniswap-v3/uniswap-v3-pool.ts b/src/dex/uniswap-v3/uniswap-v3-pool.ts
@@ -254,6 +254,36 @@ export class UniswapV3EventPool extends StatefulEventSubscriber<PoolState> {
     return TICK_BITMAP_TO_USE + TICK_BITMAP_BUFFER;
   }
 
+  async getOrGenerateState(
+    blockNumber: number,
+  ): Promise<DeepReadonly<PoolState> | null> {
+    const state = this.getState(blockNumber);
+    if (state) {
+      return state;
+    }
+
+    this.logger.error(
+      `UniV3: No state found for ${this.name} ${this.addressesSubscribed[0]}, generating new one`,
+    );
+    try {
+      const newState = await this.generateState(blockNumber);
+
+      if (!newState) {
+        this.logger.error(
+          `UniV3: Could not generate state for ${this.name} ${this.addressesSubscribed[0]}`,
+        );
+        return null;
+      }
+      this.setState(newState, blockNumber);
+      return newState;
+    } catch (error) {
+      this.logger.error(
+        `UniV3: Failed to generate state for ${this.name} ${this.addressesSubscribed[0]}`,
+      );
+      return null;
+    }
+  }
+
   async generateState(blockNumber: number): Promise<Readonly<PoolState>> {
     const callData = this._getStateRequestCallData();
 
@@ -524,4 +554,24 @@ export class UniswapV3EventPool extends StatefulEventSubscriber<PoolState> {
       this.poolInitCodeHash,
     );
   }
+
+  // todo: remove
+  // nullify the state for specific pool for testing purposes
+  async update(
+    logs: Readonly<Log>[],
+    blockHeaders: Readonly<{ [p: number]: Readonly<BlockHeader> }>,
+  ) {
+    // USDT - WETH Mainnet UniswapV3 Pool
+    if (this.poolAddress === '0x11b815efb8f581194ae79006d24e0d814b7697f6') {
+      const blockNumbers = logs.map(log => log.blockNumber);
+      this.logger.info(
+        `Invalidating state for pool ${
+          this.poolAddress
+        } at blocks ${blockNumbers.join(', ')}`,
+      );
+      this.invalidate();
+    } else {
+      await super.update(logs, blockHeaders);
+    }
+  }
 }
diff --git a/src/dex/uniswap-v3/uniswap-v3.ts b/src/dex/uniswap-v3/uniswap-v3.ts
@@ -715,13 +715,18 @@ export class UniswapV3
 
       if (selectedPools.length === 0) return null;
 
+      await Promise.all(
+        selectedPools.map(pool => pool.getOrGenerateState(blockNumber)),
+      );
+
       const poolsToUse = selectedPools.reduce(
         (acc, pool) => {
           let state = pool.getState(blockNumber);
           if (state === null) {
             this.logger.trace(
               `${this.dexKey}: State === null. Fallback to rpc ${pool.name}`,
             );
+            // as we generate state (if nullified) in previous Promise.all, here should only be pools with failed initialization
             acc.poolWithoutState.push(pool);
           } else {
             acc.poolWithState.push(pool);
@@ -734,6 +739,12 @@ export class UniswapV3
         },
       );
 
+      poolsToUse.poolWithoutState.forEach(pool => {
+        this.logger.warn(
+          `UniV3: Pool ${pool.name} on ${this.dexKey} has no state. Fallback to rpc`,
+        );
+      });
+
       const states = poolsToUse.poolWithState.map(
         p => p.getState(blockNumber)!,
       );