@sentio/sdk 2.59.0-rc.4 → 2.59.0-rc.40

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

@@ -5,6 +5,7 @@
 /* Generated types for 0x4, original address 0x4 */
 
 import { CallFilter, MoveFetchConfig, EventFilter } from "@sentio/sdk/move";
+import { HandlerOptions } from "@sentio/sdk";
 import {
   AptosBindOptions,
   AptosBaseProcessor,
@@ -25,6 +26,7 @@ import {
   InputGenerateTransactionOptions,
   MoveStructId,
   InputViewFunctionData,
+  InputViewFunctionJsonData,
 } from "@aptos-labs/ts-sdk";
 
 import * as _0x1 from "./0x1.js";
@@ -44,26 +46,29 @@ export class token extends AptosBaseProcessor {
 
   onEventMutation(
     func: (event: token.MutationInstance, ctx: AptosContext) => void,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<MoveFetchConfig, 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<
+      MoveFetchConfig,
+      token.MutationEventInstance
+    >,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): token {
     this.onMoveEvent(
       func,
       { ...(eventFilter ?? {}), type: "token::MutationEvent" },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -445,26 +450,29 @@ export class collection extends AptosBaseProcessor {
 
   onEventBurn(
     func: (event: collection.BurnInstance, ctx: AptosContext) => void,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<MoveFetchConfig, 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<
+      MoveFetchConfig,
+      collection.BurnEventInstance
+    >,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
       func,
       { ...(eventFilter ?? {}), type: "collection::BurnEvent" },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -474,13 +482,16 @@ export class collection extends AptosBaseProcessor {
       event: collection.ConcurrentBurnEventInstance,
       ctx: AptosContext,
     ) => void,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      collection.ConcurrentBurnEventInstance
+    >,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
       func,
       { ...(eventFilter ?? {}), type: "collection::ConcurrentBurnEvent" },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -490,78 +501,93 @@ export class collection extends AptosBaseProcessor {
       event: collection.ConcurrentMintEventInstance,
       ctx: AptosContext,
     ) => void,
-    fetchConfig?: Partial<MoveFetchConfig>,
+    handlerOptions?: HandlerOptions<
+      MoveFetchConfig,
+      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<MoveFetchConfig, 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<
+      MoveFetchConfig,
+      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<
+      MoveFetchConfig,
+      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<
+      MoveFetchConfig,
+      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<
+      MoveFetchConfig,
+      collection.SetMaxSupplyInstance
+    >,
     eventFilter?: Omit<EventFilter, "type" | "account">,
   ): collection {
     this.onMoveEvent(
       func,
       { ...(eventFilter ?? {}), type: "collection::SetMaxSupply" },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -974,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,
@@ -982,7 +1008,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::burn",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -990,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,
@@ -998,7 +1024,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::mint",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1006,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,
@@ -1014,7 +1043,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::set_description",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1022,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,
@@ -1030,7 +1062,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::set_name",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1038,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,
@@ -1046,7 +1078,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::set_uri",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1054,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,
@@ -1062,7 +1097,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::add_property",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1073,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,
@@ -1081,7 +1119,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::add_typed_property",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1092,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,
@@ -1100,7 +1141,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::create_collection",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1108,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,
@@ -1116,7 +1160,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::freeze_transfer",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1124,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,
@@ -1132,7 +1179,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::mint_soul_bound",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1140,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,
@@ -1148,7 +1198,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::remove_property",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1159,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,
@@ -1167,7 +1220,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::set_collection_description",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1178,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,
@@ -1186,7 +1242,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::set_collection_royalties_call",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1197,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,
@@ -1205,7 +1264,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::set_collection_uri",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1216,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,
@@ -1224,7 +1286,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::unfreeze_transfer",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1232,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,
@@ -1240,7 +1305,7 @@ export class aptos_token extends AptosBaseProcessor {
         ...filter,
         function: "aptos_token::update_property",
       },
-      fetchConfig,
+      handlerOptions,
     );
     return this;
   }
@@ -1251,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,
@@ -1259,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 } 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'
@@ -26,9 +26,9 @@ class AptosNetworkCodegen extends BaseAptosCodegen {
   moduleGenerator: SharedNetworkCodegen<AptosNetwork, MoveModuleBytecode, Event | MoveResource>
   SYSTEM_PACKAGE = '@sentio/sdk/aptos'
 
-  constructor(network: AptosNetwork) {
+  constructor(network: AptosNetwork, useViewJson = false) {
     const endpoint = getRpcEndpoint(network)
-    super(endpoint)
+    super(endpoint, useViewJson)
     const generator = this
 
     this.moduleGenerator = new (class extends SharedNetworkCodegen<
@@ -48,12 +48,46 @@ 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<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)
   }
 
   protected getGetDefaultCoder() {
     return `defaultMoveCoderForClient(client)`
   }
+
   generateModule(module: InternalMoveModule, allEventStructs: Map<string, InternalMoveStruct>) {
     return this.moduleGenerator.generateModule(module, allEventStructs)
   }
@@ -67,9 +101,10 @@ class AptosNetworkCodegen extends BaseAptosCodegen {
         MoveCoder, TypedEventInstance } from "@typemove/${this.PREFIX.toLowerCase()}"
 
       import { defaultMoveCoder, defaultMoveCoderForClient } from "${this.defaultCoderPackage()}"
-      import { Aptos, Account as AptosAccount, MoveAddressType, PendingTransactionResponse, InputGenerateTransactionOptions, MoveStructId, InputViewFunctionData } from '@aptos-labs/ts-sdk'`
+      import { Aptos, Account as AptosAccount, MoveAddressType, PendingTransactionResponse, InputGenerateTransactionOptions, MoveStructId, InputViewFunctionData, InputViewFunctionJsonData } from '@aptos-labs/ts-sdk'`
     )
   }
+
   generateLoadAll(isSystem: boolean): string {
     return this.moduleGenerator.generateLoadAll(isSystem)
   }
@@ -79,7 +114,7 @@ const ADDRESS_LENGTH = 64
 
 class InitiaAptosNetworkCodegen extends AptosNetworkCodegen {
   constructor(network: AptosNetwork) {
-    super(network)
+    super(network, true)
 
     const oldFetchModules = this.chainAdapter.fetchModules.bind(this.chainAdapter)
     this.chainAdapter.fetchModules = async (address: string) => {