indexer extension

packages/sushi/package.json

@@ -187,7 +187,7 @@
     "dev": "tsc -w",
     "generate": "tsx ./scripts/generate.ts",
     "prepublishOnly": "pnpm build",
-    "test": "vitest run -c ./test/vitest.config.ts",
+    "test": "vitest run -c ./test/vitest.config.ts --test-timeout 600000",
     "test:debug": "vitest --inspect-brk --no-threads run -c ./test/vitest.config.ts",
     "test:watch": "vitest dev -c ./test/vitest.config.ts"
   },

packages/sushi/src/router/data-fetcher.ts

@@ -7,7 +7,6 @@ import { BaseSwapProvider } from './liquidity-providers/BaseSwap.js'
 import { BiswapProvider } from './liquidity-providers/Biswap.js'
 import { BlastDEXProvider } from './liquidity-providers/BlastDEX.js'
 import { BlazeSwapProvider } from './liquidity-providers/BlazeSwap.js'
-import { CamelotProvider } from './liquidity-providers/Camelot.js'
 import { CurveProvider } from './liquidity-providers/CurveProvider.js'
 import { DfynProvider } from './liquidity-providers/Dfyn.js'
 import { DovishV3Provider } from './liquidity-providers/DovishV3.js'
@@ -160,7 +159,6 @@ export class DataFetcher {
       BiswapProvider,
       BlastDEXProvider,
       BlazeSwapProvider,
-      CamelotProvider,
       CurveProvider,
       DfynProvider,
       DovishV3Provider,

packages/sushi/src/router/index.ts

@@ -9,3 +9,4 @@ export * from './tines-to-route-processor-2.js'
 export * from './tines-to-route-processor-4.js'
 export * from './PoolBinarySerialization.js'
 export * from './Sankey.AnyChart.js'
+export * from './rain/rain-data-fetcher.js'

packages/sushi/src/router/liquidity-providers/ApeSwap.ts

@@ -1,9 +1,9 @@
 import { PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV2BaseProvider } from './UniswapV2Base.js'
 
-export class ApeSwapProvider extends UniswapV2BaseProvider {
+export class ApeSwapProvider extends RainUniswapV2BaseProvider {
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {
       [ChainId.ETHEREUM]: '0xBAe5dc9B19004883d0377419FeF3c2C8832d7d7B',

packages/sushi/src/router/liquidity-providers/BaseSwap.ts

@@ -1,9 +1,9 @@
 import { PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV2BaseProvider } from './UniswapV2Base.js'
 
-export class BaseSwapProvider extends UniswapV2BaseProvider {
+export class BaseSwapProvider extends RainUniswapV2BaseProvider {
   override fee = 0.0025
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {

packages/sushi/src/router/liquidity-providers/Biswap.ts

@@ -1,9 +1,9 @@
 import { PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV2BaseProvider } from './UniswapV2Base.js'
 
-export class BiswapProvider extends UniswapV2BaseProvider {
+export class BiswapProvider extends RainUniswapV2BaseProvider {
   override fee = 0.002
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {

packages/sushi/src/router/liquidity-providers/BlastDEX.ts

@@ -1,9 +1,9 @@
 import { PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV2BaseProvider } from './UniswapV2Base.js'
 
-export class BlastDEXProvider extends UniswapV2BaseProvider {
+export class BlastDEXProvider extends RainUniswapV2BaseProvider {
   override fee = 0.002
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {

packages/sushi/src/router/liquidity-providers/BlazeSwap.ts

@@ -1,9 +1,9 @@
 import { PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV2BaseProvider } from './UniswapV2Base.js'
 
-export class BlazeSwapProvider extends UniswapV2BaseProvider {
+export class BlazeSwapProvider extends RainUniswapV2BaseProvider {
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {
       [ChainId.FLARE]: '0x440602f459D7Dd500a74528003e6A20A46d6e2A6',

packages/sushi/src/router/liquidity-providers/Camelot.ts

@@ -3,8 +3,8 @@ import { ChainId } from '../../chain/index.js'
 import { DataFetcherOptions } from '../data-fetcher.js'
 import { memoizer } from '../memoizer.js'
 import { type PoolCode } from '../pool-codes/index.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV2BaseProvider } from './UniswapV2Base.js'
 
 type IsStableSwap =
   | (
@@ -22,7 +22,7 @@ type IsStableSwap =
     )[]
   | undefined
 
-export class CamelotProvider extends UniswapV2BaseProvider {
+export class CamelotProvider extends RainUniswapV2BaseProvider {
   // Camelot has a slightly different getReserves() abi
   // so needs to be overriden
   override getReservesAbi = parseAbi([
@@ -48,7 +48,7 @@ export class CamelotProvider extends UniswapV2BaseProvider {
   }
 
   override async getReserves(
-    poolCodesToCreate: PoolCode[],
+    poolCodesToCreate: Address[],
     options?: DataFetcherOptions,
   ): Promise<any> {
     const multicallMemoize = await memoizer.fn(this.client.multicall)
@@ -90,9 +90,9 @@ export class CamelotProvider extends UniswapV2BaseProvider {
       allowFailure: true,
       blockNumber: options?.blockNumber,
       contracts: poolCodesToCreate.map(
-        (poolCode) =>
+        (address) =>
           ({
-            address: poolCode.pool.address as Address,
+            address,
             chainId: this.chainId,
             abi: this.getReservesAbi,
             functionName: 'getReserves',
@@ -123,9 +123,9 @@ export class CamelotProvider extends UniswapV2BaseProvider {
       allowFailure: true,
       blockNumber: options?.blockNumber,
       contracts: poolCodesToCreate.map(
-        (poolCode) =>
+        (address) =>
           ({
-            address: poolCode.pool.address as Address,
+            address,
             chainId: this.chainId,
             abi: [
               {

packages/sushi/src/router/liquidity-providers/Dfyn.ts

@@ -1,9 +1,9 @@
 import { PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV2BaseProvider } from './UniswapV2Base.js'
 
-export class DfynProvider extends UniswapV2BaseProvider {
+export class DfynProvider extends RainUniswapV2BaseProvider {
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {
       [ChainId.POLYGON]: '0xE7Fb3e833eFE5F9c441105EB65Ef8b261266423B',

packages/sushi/src/router/liquidity-providers/DovishV3.ts

@@ -1,9 +1,9 @@
 import { PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
+import { RainUniswapV3BaseProvider } from '../rain/RainUniswapV3Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV3BaseProvider } from './UniswapV3Base.js'
 
-export class DovishV3Provider extends UniswapV3BaseProvider {
+export class DovishV3Provider extends RainUniswapV3BaseProvider {
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {
       [ChainId.POLYGON_ZKEVM]: '0xdE474Db1Fa59898BC91314328D29507AcD0D593c',

packages/sushi/src/router/liquidity-providers/DyorV2.ts

@@ -1,9 +1,9 @@
 import { PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV2BaseProvider } from './UniswapV2Base.js'
 
-export class DyorV2Provider extends UniswapV2BaseProvider {
+export class DyorV2Provider extends RainUniswapV2BaseProvider {
   override fee = 0.003
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {

packages/sushi/src/router/liquidity-providers/Elk.ts

@@ -1,9 +1,9 @@
 import { PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV2BaseProvider } from './UniswapV2Base.js'
 
-export class ElkProvider extends UniswapV2BaseProvider {
+export class ElkProvider extends RainUniswapV2BaseProvider {
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {
       [ChainId.AVALANCHE]: '0x091d35d7F63487909C863001ddCA481c6De47091',

packages/sushi/src/router/liquidity-providers/Enosys.ts

@@ -1,17 +1,17 @@
 import { getCreate2Address } from '@ethersproject/address'
 import { Address, PublicClient, encodePacked, keccak256 } from 'viem'
 import { ChainId } from '../../chain/index.js'
-
 import { Token } from '../../currency/Token.js'
 import { getCurrencyCombinations } from '../get-currency-combinations.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { StaticPool, UniswapV2BaseProvider } from './UniswapV2Base.js'
+import { StaticPool } from './UniswapV2Base.js'
 
 // Enosys has multiple initCodeHashes, so it is required to override the pool address
 // calculations methods to use all the available initCodeHashes to generate multiple
 // pool addresses for a pair and then the wrong ones will be filtered out automatically
 // on multicall, just the same as any other non existant calculated pool addresses
-export class EnosysProvider extends UniswapV2BaseProvider {
+export class EnosysProvider extends RainUniswapV2BaseProvider {
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {
       [ChainId.FLARE]: '0x28b70f6Ed97429E40FE9a9CD3EB8E86BCBA11dd4',
@@ -31,7 +31,7 @@ export class EnosysProvider extends UniswapV2BaseProvider {
     return 'Enosys'
   }
 
-  // same as _getPoolAddress() in UniswapV2BaseProvider, but instead of
+  // same as _getPoolAddress() in RainUniswapV2BaseProvider, but instead of
   // returning only 1 pool address, it returns array of calculated pool
   // addressses by using all available initCodeHashes
   _getPoolAddresses(t1: Token, t2: Token): Address[] {
@@ -51,7 +51,7 @@ export class EnosysProvider extends UniswapV2BaseProvider {
     )
   }
 
-  // same as original getStaticPools() in UniswapV2BaseProvider, but
+  // same as original getStaticPools() in RainUniswapV2BaseProvider, but
   // just overriden to do flatMap() to flatten array of pool addresses
   // per token pair, since there will be multiple calculated pool addresses
   // per token pair as a result of having multiple initCodeHashes

packages/sushi/src/router/liquidity-providers/GravityFinance.ts

@@ -1,9 +1,9 @@
 import { PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV2BaseProvider } from './UniswapV2Base.js'
 
-export class GravityFinanceProvider extends UniswapV2BaseProvider {
+export class GravityFinanceProvider extends RainUniswapV2BaseProvider {
   override fee = 0.0025
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {

packages/sushi/src/router/liquidity-providers/HoneySwap.ts

@@ -1,9 +1,9 @@
 import { PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV2BaseProvider } from './UniswapV2Base.js'
 
-export class HoneySwapProvider extends UniswapV2BaseProvider {
+export class HoneySwapProvider extends RainUniswapV2BaseProvider {
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {
       [ChainId.GNOSIS]: '0xA818b4F111Ccac7AA31D0BCc0806d64F2E0737D7',

packages/sushi/src/router/liquidity-providers/HyperBlast.ts

@@ -1,9 +1,9 @@
 import { PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV2BaseProvider } from './UniswapV2Base.js'
 
-export class HyperBlastProvider extends UniswapV2BaseProvider {
+export class HyperBlastProvider extends RainUniswapV2BaseProvider {
   override fee = 0.003
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {

packages/sushi/src/router/liquidity-providers/JetSwap.ts

@@ -1,9 +1,9 @@
 import { PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV2BaseProvider } from './UniswapV2Base.js'
 
-export class JetSwapProvider extends UniswapV2BaseProvider {
+export class JetSwapProvider extends RainUniswapV2BaseProvider {
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {
       [ChainId.POLYGON]: '0x668ad0ed2622C62E24f0d5ab6B6Ac1b9D2cD4AC7',

packages/sushi/src/router/liquidity-providers/KinetixV2.ts

@@ -1,9 +1,9 @@
 import { PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV2BaseProvider } from './UniswapV2Base.js'
 
-export class KinetixV2Provider extends UniswapV2BaseProvider {
+export class KinetixV2Provider extends RainUniswapV2BaseProvider {
   override fee = 0.003
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {

packages/sushi/src/router/liquidity-providers/KinetixV3.ts

@@ -1,9 +1,9 @@
 import { PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
+import { RainUniswapV3BaseProvider } from '../rain/RainUniswapV3Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV3BaseProvider } from './UniswapV3Base.js'
 
-export class KinetixV3Provider extends UniswapV3BaseProvider {
+export class KinetixV3Provider extends RainUniswapV3BaseProvider {
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {
       [ChainId.KAVA]: '0x2dBB6254231C5569B6A4313c6C1F5Fe1340b35C2',

packages/sushi/src/router/liquidity-providers/LaserSwap.ts

@@ -1,9 +1,9 @@
 import { Address, PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV2BaseProvider } from './UniswapV2Base.js'
 
-export class LaserSwapV2Provider extends UniswapV2BaseProvider {
+export class LaserSwapV2Provider extends RainUniswapV2BaseProvider {
   override fee = 0.0025
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {

packages/sushi/src/router/liquidity-providers/LiquidityProvider.ts

@@ -1,4 +1,4 @@
-import { PublicClient } from 'viem'
+import { Log, PublicClient } from 'viem'
 import { ChainId, chainShortName } from '../../chain/index.js'
 import type { Token } from '../../currency/index.js'
 import { DataFetcherOptions } from '../data-fetcher.js'
@@ -130,6 +130,10 @@ export abstract class LiquidityProvider {
     [t0.address.toLowerCase(), t1.address.toLowerCase()]
       .sort((first, second) => (first > second ? -1 : 1))
       .join(':')
+
+  // methods interface for event log handling
+  processLog(_log: Log) {}
+  async afterProcessLog(_untilBlock: bigint) {}
 }
 
 export const UniV2LiquidityProviders: LiquidityProviders[] = [

packages/sushi/src/router/liquidity-providers/LynexV1.ts

@@ -5,14 +5,15 @@ import { Token } from '../../currency/index.js'
 import { DataFetcherOptions } from '../data-fetcher.js'
 import { getCurrencyCombinations } from '../get-currency-combinations.js'
 import { memoizer } from '../memoizer.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { StaticPool, UniswapV2BaseProvider } from './UniswapV2Base.js'
+import { StaticPool } from './UniswapV2Base.js'
 
 const GetFeesAbi = parseAbi([
   'function getFee(bool _stable) public view returns(uint256)',
 ])
 
-export class LynexV1Provider extends UniswapV2BaseProvider {
+export class LynexV1Provider extends RainUniswapV2BaseProvider {
   STABLE_FEE = 0.0001
   VOLATILE_FEE = 0.0025
   constructor(chainId: ChainId, web3Client: PublicClient) {
@@ -115,7 +116,7 @@ export class LynexV1Provider extends UniswapV2BaseProvider {
     ]
   }
 
-  // same as original getStaticPools() in UniswapV2BaseProvider, but
+  // same as original getStaticPools() in RainUniswapV2BaseProvider, but
   // just overriden to do flatMap() to flatten array of pool addresses
   // per token pair, since LynexV1 also has bool variable in the pool address salt
   // also has 2 fees if the pair is `stable` or not

packages/sushi/src/router/liquidity-providers/LynexV2.ts

@@ -1,6 +1,6 @@
 import { PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
-import { AlgebraV1BaseProvider } from './AlgebraV1Base.js'
+import { AlgebraV1BaseProvider } from '../rain/AlgebraV1Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
 
 export class LynexV2Provider extends AlgebraV1BaseProvider {

packages/sushi/src/router/liquidity-providers/MSwap.ts

@@ -1,9 +1,9 @@
 import { PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV2BaseProvider } from './UniswapV2Base.js'
 
-export class MSwapProvider extends UniswapV2BaseProvider {
+export class MSwapProvider extends RainUniswapV2BaseProvider {
   override fee = 0.003
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {

packages/sushi/src/router/liquidity-providers/MonoSwapV2.ts

@@ -1,9 +1,9 @@
 import { PublicClient } from 'viem'
 import { ChainId } from '../../chain/index.js'
+import { RainUniswapV2BaseProvider } from '../rain/RainUniswapV2Base.js'
 import { LiquidityProviders } from './LiquidityProvider.js'
-import { UniswapV2BaseProvider } from './UniswapV2Base.js'
 
-export class MonoswapV2Provider extends UniswapV2BaseProvider {
+export class MonoswapV2Provider extends RainUniswapV2BaseProvider {
   override fee = 0.003
   constructor(chainId: ChainId, web3Client: PublicClient) {
     const factory = {