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

package/lib/sui/models.d.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>;
 export type TypedFunctionPayload<T extends Array<any>> = MoveCallSuiTransaction & {
@@ -8,4 +9,8 @@ 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>;
+};
 //# sourceMappingURL=models.d.ts.map

package/lib/sui/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/sui/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACzF,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAE9C,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;AAC9D,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI,aAAa,CAAC,aAAa,EAAE,CAAC,CAAC,CAAA;AAEnE,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,IAAI,sBAAsB,GAAG;IAChF;;OAEG;IACH,iBAAiB,EAAE,CAAC,CAAA;CACrB,CAAA"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/sui/models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACzF,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAEhD,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;AAC9D,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI,aAAa,CAAC,aAAa,EAAE,CAAC,CAAC,CAAA;AAEnE,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,IAAI,sBAAsB,GAAG;IAChF;;OAEG;IACH,iBAAiB,EAAE,CAAC,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,gBAAgB,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAEvE,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,OAAO,CAAC,eAAe,CAAC,GAAG;IACzD,YAAY,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAA;CAC5C,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentio/sdk",
-  "version": "2.59.0-rc.22",
+  "version": "2.59.0-rc.24",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
@@ -88,8 +88,8 @@
     "typechain": "^8.3.2",
     "utility-types": "^3.11.0",
     "yaml": "^2.3.4",
-    "@sentio/protos": "2.59.0-rc.22",
-    "@sentio/runtime": "^2.59.0-rc.22"
+    "@sentio/protos": "2.59.0-rc.24",
+    "@sentio/runtime": "^2.59.0-rc.24"
   },
   "peerDependencies": {
     "@sentio/tsup": "^8.3.5-rc.1"

package/src/aptos/aptos-plugin.ts

@@ -3,7 +3,6 @@ import {
   AccountConfig,
   ContractConfig,
   Data_AptCall,
-  Data_AptEvent,
   Data_AptResource,
   DataBinding,
   HandlerType,
@@ -12,6 +11,9 @@ import {
   MoveOwnerType,
   ProcessConfigResponse,
   ProcessResult,
+  ProcessStreamResponse_Partitions,
+  ProcessStreamResponse_Partitions_Partition,
+  ProcessStreamResponse_Partitions_Partition_SysValue,
   StartRequest
 } from '@sentio/protos'
 
@@ -27,13 +29,15 @@ import {
   AptosResourceProcessorTemplateState
 } from './aptos-resource-processor-template.js'
 import { AptosNetwork } from './network.js'
+import { AptEvent } from './data.js'
 
 interface Handlers {
-  aptosEventHandlers: ((event: Data_AptEvent) => Promise<ProcessResult>)[]
+  aptosEventHandlers: ((event: AptEvent) => Promise<ProcessResult>)[]
   aptosCallHandlers: ((func: Data_AptCall) => Promise<ProcessResult>)[]
   aptosResourceHandlers: ((resourceWithVersion: Data_AptResource) => Promise<ProcessResult>)[]
   aptosTransactionIntervalHandlers: ((txn: Data_AptCall) => Promise<ProcessResult>)[]
 }
+
 export class AptosPlugin extends Plugin {
   name: string = 'AptosPlugin'
   handlers: Handlers = {
@@ -43,6 +47,8 @@ export class AptosPlugin extends Plugin {
     aptosTransactionIntervalHandlers: []
   }
 
+  partitionHandlers: Record<number, (request: AptEvent) => Promise<string | undefined>> = {}
+
   async start(request: StartRequest) {
     await initTokenList()
 
@@ -90,6 +96,9 @@ export class AptosPlugin extends Plugin {
       // 1. Prepare event handlers
       for (const handler of aptosProcessor.eventHandlers) {
         const handlerId = handlers.aptosEventHandlers.push(handler.handler) - 1
+        if (handler.partitionHandler) {
+          this.partitionHandlers[handlerId] = handler.partitionHandler
+        }
         const eventHandlerConfig: MoveEventHandlerConfig = {
           filters: handler.filters.map((f) => {
             return {
@@ -225,12 +234,50 @@ export class AptosPlugin extends Plugin {
     }
   }
 
+  async partition(request: DataBinding): Promise<ProcessStreamResponse_Partitions> {
+    switch (request.handlerType) {
+      case HandlerType.APT_EVENT:
+        const result: Record<number, ProcessStreamResponse_Partitions_Partition> = {}
+        for (const handlerId of request.handlerIds) {
+          const partitionHandler = this.partitionHandlers[handlerId]
+          if (partitionHandler && request.data?.aptEvent) {
+            const partitionValue = await partitionHandler(new AptEvent(request.data.aptEvent))
+            result[handlerId] = {
+              userValue: partitionValue
+            }
+          } else {
+            result[handlerId] = {
+              sysValue: ProcessStreamResponse_Partitions_Partition_SysValue.UNRECOGNIZED
+            }
+          }
+        }
+        return {
+          partitions: result
+        }
+
+      case HandlerType.APT_RESOURCE:
+      case HandlerType.APT_CALL:
+        throw new ServerError(Status.INTERNAL, 'not implemented')
+    }
+    return {
+      partitions: request.handlerIds.reduce(
+        (acc, id) => ({
+          ...acc,
+          [id]: {
+            sysValue: ProcessStreamResponse_Partitions_Partition_SysValue.UNRECOGNIZED
+          }
+        }),
+        {}
+      )
+    }
+  }
+
   async processAptosEvent(binding: DataBinding): Promise<ProcessResult> {
     if (!binding.data?.aptEvent) {
       throw new ServerError(Status.INVALID_ARGUMENT, "Event can't be empty")
     }
     const promises: Promise<ProcessResult>[] = []
-    const event = binding.data.aptEvent
+    const event = new AptEvent(binding.data.aptEvent)
 
     for (const handlerId of binding.handlerIds) {
       const promise = this.handlers.aptosEventHandlers[handlerId](event).catch((e) => {

package/src/aptos/aptos-processor.ts

@@ -12,14 +12,7 @@ import {
 import { AptosBindOptions, AptosNetwork } from './network.js'
 import { AptosContext, AptosResourcesContext, AptosTransactionContext } from './context.js'
 import { ListStateStorage } from '@sentio/runtime'
-import {
-  MoveFetchConfig,
-  Data_AptResource,
-  HandleInterval,
-  Data_AptEvent,
-  Data_AptCall,
-  MoveAccountFetchConfig
-} from '@sentio/protos'
+import { MoveFetchConfig, Data_AptResource, HandleInterval, Data_AptCall, MoveAccountFetchConfig } from '@sentio/protos'
 import { ServerError, Status } from 'nice-grpc'
 import {
   accountTypeString,
@@ -35,8 +28,9 @@ import {
 import { ALL_ADDRESS, Labels, PromiseOrVoid } from '../core/index.js'
 import { TypeDescriptor, matchType, NestedDecodedStruct } from '@typemove/move'
 import { decodeResourceChange, ResourceChange } from '@typemove/aptos'
-import { GeneralTransactionResponse } from './models.js'
+import { GeneralTransactionResponse, HandlerOptions } from './models.js'
 import { getHandlerName, proxyProcessor } from '../utils/metrics.js'
+import { AptEvent } from './data.js'
 
 const DEFAULT_FETCH_CONFIG: MoveFetchConfig = {
   resourceChanges: false,
@@ -66,7 +60,7 @@ export class AptosProcessorState extends ListStateStorage<AptosTransactionProces
 export class AptosTransactionProcessor<T extends GeneralTransactionResponse, CT extends AptosTransactionContext<T>> {
   readonly moduleName: string
   config: IndexConfigure
-  eventHandlers: EventHandler<Data_AptEvent>[] = []
+  eventHandlers: EventHandler<AptEvent>[] = []
   callHandlers: CallHandler<Data_AptCall>[] = []
   resourceChangeHandlers: ResourceChangeHandler<Data_AptResource>[] = []
   transactionIntervalHandlers: TransactionIntervalHandler[] = []
@@ -85,10 +79,10 @@ export class AptosTransactionProcessor<T extends GeneralTransactionResponse, CT
   protected onMoveEvent(
     handler: (event: Event, ctx: AptosContext) => PromiseOrVoid,
     filter: EventFilter | EventFilter[],
-    fetchConfig?: Partial<MoveFetchConfig>
+    handlerOptions?: HandlerOptions<Event>
   ): this {
     let _filters: EventFilter[] = []
-    const _fetchConfig = MoveFetchConfig.fromPartial({ ...DEFAULT_FETCH_CONFIG, ...fetchConfig })
+    const _fetchConfig = MoveFetchConfig.fromPartial({ ...DEFAULT_FETCH_CONFIG, ...handlerOptions })
 
     if (Array.isArray(filter)) {
       _filters = filter
@@ -106,12 +100,7 @@ export class AptosTransactionProcessor<T extends GeneralTransactionResponse, CT
         if (!data.rawTransaction) {
           throw new ServerError(Status.INVALID_ARGUMENT, 'event is null')
         }
-        const txn = JSON.parse(data.rawTransaction) as UserTransactionResponse
-        if (txn.events == null) {
-          txn.events = []
-        }
-
-        const evt = JSON.parse(data.rawEvent)
+        const txn = data.transaction
 
         const ctx = new AptosContext(
           processor.moduleName,
@@ -123,13 +112,21 @@ export class AptosTransactionProcessor<T extends GeneralTransactionResponse, CT
           processor.config.baseLabels
         )
 
-        const decoded = await processor.coder.decodeEvent<any>(evt)
-        await handler(decoded || evt, ctx)
-
+        const decoded = await data.decodeEvent(processor.coder)
+        await handler(decoded || data.event, ctx)
         return ctx.stopAndGetResult()
       },
       filters: _filters,
-      fetchConfig: _fetchConfig
+      fetchConfig: _fetchConfig,
+      partitionHandler: async (data: AptEvent): Promise<string | undefined> => {
+        const p = handlerOptions?.partitionKey
+        if (!p) return undefined
+        if (typeof p === 'function') {
+          const decoded = await data.decodeEvent(processor.coder)
+          return p(decoded || data.event)
+        }
+        return p
+      }
     })
     return this
   }
@@ -233,8 +230,8 @@ export class AptosTransactionProcessor<T extends GeneralTransactionResponse, CT
     return this
   }
 
-  public onEvent(handler: (event: Event, ctx: AptosContext) => void, fetchConfig?: Partial<MoveFetchConfig>): this {
-    this.onMoveEvent(handler, { type: '' }, fetchConfig)
+  public onEvent(handler: (event: Event, ctx: AptosContext) => void, handlerOptions?: HandlerOptions<Event>): this {
+    this.onMoveEvent(handler, { type: '' }, handlerOptions)
     return this
   }
 
@@ -377,6 +374,7 @@ export class AptosModulesProcessor extends AptosTransactionProcessor<
 
 export class AptosGlobalProcessor {
   private baseProcessor
+
   private constructor(options: AptosBindOptions) {
     this.baseProcessor = new AptosTransactionProcessor('*', options)
     return proxyProcessor(this)