@sentio/sdk 2.57.9-rc.3 → 2.57.9-rc.5

package/src/aptos/builtin/0x4.ts

@@ -4,7 +4,7 @@
 
 /* Generated types for 0x4, original address 0x4 */
 
-import { CallFilter, MoveFetchConfig } from "@sentio/sdk/move";
+import { CallFilter, MoveFetchConfig, EventFilter } from "@sentio/sdk/move";
 import {
   AptosBindOptions,
   AptosBaseProcessor,
@@ -45,16 +45,26 @@ export class token extends AptosBaseProcessor {
   onEventMutation(
     func: (event: token.MutationInstance, ctx: AptosContext) => void,
     fetchConfig?: Partial<MoveFetchConfig>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
   ): token {
-    this.onMoveEvent(func, { type: "token::Mutation" }, fetchConfig);
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "token::Mutation" },
+      fetchConfig,
+    );
     return this;
   }
 
   onEventMutationEvent(
     func: (event: token.MutationEventInstance, ctx: AptosContext) => void,
     fetchConfig?: Partial<MoveFetchConfig>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
   ): token {
-    this.onMoveEvent(func, { type: "token::MutationEvent" }, fetchConfig);
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "token::MutationEvent" },
+      fetchConfig,
+    );
     return this;
   }
 }
@@ -436,16 +446,26 @@ export class collection extends AptosBaseProcessor {
   onEventBurn(
     func: (event: collection.BurnInstance, ctx: AptosContext) => void,
     fetchConfig?: Partial<MoveFetchConfig>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
-    this.onMoveEvent(func, { type: "collection::Burn" }, fetchConfig);
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "collection::Burn" },
+      fetchConfig,
+    );
     return this;
   }
 
   onEventBurnEvent(
     func: (event: collection.BurnEventInstance, ctx: AptosContext) => void,
     fetchConfig?: Partial<MoveFetchConfig>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
-    this.onMoveEvent(func, { type: "collection::BurnEvent" }, fetchConfig);
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "collection::BurnEvent" },
+      fetchConfig,
+    );
     return this;
   }
 
@@ -455,10 +475,11 @@ export class collection extends AptosBaseProcessor {
       ctx: AptosContext,
     ) => void,
     fetchConfig?: Partial<MoveFetchConfig>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
       func,
-      { type: "collection::ConcurrentBurnEvent" },
+      { ...(eventFilter ?? {}), type: "collection::ConcurrentBurnEvent" },
       fetchConfig,
     );
     return this;
@@ -470,10 +491,11 @@ export class collection extends AptosBaseProcessor {
       ctx: AptosContext,
     ) => void,
     fetchConfig?: Partial<MoveFetchConfig>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
       func,
-      { type: "collection::ConcurrentMintEvent" },
+      { ...(eventFilter ?? {}), type: "collection::ConcurrentMintEvent" },
       fetchConfig,
     );
     return this;
@@ -482,40 +504,65 @@ export class collection extends AptosBaseProcessor {
   onEventMint(
     func: (event: collection.MintInstance, ctx: AptosContext) => void,
     fetchConfig?: Partial<MoveFetchConfig>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
-    this.onMoveEvent(func, { type: "collection::Mint" }, fetchConfig);
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "collection::Mint" },
+      fetchConfig,
+    );
     return this;
   }
 
   onEventMintEvent(
     func: (event: collection.MintEventInstance, ctx: AptosContext) => void,
     fetchConfig?: Partial<MoveFetchConfig>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
-    this.onMoveEvent(func, { type: "collection::MintEvent" }, fetchConfig);
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "collection::MintEvent" },
+      fetchConfig,
+    );
     return this;
   }
 
   onEventMutation(
     func: (event: collection.MutationInstance, ctx: AptosContext) => void,
     fetchConfig?: Partial<MoveFetchConfig>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
-    this.onMoveEvent(func, { type: "collection::Mutation" }, fetchConfig);
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "collection::Mutation" },
+      fetchConfig,
+    );
     return this;
   }
 
   onEventMutationEvent(
     func: (event: collection.MutationEventInstance, ctx: AptosContext) => void,
     fetchConfig?: Partial<MoveFetchConfig>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
-    this.onMoveEvent(func, { type: "collection::MutationEvent" }, fetchConfig);
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "collection::MutationEvent" },
+      fetchConfig,
+    );
     return this;
   }
 
   onEventSetMaxSupply(
     func: (event: collection.SetMaxSupplyInstance, ctx: AptosContext) => void,
     fetchConfig?: Partial<MoveFetchConfig>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
-    this.onMoveEvent(func, { type: "collection::SetMaxSupply" }, fetchConfig);
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "collection::SetMaxSupply" },
+      fetchConfig,
+    );
     return this;
   }
 }

package/src/bundle.config.ts

@@ -21,5 +21,5 @@ export default defineConfig({
   // dts: true,
   format: 'esm',
   keepNames: true,
-  external: [...external, /^@sentio\/(chain|runtime).*$/]
+  external: [...external, /^@sentio\/(chain|runtime).*$/, /^piscina.*$/]
 })

package/src/eth/abi-decoder/parse-log-worker.ts

@@ -0,0 +1,52 @@
+import { Interface, LogDescription, LogParams } from 'ethers'
+import { ServerError, Status } from 'nice-grpc'
+import Piscina from 'piscina'
+
+export interface ILogDescription {
+  topic: string
+  args: {
+    array?: any[]
+    keys: string[]
+  } | null
+}
+
+export function parseLog(contractViewInterface: any, log: LogParams): LogDescription | null {
+  if (!log) {
+    throw new ServerError(Status.INVALID_ARGUMENT, 'Log is empty')
+  }
+  const logParam = log as any as { topics: Array<string>; data: string }
+  return contractViewInterface.parseLog(logParam)
+}
+
+export default ({ log }: { log: LogParams }): ILogDescription | null => {
+  const fragments = Piscina['workerData']
+  const contractViewInterface = new Interface(fragments)
+  const result = parseLog(contractViewInterface, log)
+  if (!result) {
+    return null
+  }
+
+  // can't serialize LogDescription, so return args and topics only
+  if (result?.args == null) {
+    return {
+      args: null,
+      topic: result.topic
+    }
+  }
+
+  const argsObj = result?.args.toObject(true)
+  const argsArray: any[] = []
+  const keys: string[] = []
+  for (const [key, value] of Object.entries(argsObj)) {
+    keys.push(key)
+    argsArray.push(value)
+  }
+
+  return {
+    args: {
+      array: argsArray,
+      keys: keys
+    },
+    topic: result.topic
+  }
+}

package/src/eth/abi-decoder/parse-log.ts

@@ -0,0 +1,44 @@
+import Piscina from 'piscina'
+import { LogDescription, LogParams, Result } from 'ethers'
+import { GLOBAL_CONFIG } from '@sentio/runtime'
+import { parseLog } from './parse-log-worker.js'
+
+export default async (processor: any, log: LogParams) => {
+  const workers = GLOBAL_CONFIG.execution.ethAbiDecoderWorker
+  if (workers != null) {
+    let workerPool = processor._logWorkerPool
+    const contractView = processor.CreateBoundContractView()
+    const contractViewInterface = contractView.rawContract.interface
+    if (!workerPool) {
+      const fragments = contractViewInterface.fragments
+      const options: any = {
+        // hack fix for node:test with tsx
+        filename: new URL('./parse-log-worker.js', import.meta.url).href.replaceAll('/src/eth', '/lib/eth'),
+        workerData: fragments
+      }
+      if (workers > 0) {
+        // 0 for the Piscina default auto value
+        options.maxThreads = workers
+        options.minThreads = workers
+      }
+      // @ts-ignore typescript def for piscina is wrong?
+      workerPool = new Piscina(options)
+      processor._logWorkerPool = workerPool
+    }
+    const result = (await workerPool.run({ log })) as any
+    if (result) {
+      const fragment = contractViewInterface.getEvent(result.topic)
+
+      if (!fragment || fragment.anonymous) {
+        return null
+      }
+
+      return new LogDescription(fragment, result.topic, Result.fromItems(result.args?.array ?? [], result.args?.keys))
+    }
+    return null
+  } else {
+    const contractView = processor.CreateBoundContractView()
+    const contractViewInterface = contractView.rawContract.interface
+    return parseLog(contractViewInterface, log)
+  }
+}

package/src/eth/base-processor.ts

@@ -22,6 +22,7 @@ import { ListStateStorage } from '@sentio/runtime'
 import { EthChainId } from '@sentio/chain'
 import { getHandlerName, proxyHandlers, proxyProcessor } from '../utils/metrics.js'
 import { ALL_ADDRESS } from '../core/index.js'
+import parseLog from './abi-decoder/parse-log.js'
 
 export interface AddressOrTypeEventFilter extends DeferredTopicFilter {
   addressType?: AddressType
@@ -463,24 +464,9 @@ export abstract class BaseProcessor<
           contractView.address = log.address
         }
 
-        const ctx = new ContractContext<TContract, TBoundContractView>(
-          contractName,
-          contractView,
-          chainId,
-          data.timestamp,
-          block,
-          log,
-          undefined,
-          transaction,
-          transactionReceipt,
-          processor.config.baseLabels,
-          preparedData
-        )
-        const logParam = log as any as { topics: Array<string>; data: string }
-
         let parsed: LogDescription | null = null
         try {
-          parsed = contractView.rawContract.interface.parseLog(logParam)
+          parsed = await parseLog(processor, log)
         } catch (e) {
           // RangeError data out-of-bounds
           if (e instanceof Error) {
@@ -492,6 +478,19 @@ export abstract class BaseProcessor<
           throw e
         }
         if (parsed) {
+          const ctx = new ContractContext<TContract, TBoundContractView>(
+            contractName,
+            contractView,
+            chainId,
+            data.timestamp,
+            block,
+            log,
+            undefined,
+            transaction,
+            transactionReceipt,
+            processor.config.baseLabels,
+            preparedData
+          )
           const event: TypedEvent = { ...log, name: parsed.name, args: fixEmptyKey(parsed) }
           await handler(event, ctx)
           return ctx.stopAndGetResult()

package/src/move/shared-network-codegen.ts

@@ -113,8 +113,8 @@ export abstract class SharedNetworkCodegen<NetworkType, ModuleTypes, StructType>
     const source = `
 onEvent${struct.name}(func: (event: ${moduleName}.${normalizeToJSName(struct.name)}Instance, ctx: ${
       this.PREFIX
-    }Context) => void, fetchConfig?: Partial<MoveFetchConfig>): ${moduleName} {
-  this.onMoveEvent(func, { type: '${module.name}::${struct.name}' }, fetchConfig)
+    }Context) => void, fetchConfig?: Partial<MoveFetchConfig>, eventFilter?: Omit<EventFilter, "type"|"account">): ${moduleName} {
+  this.onMoveEvent(func, {...eventFilter ?? {}, type: '${module.name}::${struct.name}' }, fetchConfig)
   return this
 }`
     return source
@@ -122,7 +122,7 @@ onEvent${struct.name}(func: (event: ${moduleName}.${normalizeToJSName(struct.nam
 
   generateImports() {
     return `
-    import { CallFilter, MoveFetchConfig } from "@sentio/sdk/move"
+    import { CallFilter, MoveFetchConfig, EventFilter } from "@sentio/sdk/move"
     import {
       ${this.PREFIX}BindOptions, ${this.PREFIX}BaseProcessor,
       ${this.PREFIX}Network, TypedFunctionPayload,

package/src/sui/builtin/0x1.ts

@@ -35,7 +35,7 @@ import {
   transactionArgumentOrPureAddress,
 } from "@typemove/sui";
 
-import { CallFilter, MoveFetchConfig } from "@sentio/sdk/move";
+import { CallFilter, MoveFetchConfig, EventFilter } from "@sentio/sdk/move";
 import {
   SuiBindOptions,
   SuiBaseProcessor,
@@ -723,8 +723,13 @@ export class bit_vector extends SuiBaseProcessor {
   onEventBitVector(
     func: (event: bit_vector.BitVectorInstance, ctx: SuiContext) => void,
     fetchConfig?: Partial<MoveFetchConfig>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
   ): bit_vector {
-    this.onMoveEvent(func, { type: "bit_vector::BitVector" }, fetchConfig);
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "bit_vector::BitVector" },
+      fetchConfig,
+    );
     return this;
   }
 }
@@ -1057,10 +1062,11 @@ export class fixed_point32 extends SuiBaseProcessor {
   onEventFixedPoint32(
     func: (event: fixed_point32.FixedPoint32Instance, ctx: SuiContext) => void,
     fetchConfig?: Partial<MoveFetchConfig>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
   ): fixed_point32 {
     this.onMoveEvent(
       func,
-      { type: "fixed_point32::FixedPoint32" },
+      { ...(eventFilter ?? {}), type: "fixed_point32::FixedPoint32" },
       fetchConfig,
     );
     return this;
@@ -1993,8 +1999,13 @@ export class string$ extends SuiBaseProcessor {
   onEventString(
     func: (event: string$.StringInstance, ctx: SuiContext) => void,
     fetchConfig?: Partial<MoveFetchConfig>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
   ): string$ {
-    this.onMoveEvent(func, { type: "string::String" }, fetchConfig);
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "string::String" },
+      fetchConfig,
+    );
     return this;
   }
 }
@@ -2494,8 +2505,13 @@ export class type_name extends SuiBaseProcessor {
   onEventTypeName(
     func: (event: type_name.TypeNameInstance, ctx: SuiContext) => void,
     fetchConfig?: Partial<MoveFetchConfig>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
   ): type_name {
-    this.onMoveEvent(func, { type: "type_name::TypeName" }, fetchConfig);
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "type_name::TypeName" },
+      fetchConfig,
+    );
     return this;
   }
 }
@@ -4558,8 +4574,13 @@ export class uq32_32 extends SuiBaseProcessor {
   onEventUQ32_32(
     func: (event: uq32_32.UQ32_32Instance, ctx: SuiContext) => void,
     fetchConfig?: Partial<MoveFetchConfig>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
   ): uq32_32 {
-    this.onMoveEvent(func, { type: "uq32_32::UQ32_32" }, fetchConfig);
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "uq32_32::UQ32_32" },
+      fetchConfig,
+    );
     return this;
   }
 }
@@ -5067,8 +5088,13 @@ export class uq64_64 extends SuiBaseProcessor {
   onEventUQ64_64(
     func: (event: uq64_64.UQ64_64Instance, ctx: SuiContext) => void,
     fetchConfig?: Partial<MoveFetchConfig>,
+    eventFilter?: Omit<EventFilter, "type" | "account">,
   ): uq64_64 {
-    this.onMoveEvent(func, { type: "uq64_64::UQ64_64" }, fetchConfig);
+    this.onMoveEvent(
+      func,
+      { ...(eventFilter ?? {}), type: "uq64_64::UQ64_64" },
+      fetchConfig,
+    );
     return this;
   }
 }