@sentio/sdk 2.60.2-rc.2 → 2.60.3-rc.1

package/src/core/handler-register.ts

@@ -10,49 +10,16 @@ interface HandlerEntry {
   chainId: ChainId | string
 }
 
-const chainToNumber: Map<string, number> = new Map()
-const numberToChain: Map<number, string> = new Map()
-
-const generateHash = (s: string) => {
-  let hash = 0
-  for (const char of s) {
-    hash = (hash << 5) - hash + char.charCodeAt(0)
-    hash |= 0 // Constrain to 32bit integer
-  }
-  return Math.abs(hash)
-}
-
-for (const chainId of Object.values(ChainId)) {
-  let num = parseInt(chainId)
-  if (isNaN(num)) {
-    // If the chainId is not a number, generate a hash
-    num = generateHash(chainId)
-  }
-
-  if (numberToChain.has(num)) {
-    // If the number is already used for another chain, throw an error, this should not happen
-    throw new Error(`Chain ID ${chainId}'s number ${num} conflicts with existing chain ID ${numberToChain.get(num)}`)
-  }
-  chainToNumber.set(chainId, num)
-  numberToChain.set(num, chainId)
-}
-
-const MAX_HANDLER_PER_CHAIN = 1000000 // Maximum handlers per chain
-
 export class HandlerRegister {
-  private handlerByChain: Map<number, HandlerEntry[]> = new Map()
-  private handlers: Map<number, HandlerEntry> = new Map()
+  private handlerByChain: Map<ChainId | string, HandlerEntry[]> = new Map()
 
   /**
    * Register a handler function with chain ID and handle type
    * @returns handler ID
    */
   register(handler: HandlerFunction, chainId: ChainId | string): number {
-    const chainNum = chainToNumber.get(chainId) || 0
-    const entries = this.handlerByChain.get(chainNum) || []
-
-    const len = entries.length
-    const id = chainNum * MAX_HANDLER_PER_CHAIN + len + 1
+    const entries = this.handlerByChain.get(chainId) || []
+    const id = entries.length
 
     const entry: HandlerEntry = {
       id,
@@ -60,38 +27,26 @@ export class HandlerRegister {
       chainId
     }
     entries.push(entry)
-    this.handlerByChain.set(chainNum, entries)
-    this.handlers.set(id, entry)
-
+    this.handlerByChain.set(chainId, entries)
     return id
   }
 
   /**
    * Get handler function by ID
    */
-  getHandlerById(id: number): HandlerFunction {
-    const entry = this.handlers.get(id)
-    if (!entry) {
+  getHandlerById(chainId: ChainId | string, id: number): HandlerFunction {
+    const entries = this.handlerByChain.get(chainId)
+    if (!entries || id < 0 || id >= entries.length) {
       throw new ServerError(Status.INTERNAL, `Handler with ID ${id} not found.`)
     }
-    return entry.handler
+    return entries[id].handler
   }
 
   clear(chainId?: ChainId): void {
     if (chainId) {
-      const chainNum = chainToNumber.get(chainId)
-      if (chainNum !== undefined) {
-        const chainHandlers = this.handlerByChain.get(chainNum)
-        if (chainHandlers) {
-          for (const entry of chainHandlers) {
-            this.handlers.delete(entry.id)
-          }
-        }
-        this.handlerByChain.delete(chainNum)
-      }
+      this.handlerByChain.delete(chainId)
     } else {
       this.handlerByChain.clear()
-      this.handlers.clear()
     }
   }
 }

package/src/cosmos/cosmos-plugin.ts

@@ -86,7 +86,10 @@ export class CosmosPlugin extends Plugin {
 
     for (const handlerId of binding.handlerIds) {
       const promise = this.handlerRegister
-        .getHandlerById(handlerId)(call)
+        .getHandlerById(
+          binding.chainId,
+          handlerId
+        )(call)
         .catch((e) => {
           throw new ServerError(
             Status.INTERNAL,

package/src/eth/eth-plugin.ts

@@ -417,7 +417,7 @@ export class EthPlugin extends Plugin {
 
     const promises: Promise<ProcessResult>[] = []
     for (const handlerId of request.handlerIds) {
-      const handler = this.handlerRegister.getHandlerById(handlerId)
+      const handler = this.handlerRegister.getHandlerById(request.chainId, handlerId)
       const promise = handler(ethLog, preparedData).catch((e: any) => {
         console.error('error processing log: ', e)
         throw new ServerError(
@@ -443,7 +443,7 @@ export class EthPlugin extends Plugin {
 
     for (const handlerId of binding.handlerIds) {
       const promise = this.handlerRegister
-        .getHandlerById(handlerId)(ethTrace, preparedData)
+        .getHandlerById(binding.chainId, handlerId)(ethTrace, preparedData)
         .catch((e: any) => {
           console.error('error processing trace: ', e)
           throw new ServerError(
@@ -468,7 +468,7 @@ export class EthPlugin extends Plugin {
     const promises: Promise<ProcessResult>[] = []
     for (const handlerId of binding.handlerIds) {
       const promise = this.handlerRegister
-        .getHandlerById(handlerId)(ethBlock, preparedData)
+        .getHandlerById(binding.chainId, handlerId)(ethBlock, preparedData)
         .catch((e: any) => {
           console.error('error processing block: ', e)
           throw new ServerError(
@@ -494,7 +494,7 @@ export class EthPlugin extends Plugin {
 
     for (const handlerId of binding.handlerIds) {
       const promise = this.handlerRegister
-        .getHandlerById(handlerId)(ethTransaction, preparedData)
+        .getHandlerById(binding.chainId, handlerId)(ethTransaction, preparedData)
         .catch((e: any) => {
           throw new ServerError(
             Status.INTERNAL,

package/src/fuel/fuel-plugin.ts

@@ -206,7 +206,10 @@ export class FuelPlugin extends Plugin {
 
     for (const handlerId of binding.handlerIds) {
       const promise = this.handlerRegister
-        .getHandlerById(handlerId)(receipt)
+        .getHandlerById(
+          binding.chainId,
+          handlerId
+        )(receipt)
         .catch((e: any) => {
           throw new ServerError(
             Status.INTERNAL,
@@ -231,7 +234,10 @@ export class FuelPlugin extends Plugin {
 
     for (const handlerId of binding.handlerIds) {
       const promise = this.handlerRegister
-        .getHandlerById(handlerId)(fuelTransaction)
+        .getHandlerById(
+          binding.chainId,
+          handlerId
+        )(fuelTransaction)
         .catch((e: any) => {
           throw new ServerError(
             Status.INTERNAL,
@@ -255,7 +261,10 @@ export class FuelPlugin extends Plugin {
     const promises: Promise<ProcessResult>[] = []
     for (const handlerId of binding.handlerIds) {
       const promise = this.handlerRegister
-        .getHandlerById(handlerId)(ethBlock)
+        .getHandlerById(
+          binding.chainId,
+          handlerId
+        )(ethBlock)
         .catch((e: any) => {
           console.error('error processing block: ', e)
           throw new ServerError(

package/src/stark/starknet-plugin.ts

@@ -94,7 +94,10 @@ export class StarknetPlugin extends Plugin {
 
     for (const handlerId of binding.handlerIds) {
       const promise = this.handlerRegister
-        .getHandlerById(handlerId)(binding.data?.starknetEvents)
+        .getHandlerById(
+          binding.chainId,
+          handlerId
+        )(binding.data?.starknetEvents)
         .catch((e: any) => {
           throw new ServerError(
             Status.INTERNAL,

package/src/sui/sui-plugin.ts

@@ -114,7 +114,10 @@ export class SuiPlugin extends Plugin {
     for (const handlerId of binding.handlerIds) {
       promises.push(
         this.handlerRegister
-          .getHandlerById(handlerId)(event)
+          .getHandlerById(
+            binding.chainId,
+            handlerId
+          )(event)
           .catch((e: any) => {
             throw new ServerError(
               Status.INTERNAL,
@@ -135,7 +138,10 @@ export class SuiPlugin extends Plugin {
     const promises: Promise<ProcessResult>[] = []
     for (const handlerId of binding.handlerIds) {
       const promise = this.handlerRegister
-        .getHandlerById(handlerId)(call)
+        .getHandlerById(
+          binding.chainId,
+          handlerId
+        )(call)
         .catch((e: any) => {
           throw new ServerError(
             Status.INTERNAL,
@@ -157,7 +163,10 @@ export class SuiPlugin extends Plugin {
     for (const handlerId of binding.handlerIds) {
       promises.push(
         this.handlerRegister
-          .getHandlerById(handlerId)(object)
+          .getHandlerById(
+            binding.chainId,
+            handlerId
+          )(object)
           .catch((e: any) => {
             throw new ServerError(
               Status.INTERNAL,
@@ -179,7 +188,10 @@ export class SuiPlugin extends Plugin {
     for (const handlerId of binding.handlerIds) {
       promises.push(
         this.handlerRegister
-          .getHandlerById(handlerId)(objectChange)
+          .getHandlerById(
+            binding.chainId,
+            handlerId
+          )(objectChange)
           .catch((e: any) => {
             throw new ServerError(
               Status.INTERNAL,

package/src/testing/aptos-facet.ts

@@ -47,7 +47,8 @@ export class AptosFacet {
                 }
               },
               handlerIds: [callConfig.handlerId],
-              handlerType: HandlerType.APT_CALL
+              handlerType: HandlerType.APT_CALL,
+              chainId: network
             }
           }
         }
@@ -89,7 +90,8 @@ export class AptosFacet {
                   }
                 },
                 handlerIds: [eventConfig.handlerId],
-                handlerType: HandlerType.APT_EVENT
+                handlerType: HandlerType.APT_EVENT,
+                chainId: network
               }
             }
           }

package/src/testing/btc-facet.ts

@@ -35,7 +35,8 @@ export class BTCFacet {
             btcTransaction: data
           },
           handlerIds: [txConfig.handlerId],
-          handlerType: HandlerType.BTC_TRANSACTION
+          handlerType: HandlerType.BTC_TRANSACTION,
+          chainId: network
         } as DataBinding
         res.push(binding)
       }

package/src/testing/cosmos-facet.ts

@@ -36,7 +36,8 @@ export class CosmosFacet {
             }
           },
           handlerIds: [logConfig.handlerId],
-          handlerType: HandlerType.COSMOS_CALL
+          handlerType: HandlerType.COSMOS_CALL,
+          chainId: network
         }
 
         const logFilters = logConfig.logFilters

package/src/testing/eth-facet.ts

@@ -56,7 +56,8 @@ export class EthFacet {
               }
             },
             handlerIds: [config.handlerId],
-            handlerType: HandlerType.ETH_TRACE
+            handlerType: HandlerType.ETH_TRACE,
+            chainId: network
           }
         }
       }
@@ -120,7 +121,8 @@ export class EthFacet {
                 ethLog: { log, timestamp: new Date(), rawLog: JSON.stringify(log) }
               },
               handlerIds: [config.handlerId],
-              handlerType: HandlerType.ETH_LOG
+              handlerType: HandlerType.ETH_LOG,
+              chainId: network
             }
           }
         }
@@ -193,7 +195,8 @@ export class EthFacet {
                 ethLog: { log, timestamp: new Date(), rawLog: JSON.stringify(log) }
               },
               handlerIds: [config.handlerId],
-              handlerType: HandlerType.ETH_LOG
+              handlerType: HandlerType.ETH_LOG,
+              chainId: network
             }
           }
         }
@@ -232,7 +235,8 @@ export class EthFacet {
         ethBlock: { block }
       },
       handlerType: HandlerType.ETH_BLOCK,
-      handlerIds: []
+      handlerIds: [],
+      chainId: network
     }
     for (const contract of this.server.contractConfigs) {
       if (contract.contract?.chainId !== network) {
@@ -283,7 +287,8 @@ export class EthFacet {
         ethTransaction: { transaction, timestamp: new Date(), rawTransaction: JSON.stringify(transaction) }
       },
       handlerType: HandlerType.ETH_TRANSACTION,
-      handlerIds: []
+      handlerIds: [],
+      chainId: network
     }
     for (const contract of this.server.contractConfigs) {
       if (contract.contract?.chainId !== network) {

package/src/testing/fuel-facet.ts

@@ -55,7 +55,8 @@ export class FuelFacet {
             }
           },
           handlerIds: [callConfig.handlerId],
-          handlerType: HandlerType.FUEL_TRANSACTION
+          handlerType: HandlerType.FUEL_TRANSACTION,
+          chainId: network
         }
 
         res.push(binding)
@@ -70,7 +71,8 @@ export class FuelFacet {
             }
           },
           handlerIds: [assetConfig.handlerId],
-          handlerType: HandlerType.FUEL_TRANSACTION
+          handlerType: HandlerType.FUEL_TRANSACTION,
+          chainId: network
         }
 
         res.push(binding)
@@ -98,7 +100,8 @@ export class FuelFacet {
                 }
               },
               handlerIds: [logConfig.handlerId],
-              handlerType: HandlerType.FUEL_RECEIPT
+              handlerType: HandlerType.FUEL_RECEIPT,
+              chainId: network
             }
             res.push(binding)
           }

package/src/testing/iota-facet.ts

@@ -56,7 +56,8 @@ export class IotaFacet {
                   }
                 },
                 handlerIds: [callConfig.handlerId],
-                handlerType: HandlerType.SUI_CALL
+                handlerType: HandlerType.SUI_CALL,
+                chainId: network
               }
             }
           }
@@ -99,7 +100,8 @@ export class IotaFacet {
           timestamp: transaction.timestampMs ? new Date(transaction.timestampMs) : new Date(),
           slot: BigInt(transaction.checkpoint || 0)
         }
-      }
+      },
+      chainId: network
     }
     return this.server.processBinding(binding)
   }
@@ -131,7 +133,8 @@ export class IotaFacet {
                   }
                 },
                 handlerIds: [eventConfig.handlerId],
-                handlerType: HandlerType.SUI_EVENT
+                handlerType: HandlerType.SUI_EVENT,
+                chainId: network
               }
             }
           }

package/src/testing/solana-facet.ts

@@ -1,5 +1,6 @@
 import { TestProcessorServer } from './test-processor-server.js'
 import { Data_SolInstruction, HandlerType, ProcessBindingResponse } from '@sentio/protos'
+import { ChainId } from '@sentio/chain'
 
 export class SolanaFacet {
   server: TestProcessorServer
@@ -14,12 +15,13 @@ export class SolanaFacet {
         return {
           data: {
             raw: new Uint8Array(),
-            solInstruction: instruction,
+            solInstruction: instruction
           },
           handlerIds: [],
           handlerType: HandlerType.SOL_INSTRUCTION,
+          chainId: ChainId.SOLANA_MAINNET
         }
-      }),
+      })
     })
   }
 }

package/src/testing/starknet-facet.ts

@@ -38,7 +38,8 @@ export class StarknetFacet {
               }
             },
             handlerIds: [logConfig.handlerId],
-            handlerType: HandlerType.STARKNET_EVENT
+            handlerType: HandlerType.STARKNET_EVENT,
+            chainId: config.contract.chainId
           }
 
           const logFilters = logConfig.filters

package/src/testing/sui-facet.ts

@@ -56,7 +56,8 @@ export class SuiFacet {
                   }
                 },
                 handlerIds: [callConfig.handlerId],
-                handlerType: HandlerType.SUI_CALL
+                handlerType: HandlerType.SUI_CALL,
+                chainId: network
               }
             }
           }
@@ -99,7 +100,8 @@ export class SuiFacet {
           timestamp: transaction.timestampMs ? new Date(transaction.timestampMs) : new Date(),
           slot: BigInt(transaction.checkpoint || 0)
         }
-      }
+      },
+      chainId: network
     }
     return this.server.processBinding(binding)
   }
@@ -131,7 +133,8 @@ export class SuiFacet {
                   }
                 },
                 handlerIds: [eventConfig.handlerId],
-                handlerType: HandlerType.SUI_EVENT
+                handlerType: HandlerType.SUI_EVENT,
+                chainId: network
               }
             }
           }