@sentio/sdk 2.59.0-rc.22 → 2.59.0-rc.24

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

@@ -10,6 +10,7 @@ import {
   AptosBaseProcessor,
   AptosNetwork,
   TypedFunctionPayload,
+  HandlerOptions,
   AptosContext,
 } from "@sentio/sdk/aptos";
 
@@ -45,26 +46,26 @@ export class token extends AptosBaseProcessor {
 
   onEventMutation(
     func: (event: token.MutationInstance, ctx: AptosContext) => void,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<token.MutationInstance>,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): token {
     this.onMoveEvent(
       func,
       { ...(eventFilter ?? {}), type: "token::Mutation" },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
 
   onEventMutationEvent(
     func: (event: token.MutationEventInstance, ctx: AptosContext) => void,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<token.MutationEventInstance>,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): token {
     this.onMoveEvent(
       func,
       { ...(eventFilter ?? {}), type: "token::MutationEvent" },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -446,26 +447,26 @@ export class collection extends AptosBaseProcessor {
 
   onEventBurn(
     func: (event: collection.BurnInstance, ctx: AptosContext) => void,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<collection.BurnInstance>,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
       func,
       { ...(eventFilter ?? {}), type: "collection::Burn" },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
 
   onEventBurnEvent(
     func: (event: collection.BurnEventInstance, ctx: AptosContext) => void,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<collection.BurnEventInstance>,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
       func,
       { ...(eventFilter ?? {}), type: "collection::BurnEvent" },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -475,13 +476,13 @@ export class collection extends AptosBaseProcessor {
       event: collection.ConcurrentBurnEventInstance,
       ctx: AptosContext,
     ) => void,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<collection.ConcurrentBurnEventInstance>,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
       func,
       { ...(eventFilter ?? {}), type: "collection::ConcurrentBurnEvent" },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -491,78 +492,78 @@ export class collection extends AptosBaseProcessor {
       event: collection.ConcurrentMintEventInstance,
       ctx: AptosContext,
     ) => void,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<collection.ConcurrentMintEventInstance>,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
       func,
       { ...(eventFilter ?? {}), type: "collection::ConcurrentMintEvent" },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
 
   onEventMint(
     func: (event: collection.MintInstance, ctx: AptosContext) => void,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<collection.MintInstance>,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
       func,
       { ...(eventFilter ?? {}), type: "collection::Mint" },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
 
   onEventMintEvent(
     func: (event: collection.MintEventInstance, ctx: AptosContext) => void,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<collection.MintEventInstance>,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
       func,
       { ...(eventFilter ?? {}), type: "collection::MintEvent" },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
 
   onEventMutation(
     func: (event: collection.MutationInstance, ctx: AptosContext) => void,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<collection.MutationInstance>,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
       func,
       { ...(eventFilter ?? {}), type: "collection::Mutation" },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
 
   onEventMutationEvent(
     func: (event: collection.MutationEventInstance, ctx: AptosContext) => void,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<collection.MutationEventInstance>,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
       func,
       { ...(eventFilter ?? {}), type: "collection::MutationEvent" },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
 
   onEventSetMaxSupply(
     func: (event: collection.SetMaxSupplyInstance, ctx: AptosContext) => void,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<collection.SetMaxSupplyInstance>,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
       func,
       { ...(eventFilter ?? {}), type: "collection::SetMaxSupply" },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }

package/src/aptos/codegen/codegen.ts

@@ -2,7 +2,7 @@ import * as fs from 'fs'
 import chalk from 'chalk'
 import path, { join } from 'path'
 import { AptosCodegen as BaseAptosCodegen } from '@typemove/aptos/codegen'
-import { InternalMoveModule, InternalMoveStruct } from '@typemove/move'
+import { InternalMoveModule, InternalMoveStruct, normalizeToJSName } from '@typemove/move'
 import { AptosNetwork, getRpcEndpoint } from '../network.js'
 import { Event, MoveModuleBytecode, MoveResource } from '@aptos-labs/ts-sdk'
 import { SharedNetworkCodegen } from '../../move/shared-network-codegen.js'
@@ -48,6 +48,18 @@ class AptosNetworkCodegen extends BaseAptosCodegen {
       generateStructs(module: InternalMoveModule, struct: InternalMoveStruct, events: Set<string>) {
         return generator.generateStructs(module, struct, events)
       }
+
+      generateForOnEvents(module: InternalMoveModule, struct: InternalMoveStruct): string {
+        const moduleName = normalizeToJSName(module.name)
+        const source = `
+onEvent${struct.name}(func: (event: ${moduleName}.${normalizeToJSName(struct.name)}Instance, ctx: ${
+          this.PREFIX
+        }Context) => void, handlerOptions?: HandlerOptions<${moduleName}.${normalizeToJSName(struct.name)}Instance>, eventFilter?: Omit<EventFilter, "type"|"account">): ${moduleName} {
+  this.onMoveEvent(func, {...eventFilter ?? {}, type: '${module.name}::${struct.name}' }, handlerOptions)
+  return this
+}`
+        return source
+      }
     })(network, this.chainAdapter)
   }
 

package/src/aptos/data.ts

@@ -0,0 +1,48 @@
+import { Data_AptEvent } from '@sentio/protos'
+import { UserTransactionResponse } from '@aptos-labs/ts-sdk'
+import { MoveCoder } from '@typemove/aptos'
+
+type Data_AptEvent_Ext = Data_AptEvent & {
+  _tx?: UserTransactionResponse
+  _event?: any
+  _decodedEvent?: any
+}
+
+export class AptEvent implements Data_AptEvent {
+  constructor(readonly data: Data_AptEvent_Ext) {}
+
+  get rawEvent(): string {
+    return this.data.rawEvent
+  }
+  get eventIndex(): number {
+    return this.data.eventIndex
+  }
+  get rawTransaction(): string {
+    return this.data.rawTransaction
+  }
+
+  get transaction() {
+    if (!this.data._tx) {
+      this.data._tx = JSON.parse(this.data.rawTransaction) as UserTransactionResponse
+      if (this.data._tx.events == null) {
+        this.data._tx.events = []
+      }
+    }
+    return this.data._tx
+  }
+
+  get event() {
+    if (!this.data._event) {
+      this.data._event = JSON.parse(this.data.rawEvent)
+    }
+    return this.data._event
+  }
+
+  async decodeEvent(coder: MoveCoder) {
+    if (!this.data._decodedEvent) {
+      this.data._decodedEvent = await coder.decodeEvent<any>(this.event)
+      return this.data._decodedEvent
+    }
+    return this.data._decodedEvent
+  }
+}

package/src/aptos/index.ts

@@ -20,4 +20,6 @@ export { MoveCoder } from '@typemove/aptos'
 
 export { BUILTIN_TYPES } from '@typemove/move'
 
+export { type HandlerOptions, type PartitionHandler } from './models.js'
+
 // export * from './utils.js'

package/src/aptos/models.ts

@@ -9,6 +9,7 @@ import {
   ValidatorTransactionResponse,
   BlockEpilogueTransactionResponse
 } from '@aptos-labs/ts-sdk'
+import { MoveFetchConfig } from '@sentio/protos'
 
 export type GeneralTransactionResponse =
   | UserTransactionResponse
@@ -27,3 +28,9 @@ export type TypedFunctionPayload<T extends Array<any>> = EntryFunctionPayloadRes
    */
   arguments_decoded: T
 }
+
+export type PartitionHandler<D> = (data: D) => string | Promise<string>
+
+export type HandlerOptions<D> = Partial<MoveFetchConfig> & {
+  partitionKey?: string | PartitionHandler<D>
+}

package/src/eth/base-processor.ts

@@ -45,6 +45,7 @@ export class EventsHandler {
   handler: (event: Data_EthLog) => Promise<ProcessResult>
   preprocessHandler?: (event: Data_EthLog, preprocessStore: { [k: string]: any }) => Promise<PreprocessResult>
   fetchConfig: EthFetchConfig
+  partitionHandler?: (event: Data_EthLog) => string | undefined
 }
 
 export class TraceHandler {
@@ -53,6 +54,7 @@ export class TraceHandler {
   handler: (trace: Data_EthTrace) => Promise<ProcessResult>
   preprocessHandler?: (event: Data_EthTrace, preprocessStore: { [k: string]: any }) => Promise<PreprocessResult>
   fetchConfig: EthFetchConfig
+  partitionHandler?: (trace: Data_EthTrace) => string | undefined
 }
 
 export class BlockHandler {
@@ -62,13 +64,15 @@ export class BlockHandler {
   handler: (block: Data_EthBlock) => Promise<ProcessResult>
   preprocessHandler?: (event: Data_EthBlock, preprocessStore: { [k: string]: any }) => Promise<PreprocessResult>
   fetchConfig: EthFetchConfig
+  partitionHandler?: (block: Data_EthBlock) => string | undefined
 }
 
 export class TransactionHandler {
-  handler: (block: Data_EthTransaction) => Promise<ProcessResult>
+  handler: (tx: Data_EthTransaction) => Promise<ProcessResult>
   handlerName: string
   preprocessHandler?: (event: Data_EthTransaction, preprocessStore: { [k: string]: any }) => Promise<PreprocessResult>
   fetchConfig: EthFetchConfig
+  partitionHandler?: (tx: Data_EthTransaction) => string | undefined
 }
 
 class BindInternalOptions {
@@ -131,7 +135,8 @@ export class GlobalProcessor {
       preprocessStore: {
         [k: string]: any
       }
-    ) => Promise<PreprocessResult> = defaultPreprocessHandler
+    ) => Promise<PreprocessResult> = defaultPreprocessHandler,
+    partitionHandler?: (block: Data_EthBlock) => string | undefined
   ): this {
     return this.onInterval(
       handler,

package/src/move/filter.ts

@@ -38,6 +38,7 @@ export class EventHandler<T> {
   handlerName: string
   handler: (event: T) => Promise<ProcessResult>
   fetchConfig: MoveFetchConfig
+  partitionHandler?: (event: T) => Promise<string | undefined>
 }
 
 export class CallHandler<T> {

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

@@ -126,6 +126,7 @@ onEvent${struct.name}(func: (event: ${moduleName}.${normalizeToJSName(struct.nam
     import {
       ${this.PREFIX}BindOptions, ${this.PREFIX}BaseProcessor,
       ${this.PREFIX}Network, TypedFunctionPayload,
+      HandlerOptions,
       ${this.PREFIX}Context } from "@sentio/sdk/${this.PREFIX.toLowerCase()}"
 `
   }

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

@@ -41,6 +41,7 @@ import {
   SuiBaseProcessor,
   SuiNetwork,
   TypedFunctionPayload,
+  HandlerOptions,
   SuiContext,
 } from "@sentio/sdk/sui";
 

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

@@ -41,6 +41,7 @@ import {
   SuiBaseProcessor,
   SuiNetwork,
   TypedFunctionPayload,
+  HandlerOptions,
   SuiContext,
 } from "@sentio/sdk/sui";
 

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

@@ -41,6 +41,7 @@ import {
   SuiBaseProcessor,
   SuiNetwork,
   TypedFunctionPayload,
+  HandlerOptions,
   SuiContext,
 } from "@sentio/sdk/sui";
 

package/src/sui/models.ts

@@ -1,5 +1,6 @@
 import type { SuiEvent, MoveCallSuiTransaction, SuiMoveObject } from '@mysten/sui/client'
 import { DecodedStruct } from '@typemove/move'
+import { MoveFetchConfig } from '@sentio/protos'
 
 export type TypedEventInstance<T> = DecodedStruct<SuiEvent, T>
 export type TypedSuiMoveObject<T> = DecodedStruct<SuiMoveObject, T>
@@ -10,3 +11,9 @@ export type TypedFunctionPayload<T extends Array<any>> = MoveCallSuiTransaction
    */
   arguments_decoded: T
 }
+
+export type PartitionHandler<D> = (data: D) => string | Promise<string>
+
+export type HandlerOptions<D> = Partial<MoveFetchConfig> & {
+  partitionKey?: string | PartitionHandler<D>
+}