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

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

@@ -5,12 +5,12 @@
 /* Generated types for 0x4, original address 0x4 */
 
 import { CallFilter, MoveFetchConfig, EventFilter } from "@sentio/sdk/move";
+import { HandlerOptions } from "@sentio/sdk";
 import {
   AptosBindOptions,
   AptosBaseProcessor,
   AptosNetwork,
   TypedFunctionPayload,
-  HandlerOptions,
   AptosContext,
 } from "@sentio/sdk/aptos";
 
@@ -46,7 +46,7 @@ export class token extends AptosBaseProcessor {
 
   onEventMutation(
     func: (event: token.MutationInstance, ctx: AptosContext) => void,
-    handlerOptions?: HandlerOptions<token.MutationInstance>,
+    handlerOptions?: HandlerOptions<MoveFetchConfig, token.MutationInstance>,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): token {
     this.onMoveEvent(
@@ -59,7 +59,10 @@ export class token extends AptosBaseProcessor {
 
   onEventMutationEvent(
     func: (event: token.MutationEventInstance, ctx: AptosContext) => void,
-    handlerOptions?: HandlerOptions<token.MutationEventInstance>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      token.MutationEventInstance
+    >,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): token {
     this.onMoveEvent(
@@ -447,7 +450,7 @@ export class collection extends AptosBaseProcessor {
 
   onEventBurn(
     func: (event: collection.BurnInstance, ctx: AptosContext) => void,
-    handlerOptions?: HandlerOptions<collection.BurnInstance>,
+    handlerOptions?: HandlerOptions<MoveFetchConfig, collection.BurnInstance>,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
@@ -460,7 +463,10 @@ export class collection extends AptosBaseProcessor {
 
   onEventBurnEvent(
     func: (event: collection.BurnEventInstance, ctx: AptosContext) => void,
-    handlerOptions?: HandlerOptions<collection.BurnEventInstance>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      collection.BurnEventInstance
+    >,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
@@ -476,7 +482,10 @@ export class collection extends AptosBaseProcessor {
       event: collection.ConcurrentBurnEventInstance,
       ctx: AptosContext,
     ) => void,
-    handlerOptions?: HandlerOptions<collection.ConcurrentBurnEventInstance>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      collection.ConcurrentBurnEventInstance
+    >,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
@@ -492,7 +501,10 @@ export class collection extends AptosBaseProcessor {
       event: collection.ConcurrentMintEventInstance,
       ctx: AptosContext,
     ) => void,
-    handlerOptions?: HandlerOptions<collection.ConcurrentMintEventInstance>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      collection.ConcurrentMintEventInstance
+    >,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
@@ -505,7 +517,7 @@ export class collection extends AptosBaseProcessor {
 
   onEventMint(
     func: (event: collection.MintInstance, ctx: AptosContext) => void,
-    handlerOptions?: HandlerOptions<collection.MintInstance>,
+    handlerOptions?: HandlerOptions<MoveFetchConfig, collection.MintInstance>,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
@@ -518,7 +530,10 @@ export class collection extends AptosBaseProcessor {
 
   onEventMintEvent(
     func: (event: collection.MintEventInstance, ctx: AptosContext) => void,
-    handlerOptions?: HandlerOptions<collection.MintEventInstance>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      collection.MintEventInstance
+    >,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
@@ -531,7 +546,10 @@ export class collection extends AptosBaseProcessor {
 
   onEventMutation(
     func: (event: collection.MutationInstance, ctx: AptosContext) => void,
-    handlerOptions?: HandlerOptions<collection.MutationInstance>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      collection.MutationInstance
+    >,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
@@ -544,7 +562,10 @@ export class collection extends AptosBaseProcessor {
 
   onEventMutationEvent(
     func: (event: collection.MutationEventInstance, ctx: AptosContext) => void,
-    handlerOptions?: HandlerOptions<collection.MutationEventInstance>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      collection.MutationEventInstance
+    >,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
@@ -557,7 +578,10 @@ export class collection extends AptosBaseProcessor {
 
   onEventSetMaxSupply(
     func: (event: collection.SetMaxSupplyInstance, ctx: AptosContext) => void,
-    handlerOptions?: HandlerOptions<collection.SetMaxSupplyInstance>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      collection.SetMaxSupplyInstance
+    >,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
@@ -976,7 +1000,7 @@ export class aptos_token extends AptosBaseProcessor {
   onEntryBurn(
     func: (call: aptos_token.BurnPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<MoveFetchConfig, aptos_token.BurnPayload>,
   ): aptos_token {
     this.onEntryFunctionCall(
       func,
@@ -984,7 +1008,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::burn",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -992,7 +1016,7 @@ export class aptos_token extends AptosBaseProcessor {
   onEntryMint(
     func: (call: aptos_token.MintPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<MoveFetchConfig, aptos_token.MintPayload>,
   ): aptos_token {
     this.onEntryFunctionCall(
       func,
@@ -1000,7 +1024,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::mint",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1008,7 +1032,10 @@ export class aptos_token extends AptosBaseProcessor {
   onEntrySetDescription(
     func: (call: aptos_token.SetDescriptionPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      aptos_token.SetDescriptionPayload
+    >,
   ): aptos_token {
     this.onEntryFunctionCall(
       func,
@@ -1016,7 +1043,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::set_description",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1024,7 +1051,10 @@ export class aptos_token extends AptosBaseProcessor {
   onEntrySetName(
     func: (call: aptos_token.SetNamePayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      aptos_token.SetNamePayload
+    >,
   ): aptos_token {
     this.onEntryFunctionCall(
       func,
@@ -1032,7 +1062,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::set_name",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1040,7 +1070,7 @@ export class aptos_token extends AptosBaseProcessor {
   onEntrySetUri(
     func: (call: aptos_token.SetUriPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<MoveFetchConfig, aptos_token.SetUriPayload>,
   ): aptos_token {
     this.onEntryFunctionCall(
       func,
@@ -1048,7 +1078,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::set_uri",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1056,7 +1086,10 @@ export class aptos_token extends AptosBaseProcessor {
   onEntryAddProperty(
     func: (call: aptos_token.AddPropertyPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      aptos_token.AddPropertyPayload
+    >,
   ): aptos_token {
     this.onEntryFunctionCall(
       func,
@@ -1064,7 +1097,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::add_property",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1075,7 +1108,10 @@ export class aptos_token extends AptosBaseProcessor {
       ctx: AptosContext,
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      aptos_token.AddTypedPropertyPayload
+    >,
   ): aptos_token {
     this.onEntryFunctionCall(
       func,
@@ -1083,7 +1119,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::add_typed_property",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1094,7 +1130,10 @@ export class aptos_token extends AptosBaseProcessor {
       ctx: AptosContext,
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      aptos_token.CreateCollectionPayload
+    >,
   ): aptos_token {
     this.onEntryFunctionCall(
       func,
@@ -1102,7 +1141,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::create_collection",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1110,7 +1149,10 @@ export class aptos_token extends AptosBaseProcessor {
   onEntryFreezeTransfer(
     func: (call: aptos_token.FreezeTransferPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      aptos_token.FreezeTransferPayload
+    >,
   ): aptos_token {
     this.onEntryFunctionCall(
       func,
@@ -1118,7 +1160,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::freeze_transfer",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1126,7 +1168,10 @@ export class aptos_token extends AptosBaseProcessor {
   onEntryMintSoulBound(
     func: (call: aptos_token.MintSoulBoundPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      aptos_token.MintSoulBoundPayload
+    >,
   ): aptos_token {
     this.onEntryFunctionCall(
       func,
@@ -1134,7 +1179,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::mint_soul_bound",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1142,7 +1187,10 @@ export class aptos_token extends AptosBaseProcessor {
   onEntryRemoveProperty(
     func: (call: aptos_token.RemovePropertyPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      aptos_token.RemovePropertyPayload
+    >,
   ): aptos_token {
     this.onEntryFunctionCall(
       func,
@@ -1150,7 +1198,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::remove_property",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1161,7 +1209,10 @@ export class aptos_token extends AptosBaseProcessor {
       ctx: AptosContext,
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      aptos_token.SetCollectionDescriptionPayload
+    >,
   ): aptos_token {
     this.onEntryFunctionCall(
       func,
@@ -1169,7 +1220,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::set_collection_description",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1180,7 +1231,10 @@ export class aptos_token extends AptosBaseProcessor {
       ctx: AptosContext,
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      aptos_token.SetCollectionRoyaltiesCallPayload
+    >,
   ): aptos_token {
     this.onEntryFunctionCall(
       func,
@@ -1188,7 +1242,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::set_collection_royalties_call",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1199,7 +1253,10 @@ export class aptos_token extends AptosBaseProcessor {
       ctx: AptosContext,
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      aptos_token.SetCollectionUriPayload
+    >,
   ): aptos_token {
     this.onEntryFunctionCall(
       func,
@@ -1207,7 +1264,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::set_collection_uri",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1218,7 +1275,10 @@ export class aptos_token extends AptosBaseProcessor {
       ctx: AptosContext,
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      aptos_token.UnfreezeTransferPayload
+    >,
   ): aptos_token {
     this.onEntryFunctionCall(
       func,
@@ -1226,7 +1286,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::unfreeze_transfer",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1234,7 +1294,10 @@ export class aptos_token extends AptosBaseProcessor {
   onEntryUpdateProperty(
     func: (call: aptos_token.UpdatePropertyPayload, ctx: AptosContext) => void,
     filter?: CallFilter,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      aptos_token.UpdatePropertyPayload
+    >,
   ): aptos_token {
     this.onEntryFunctionCall(
       func,
@@ -1242,7 +1305,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::update_property",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1253,7 +1316,10 @@ export class aptos_token extends AptosBaseProcessor {
       ctx: AptosContext,
     ) => void,
     filter?: CallFilter,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      aptos_token.UpdateTypedPropertyPayload
+    >,
   ): aptos_token {
     this.onEntryFunctionCall(
       func,
@@ -1261,7 +1327,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::update_typed_property",
       },
-      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, normalizeToJSName } from '@typemove/move'
+import { InternalMoveModule, InternalMoveStruct, normalizeToJSName, camel, upperFirst } 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'
@@ -54,12 +54,33 @@ class AptosNetworkCodegen extends BaseAptosCodegen {
         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} {
+        }Context) => void, handlerOptions?: HandlerOptions<MoveFetchConfig, ${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
       }
+
+      generateForEntryFunctions(module: InternalMoveModule, func: any): string {
+        if (!func.isEntry) {
+          return ''
+        }
+
+        const moduleName = normalizeToJSName(module.name)
+        const camelFuncName = upperFirst(camel(func.name))
+
+        const source = `
+  onEntry${camelFuncName}(func: (call: ${moduleName}.${camelFuncName}Payload, ctx: ${this.PREFIX}Context) => void, filter?: CallFilter, handlerOptions?: HandlerOptions<MoveFetchConfig, ${moduleName}.${camelFuncName}Payload>): ${moduleName} {
+    this.onEntryFunctionCall(func, {
+      ...filter,
+      function: '${module.name}::${func.name}'
+    },
+    handlerOptions)
+    return this
+  }`
+
+        return source
+      }
     })(network, this.chainAdapter)
   }
 

package/src/aptos/data.ts

@@ -1,6 +1,6 @@
-import { Data_AptEvent } from '@sentio/protos'
-import { UserTransactionResponse } from '@aptos-labs/ts-sdk'
-import { MoveCoder } from '@typemove/aptos'
+import { Data_AptEvent, Data_AptCall, Data_AptResource } from '@sentio/protos'
+import { UserTransactionResponse, MoveResource } from '@aptos-labs/ts-sdk'
+import { MoveCoder, decodeResourceChange, ResourceChange } from '@typemove/aptos'
 
 type Data_AptEvent_Ext = Data_AptEvent & {
   _tx?: UserTransactionResponse
@@ -8,6 +8,16 @@ type Data_AptEvent_Ext = Data_AptEvent & {
   _decodedEvent?: any
 }
 
+type Data_AptCall_Ext = Data_AptCall & {
+  _tx?: UserTransactionResponse
+  _decodedCall?: any
+}
+
+type Data_AptResource_Ext = Data_AptResource & {
+  _resources?: MoveResource[]
+  _decodedResources?: ResourceChange<any>[]
+}
+
 export class AptEvent implements Data_AptEvent {
   constructor(readonly data: Data_AptEvent_Ext) {}
 
@@ -46,3 +56,68 @@ export class AptEvent implements Data_AptEvent {
     return this.data._decodedEvent
   }
 }
+
+export class AptCall implements Data_AptCall {
+  constructor(readonly data: Data_AptCall_Ext) {}
+
+  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
+  }
+
+  async decodeCall(coder: MoveCoder) {
+    if (!this.data._decodedCall) {
+      const tx = this.transaction
+      let payload = tx.payload
+      if (payload.type === 'multisig_payload') {
+        payload = (payload as any).transaction_payload ?? payload
+      }
+      this.data._decodedCall = await coder.decodeFunctionPayload(payload as any)
+      return this.data._decodedCall
+    }
+    return this.data._decodedCall
+  }
+}
+
+export class AptResource implements Data_AptResource {
+  constructor(readonly data: Data_AptResource_Ext) {}
+
+  get version(): bigint {
+    return this.data.version
+  }
+
+  get timestampMicros(): bigint {
+    return this.data.timestampMicros
+  }
+
+  get rawResources(): string[] {
+    return this.data.rawResources
+  }
+
+  get resources(): MoveResource[] {
+    if (!this.data._resources) {
+      this.data._resources = this.data.rawResources.map((r) => JSON.parse(r) as MoveResource)
+    }
+    return this.data._resources
+  }
+
+  get timestamp(): Date {
+    return new Date(Number(this.data.timestampMicros) / 1000)
+  }
+
+  async decodeResources<T>(coder: MoveCoder): Promise<ResourceChange<T>[]> {
+    if (!this.data._decodedResources) {
+      this.data._decodedResources = await decodeResourceChange<T>(this.resources, coder)
+    }
+    return this.data._decodedResources as ResourceChange<T>[]
+  }
+}

package/src/aptos/models.ts

@@ -9,7 +9,6 @@ import {
   ValidatorTransactionResponse,
   BlockEpilogueTransactionResponse
 } from '@aptos-labs/ts-sdk'
-import { MoveFetchConfig } from '@sentio/protos'
 
 export type GeneralTransactionResponse =
   | UserTransactionResponse
@@ -29,8 +28,4 @@ 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>
-}
+export type { PartitionHandler, HandlerOptions } from '../core/index.js'