@sentio/sdk 1.21.2 → 1.21.4

package/lib/aptos/aptos-processor.js

@@ -140,15 +140,19 @@ class AptosBaseProcessor {
         const registry = types_1.GLOBAL_TYPE_REGISTRY;
         this.loadTypes(registry);
         // TODO check if module is not loaded
+        const typeDescriptor = (0, typegen_1.parseMoveType)(event.type);
+        const typeArguments = typeDescriptor.typeArgs.map((t) => t.getSignature());
+        // TODO check move structure's type param match type args, also maybe
+        // use type arguments for decoding
         let dataTyped = undefined;
         try {
-            dataTyped = registry.decode(event.data, (0, typegen_1.parseMoveType)(event.type));
+            dataTyped = registry.decode(event.data, typeDescriptor);
         }
         catch (e) {
             console.warn('Decoding error for ', event.type);
             return event;
         }
-        return { ...event, data_typed: dataTyped };
+        return { ...event, data_typed: dataTyped, type_arguments: typeArguments };
     }
     decodeFunctionPayload(payload) {
         const registry = types_1.GLOBAL_TYPE_REGISTRY;

package/lib/aptos/aptos-processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"aptos-processor.js","sourceRoot":"","sources":["../../src/aptos/aptos-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import { ProcessResult } from '../gen'\nimport {\n  AptosBindOptions,\n  AptosContext,\n  AptosNetwork,\n  Transaction_UserTransaction,\n  TransactionPayload_EntryFunctionPayload,\n  TypedEntryFunctionPayload,\n  TypedEventInstance,\n  TypeRegistry,\n} from '.'\n\nimport Long from 'long'\nimport { APTOS_MAINNET_ID, APTOS_TESTNET_ID } from '../utils/chain'\nimport { EventInstance, GLOBAL_TYPE_REGISTRY } from './types'\nimport { parseMoveType } from '../aptos-codegen/typegen'\n\ntype IndexConfigure = {\n  address: string\n  network: AptosNetwork\n  startVersion: Long\n  // endSeqNumber?: Long\n}\n\n// TODO extends ArgumentsFilter\nexport interface EventFilter {\n  type: string\n}\n\nexport interface FunctionNameAndCallFilter extends CallFilter {\n  function: string\n}\n\n// TODO extends ArgumentsFilter\nexport interface CallFilter {\n  includeFailed?: boolean\n  typeArguments?: string[]\n}\n\nexport interface ArgumentsFilter {\n  arguments?: string[]\n}\n\nclass EventHandler {\n  filters: EventFilter[]\n  handler: (event: EventInstance) => Promise<ProcessResult>\n}\n\nclass CallHandler {\n  filters: FunctionNameAndCallFilter[]\n  handler: (call: Transaction_UserTransaction) => Promise<ProcessResult>\n}\n\nexport class AptosBaseProcessor {\n  readonly moduleName: string\n  config: IndexConfigure\n  eventHandlers: EventHandler[] = []\n  callHandlers: CallHandler[] = []\n\n  constructor(moduleName: string, options: AptosBindOptions) {\n    this.moduleName = moduleName\n    this.configure(options)\n    global.PROCESSOR_STATE.aptosProcessors.push(this)\n  }\n\n  // getABI(): MoveModule | undefined {\n  //   return undefined\n  // }\n\n  public onTransaction(\n    handler: (transaction: Transaction_UserTransaction, ctx: AptosContext) => void\n  ): AptosBaseProcessor {\n    const address = this.config.address\n    const moduleName = this.moduleName\n    this.callHandlers.push({\n      handler: async function (tx) {\n        const ctx = new AptosContext(moduleName, address, Long.fromString(tx.version), tx)\n        if (tx) {\n          handler(tx, ctx)\n        }\n        return {\n          gauges: ctx.gauges,\n          counters: ctx.counters,\n          logs: ctx.logs,\n        }\n      },\n      filters: [],\n    })\n    return this\n  }\n\n  public onEvent(\n    handler: (event: EventInstance, ctx: AptosContext) => void,\n    filter: EventFilter | EventFilter[]\n  ): AptosBaseProcessor {\n    let _filters: EventFilter[] = []\n\n    if (Array.isArray(filter)) {\n      _filters = filter\n    } else {\n      _filters.push(filter)\n    }\n\n    // const address = this.config.address\n    // const moduleName = this.moduleName\n\n    // eslint-disable-next-line @typescript-eslint/no-this-alias\n    const processor = this\n\n    this.eventHandlers.push({\n      handler: async function (event) {\n        const ctx = new AptosContext(processor.moduleName, processor.config.address, Long.fromString(event.version))\n        if (event) {\n          const decoded = processor.decodeEvent(event)\n          handler(decoded, ctx)\n        }\n        return {\n          gauges: ctx.gauges,\n          counters: ctx.counters,\n          logs: ctx.logs,\n        }\n      },\n      filters: _filters,\n    })\n    return this\n  }\n\n  public onEntryFunctionCall(\n    handler: (call: TransactionPayload_EntryFunctionPayload, ctx: AptosContext) => void,\n    filter: FunctionNameAndCallFilter | FunctionNameAndCallFilter[]\n  ): AptosBaseProcessor {\n    let _filters: FunctionNameAndCallFilter[] = []\n\n    if (Array.isArray(filter)) {\n      _filters = filter\n    } else {\n      _filters.push(filter)\n    }\n\n    // const address = this.config.address\n    // const moduleName = this.moduleName\n    // eslint-disable-next-line @typescript-eslint/no-this-alias\n    const processor = this\n\n    this.callHandlers.push({\n      handler: async function (tx) {\n        const ctx = new AptosContext(processor.moduleName, processor.config.address, Long.fromString(tx.version), tx)\n        if (tx) {\n          const payload = tx.payload as TransactionPayload_EntryFunctionPayload\n          const decoded = processor.decodeFunctionPayload(payload)\n          handler(decoded, ctx)\n        }\n        return {\n          gauges: ctx.gauges,\n          counters: ctx.counters,\n          logs: ctx.logs,\n        }\n      },\n      filters: _filters,\n    })\n    return this\n  }\n\n  private configure(options: AptosBindOptions) {\n    let startVersion = Long.ZERO\n    if (options.startVersion) {\n      startVersion = Long.fromValue(options.startVersion)\n    }\n\n    this.config = {\n      startVersion: startVersion,\n      address: options.address,\n      network: options.network || AptosNetwork.TEST_NET,\n    }\n  }\n\n  getChainId(): string {\n    switch (this.config.network) {\n      case AptosNetwork.TEST_NET:\n        return APTOS_TESTNET_ID\n      case AptosNetwork.MAIN_NET:\n        return APTOS_MAINNET_ID\n    }\n  }\n\n  loadTypes(registry: TypeRegistry) {\n    if (registry.contains(this.config.address, this.moduleName)) {\n      return\n    }\n    this.loadTypesInternal(registry)\n  }\n\n  protected loadTypesInternal(registry: TypeRegistry) {\n    // should be override by subclass\n  }\n\n  private decodeEvent(event: EventInstance): EventInstance {\n    const registry = GLOBAL_TYPE_REGISTRY\n    this.loadTypes(registry)\n    // TODO check if module is not loaded\n\n    let dataTyped = undefined\n    try {\n      dataTyped = registry.decode(event.data, parseMoveType(event.type))\n    } catch (e) {\n      console.warn('Decoding error for ', event.type)\n      return event\n    }\n\n    return { ...event, data_typed: dataTyped } as TypedEventInstance<any>\n  }\n\n  private decodeFunctionPayload(\n    payload: TransactionPayload_EntryFunctionPayload\n  ): TransactionPayload_EntryFunctionPayload {\n    const registry = GLOBAL_TYPE_REGISTRY\n    this.loadTypes(registry)\n    const argumentsTyped: any[] = []\n\n    try {\n      const func = registry.getMoveFunction(payload.function)\n      for (const [idx, arg] of payload.arguments.entries()) {\n        // TODO consider apply payload.type_arguments, but this might be hard since we don't code gen for them\n        const argType = parseMoveType(func.params[idx + 1])\n        argumentsTyped.push(registry.decode(arg, argType))\n      }\n    } catch (e) {\n      console.warn('Decoding error for ', payload.function)\n      return payload\n    }\n\n    return { ...payload, arguments_typed: argumentsTyped } as TypedEntryFunctionPayload<any>\n  }\n}\n"]}
+{"version":3,"file":"aptos-processor.js","sourceRoot":"","sources":["../../src/aptos/aptos-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import { ProcessResult } from '../gen'\nimport {\n  AptosBindOptions,\n  AptosContext,\n  AptosNetwork,\n  Transaction_UserTransaction,\n  TransactionPayload_EntryFunctionPayload,\n  TypedEntryFunctionPayload,\n  TypedEventInstance,\n  TypeRegistry,\n} from '.'\n\nimport Long from 'long'\nimport { APTOS_MAINNET_ID, APTOS_TESTNET_ID } from '../utils/chain'\nimport { EventInstance, GLOBAL_TYPE_REGISTRY } from './types'\nimport { parseMoveType } from '../aptos-codegen/typegen'\n\ntype IndexConfigure = {\n  address: string\n  network: AptosNetwork\n  startVersion: Long\n  // endSeqNumber?: Long\n}\n\n// TODO extends ArgumentsFilter\nexport interface EventFilter {\n  type: string\n}\n\nexport interface FunctionNameAndCallFilter extends CallFilter {\n  function: string\n}\n\n// TODO extends ArgumentsFilter\nexport interface CallFilter {\n  includeFailed?: boolean\n  typeArguments?: string[]\n}\n\nexport interface ArgumentsFilter {\n  arguments?: string[]\n}\n\nclass EventHandler {\n  filters: EventFilter[]\n  handler: (event: EventInstance) => Promise<ProcessResult>\n}\n\nclass CallHandler {\n  filters: FunctionNameAndCallFilter[]\n  handler: (call: Transaction_UserTransaction) => Promise<ProcessResult>\n}\n\nexport class AptosBaseProcessor {\n  readonly moduleName: string\n  config: IndexConfigure\n  eventHandlers: EventHandler[] = []\n  callHandlers: CallHandler[] = []\n\n  constructor(moduleName: string, options: AptosBindOptions) {\n    this.moduleName = moduleName\n    this.configure(options)\n    global.PROCESSOR_STATE.aptosProcessors.push(this)\n  }\n\n  // getABI(): MoveModule | undefined {\n  //   return undefined\n  // }\n\n  public onTransaction(\n    handler: (transaction: Transaction_UserTransaction, ctx: AptosContext) => void\n  ): AptosBaseProcessor {\n    const address = this.config.address\n    const moduleName = this.moduleName\n    this.callHandlers.push({\n      handler: async function (tx) {\n        const ctx = new AptosContext(moduleName, address, Long.fromString(tx.version), tx)\n        if (tx) {\n          handler(tx, ctx)\n        }\n        return {\n          gauges: ctx.gauges,\n          counters: ctx.counters,\n          logs: ctx.logs,\n        }\n      },\n      filters: [],\n    })\n    return this\n  }\n\n  public onEvent(\n    handler: (event: EventInstance, ctx: AptosContext) => void,\n    filter: EventFilter | EventFilter[]\n  ): AptosBaseProcessor {\n    let _filters: EventFilter[] = []\n\n    if (Array.isArray(filter)) {\n      _filters = filter\n    } else {\n      _filters.push(filter)\n    }\n\n    // const address = this.config.address\n    // const moduleName = this.moduleName\n\n    // eslint-disable-next-line @typescript-eslint/no-this-alias\n    const processor = this\n\n    this.eventHandlers.push({\n      handler: async function (event) {\n        const ctx = new AptosContext(processor.moduleName, processor.config.address, Long.fromString(event.version))\n        if (event) {\n          const decoded = processor.decodeEvent(event)\n          handler(decoded, ctx)\n        }\n        return {\n          gauges: ctx.gauges,\n          counters: ctx.counters,\n          logs: ctx.logs,\n        }\n      },\n      filters: _filters,\n    })\n    return this\n  }\n\n  public onEntryFunctionCall(\n    handler: (call: TransactionPayload_EntryFunctionPayload, ctx: AptosContext) => void,\n    filter: FunctionNameAndCallFilter | FunctionNameAndCallFilter[]\n  ): AptosBaseProcessor {\n    let _filters: FunctionNameAndCallFilter[] = []\n\n    if (Array.isArray(filter)) {\n      _filters = filter\n    } else {\n      _filters.push(filter)\n    }\n\n    // const address = this.config.address\n    // const moduleName = this.moduleName\n    // eslint-disable-next-line @typescript-eslint/no-this-alias\n    const processor = this\n\n    this.callHandlers.push({\n      handler: async function (tx) {\n        const ctx = new AptosContext(processor.moduleName, processor.config.address, Long.fromString(tx.version), tx)\n        if (tx) {\n          const payload = tx.payload as TransactionPayload_EntryFunctionPayload\n          const decoded = processor.decodeFunctionPayload(payload)\n          handler(decoded, ctx)\n        }\n        return {\n          gauges: ctx.gauges,\n          counters: ctx.counters,\n          logs: ctx.logs,\n        }\n      },\n      filters: _filters,\n    })\n    return this\n  }\n\n  private configure(options: AptosBindOptions) {\n    let startVersion = Long.ZERO\n    if (options.startVersion) {\n      startVersion = Long.fromValue(options.startVersion)\n    }\n\n    this.config = {\n      startVersion: startVersion,\n      address: options.address,\n      network: options.network || AptosNetwork.TEST_NET,\n    }\n  }\n\n  getChainId(): string {\n    switch (this.config.network) {\n      case AptosNetwork.TEST_NET:\n        return APTOS_TESTNET_ID\n      case AptosNetwork.MAIN_NET:\n        return APTOS_MAINNET_ID\n    }\n  }\n\n  loadTypes(registry: TypeRegistry) {\n    if (registry.contains(this.config.address, this.moduleName)) {\n      return\n    }\n    this.loadTypesInternal(registry)\n  }\n\n  protected loadTypesInternal(registry: TypeRegistry) {\n    // should be override by subclass\n  }\n\n  private decodeEvent(event: EventInstance): EventInstance {\n    const registry = GLOBAL_TYPE_REGISTRY\n    this.loadTypes(registry)\n    // TODO check if module is not loaded\n\n    const typeDescriptor = parseMoveType(event.type)\n    const typeArguments = typeDescriptor.typeArgs.map((t) => t.getSignature())\n    // TODO check move structure's type param match type args, also maybe\n    // use type arguments for decoding\n\n    let dataTyped = undefined\n    try {\n      dataTyped = registry.decode(event.data, typeDescriptor)\n    } catch (e) {\n      console.warn('Decoding error for ', event.type)\n      return event\n    }\n\n    return { ...event, data_typed: dataTyped, type_arguments: typeArguments } as TypedEventInstance<any>\n  }\n\n  private decodeFunctionPayload(\n    payload: TransactionPayload_EntryFunctionPayload\n  ): TransactionPayload_EntryFunctionPayload {\n    const registry = GLOBAL_TYPE_REGISTRY\n    this.loadTypes(registry)\n    const argumentsTyped: any[] = []\n\n    try {\n      const func = registry.getMoveFunction(payload.function)\n      for (const [idx, arg] of payload.arguments.entries()) {\n        // TODO consider apply payload.type_arguments, but this might be hard since we don't code gen for them\n        const argType = parseMoveType(func.params[idx + 1])\n        argumentsTyped.push(registry.decode(arg, argType))\n      }\n    } catch (e) {\n      console.warn('Decoding error for ', payload.function)\n      return payload\n    }\n\n    return { ...payload, arguments_typed: argumentsTyped } as TypedEntryFunctionPayload<any>\n  }\n}\n"]}

package/lib/aptos/types.d.ts

@@ -4,6 +4,7 @@ export declare type EventInstance = Event & {
 };
 export declare type TypedEventInstance<T> = EventInstance & {
     data_typed: T;
+    type_arguments: string[];
 };
 export declare type TypedEntryFunctionPayload<T extends Array<any>> = TransactionPayload_EntryFunctionPayload & {
     arguments_typed: T;
@@ -12,7 +13,8 @@ export declare class TypeDescriptor {
     qname: string;
     typeArgs: TypeDescriptor[];
     constructor(symbol: string, typeParams?: TypeDescriptor[]);
-    applyArgs(ctx: Map<string, TypeDescriptor>): TypeDescriptor;
+    getSignature(): string;
+    applyTypeArgs(ctx: Map<string, TypeDescriptor>): TypeDescriptor;
     dependedTypes(): string[];
 }
 export declare class TypeRegistry {

package/lib/aptos/types.js

@@ -14,8 +14,14 @@ class TypeDescriptor {
         this.qname = symbol;
         this.typeArgs = typeParams || [];
     }
+    getSignature() {
+        if (this.typeArgs.length > 0) {
+            return this.qname + '<' + this.typeArgs.map((t) => t.getSignature()).join(', ') + '>';
+        }
+        return this.qname;
+    }
     // Replace T0, T1 with more concrete type
-    applyArgs(ctx) {
+    applyTypeArgs(ctx) {
         const replace = ctx.get(this.qname);
         if (replace) {
             return replace;
@@ -30,7 +36,7 @@ class TypeDescriptor {
                 typeArgs.push(replace);
             }
             else {
-                typeArgs.push(arg.applyArgs(ctx));
+                typeArgs.push(arg.applyTypeArgs(ctx));
             }
         }
         return new TypeDescriptor(this.qname, typeArgs);
@@ -147,7 +153,7 @@ class TypeRegistry {
         const typedData = {};
         for (const field of struct.fields) {
             let filedType = (0, typegen_1.parseMoveType)(field.type);
-            filedType = filedType.applyArgs(typeCtx);
+            filedType = filedType.applyTypeArgs(typeCtx);
             const value = this.decode(data[field.name], filedType);
             typedData[field.name] = value;
         }

package/lib/aptos/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/aptos/types.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Event,\n  MoveFunction,\n  MoveModule,\n  MoveStruct,\n  TransactionPayload_EntryFunctionPayload,\n} from 'aptos/src/generated'\nimport { moduleQname, SPLITTER, VECTOR_STR } from './utils'\nimport { parseMoveType } from '../aptos-codegen/typegen'\n\nexport type EventInstance = Event & {\n  version: string\n}\n\nexport type TypedEventInstance<T> = EventInstance & {\n  // Typed data converted from ABI\n  // undefined if there is converting error, usually because the ABI/data\n  // mismatch\n  data_typed: T\n}\n\n// Don't use intermedidate type to make IDE happier\nexport type TypedEntryFunctionPayload<T extends Array<any>> = TransactionPayload_EntryFunctionPayload & {\n  arguments_typed: T\n}\n\nexport class TypeDescriptor {\n  // type: string\n\n  // qualified name without type parameters\n  qname: string\n  // account?: string\n  // module?: string\n\n  typeArgs: TypeDescriptor[]\n\n  constructor(symbol: string, typeParams?: TypeDescriptor[]) {\n    this.qname = symbol\n    this.typeArgs = typeParams || []\n  }\n\n  // Replace T0, T1 with more concrete type\n  applyArgs(ctx: Map<string, TypeDescriptor>): TypeDescriptor {\n    const replace = ctx.get(this.qname)\n    if (replace) {\n      return replace\n    }\n    if (ctx.size === 0 || this.typeArgs.length === 0) {\n      return this\n    }\n\n    const typeArgs: TypeDescriptor[] = []\n    for (const arg of this.typeArgs) {\n      const replace = ctx.get(arg.qname)\n      if (replace) {\n        typeArgs.push(replace)\n      } else {\n        typeArgs.push(arg.applyArgs(ctx))\n      }\n    }\n    return new TypeDescriptor(this.qname, typeArgs)\n  }\n\n  // all depended types including itself, not include system type\n  dependedTypes(): string[] {\n    if (this.qname.startsWith('&')) {\n      return []\n    }\n    switch (this.qname) {\n      case 'signer':\n      case 'address':\n      case '0x1::string::String':\n      case 'bool':\n      case 'u8':\n      case 'u16':\n      case 'u32':\n      case 'u64':\n      case 'u128':\n        return []\n    }\n\n    // Type parameters are not depended\n    if (this.qname.indexOf(SPLITTER) == -1) {\n      if (this.qname.startsWith('T')) {\n        return []\n      }\n    }\n\n    const types = new Set<string>()\n    for (const param of this.typeArgs) {\n      param.dependedTypes().forEach((t) => types.add(t))\n    }\n\n    if (this.qname !== VECTOR_STR) {\n      types.add(this.qname)\n    }\n\n    return Array.from(types)\n  }\n}\n\nexport class TypeRegistry {\n  moduleMapping = new Map<string, MoveModule>()\n  typeMapping = new Map<string, MoveStruct>()\n  funcMapping = new Map<string, MoveFunction>()\n\n  contains(account: string, name: string) {\n    return this.moduleMapping.has(account + '::' + name)\n  }\n\n  load(module: MoveModule) {\n    if (this.contains(module.address, module.name)) {\n      return\n    }\n    this.moduleMapping.set(moduleQname(module), module)\n\n    for (const struct of module.structs) {\n      // TODO move to util\n      const key = [module.address, module.name, struct.name].join(SPLITTER)\n      this.typeMapping.set(key, struct)\n    }\n\n    for (const func of module.exposed_functions) {\n      if (!func.is_entry) {\n        continue\n      }\n      const key = [module.address, module.name, func.name].join(SPLITTER)\n      this.funcMapping.set(key, func)\n    }\n  }\n\n  getMoveStruct(type: string): MoveStruct {\n    const struct = this.typeMapping.get(type)\n    if (!struct) {\n      throw new Error('Failed to load type' + type)\n    }\n    return struct\n  }\n\n  getMoveFunction(type: string): MoveFunction {\n    const func = this.funcMapping.get(type)\n    if (!func) {\n      throw new Error('Failed to load function' + type)\n    }\n    return func\n  }\n\n  decode(data: any, type: TypeDescriptor): any {\n    // process simple type\n    if (type.qname.startsWith('&')) {\n      return data\n    }\n    switch (type.qname) {\n      case 'signer': // TODO check this\n      case 'address':\n      case '0x1::string::String':\n      case 'bool':\n      case 'u8':\n      case 'u16':\n      case 'u32':\n        return data\n      case 'u64':\n      case 'u128':\n        return BigInt(data)\n    }\n\n    // process vector\n    if (type.qname === VECTOR_STR) {\n      // vector<u8> as hex string\n      if (type.typeArgs[0].qname === 'u8') {\n        return data\n      }\n\n      const res = []\n      for (const entry of data) {\n        res.push(this.decode(entry, type.typeArgs[0]))\n      }\n      return res\n    }\n\n    // Process complex type\n    const struct = this.getMoveStruct(type.qname)\n\n    const typeCtx = new Map<string, TypeDescriptor>()\n    for (const [idx, typeArg] of type.typeArgs.entries()) {\n      typeCtx.set('T' + idx, typeArg)\n    }\n\n    const typedData: any = {}\n\n    for (const field of struct.fields) {\n      let filedType = parseMoveType(field.type)\n      filedType = filedType.applyArgs(typeCtx)\n      const value = this.decode(data[field.name], filedType)\n      typedData[field.name] = value\n    }\n    return typedData\n  }\n\n  // private decodeInternal(data: any, type: TypeDescriptor, typeArgs: )\n}\n\nexport const GLOBAL_TYPE_REGISTRY = new TypeRegistry()\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/aptos/types.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Event,\n  MoveFunction,\n  MoveModule,\n  MoveStruct,\n  TransactionPayload_EntryFunctionPayload,\n} from 'aptos/src/generated'\nimport { moduleQname, SPLITTER, VECTOR_STR } from './utils'\nimport { parseMoveType } from '../aptos-codegen/typegen'\n\nexport type EventInstance = Event & {\n  version: string\n}\n\nexport type TypedEventInstance<T> = EventInstance & {\n  // Typed data converted from ABI\n  // undefined if there is converting error, usually because the ABI/data\n  // mismatch\n  data_typed: T\n\n  type_arguments: string[]\n}\n\n// Don't use intermedidate type to make IDE happier\nexport type TypedEntryFunctionPayload<T extends Array<any>> = TransactionPayload_EntryFunctionPayload & {\n  arguments_typed: T\n}\n\nexport class TypeDescriptor {\n  // type: string\n\n  // qualified name without type parameters\n  qname: string\n  // account?: string\n  // module?: string\n\n  typeArgs: TypeDescriptor[]\n\n  constructor(symbol: string, typeParams?: TypeDescriptor[]) {\n    this.qname = symbol\n    this.typeArgs = typeParams || []\n  }\n\n  getSignature(): string {\n    if (this.typeArgs.length > 0) {\n      return this.qname + '<' + this.typeArgs.map((t) => t.getSignature()).join(', ') + '>'\n    }\n    return this.qname\n  }\n\n  // Replace T0, T1 with more concrete type\n  applyTypeArgs(ctx: Map<string, TypeDescriptor>): TypeDescriptor {\n    const replace = ctx.get(this.qname)\n    if (replace) {\n      return replace\n    }\n    if (ctx.size === 0 || this.typeArgs.length === 0) {\n      return this\n    }\n\n    const typeArgs: TypeDescriptor[] = []\n    for (const arg of this.typeArgs) {\n      const replace = ctx.get(arg.qname)\n      if (replace) {\n        typeArgs.push(replace)\n      } else {\n        typeArgs.push(arg.applyTypeArgs(ctx))\n      }\n    }\n    return new TypeDescriptor(this.qname, typeArgs)\n  }\n\n  // all depended types including itself, not include system type\n  dependedTypes(): string[] {\n    if (this.qname.startsWith('&')) {\n      return []\n    }\n    switch (this.qname) {\n      case 'signer':\n      case 'address':\n      case '0x1::string::String':\n      case 'bool':\n      case 'u8':\n      case 'u16':\n      case 'u32':\n      case 'u64':\n      case 'u128':\n        return []\n    }\n\n    // Type parameters are not depended\n    if (this.qname.indexOf(SPLITTER) == -1) {\n      if (this.qname.startsWith('T')) {\n        return []\n      }\n    }\n\n    const types = new Set<string>()\n    for (const param of this.typeArgs) {\n      param.dependedTypes().forEach((t) => types.add(t))\n    }\n\n    if (this.qname !== VECTOR_STR) {\n      types.add(this.qname)\n    }\n\n    return Array.from(types)\n  }\n}\n\nexport class TypeRegistry {\n  moduleMapping = new Map<string, MoveModule>()\n  typeMapping = new Map<string, MoveStruct>()\n  funcMapping = new Map<string, MoveFunction>()\n\n  contains(account: string, name: string) {\n    return this.moduleMapping.has(account + '::' + name)\n  }\n\n  load(module: MoveModule) {\n    if (this.contains(module.address, module.name)) {\n      return\n    }\n    this.moduleMapping.set(moduleQname(module), module)\n\n    for (const struct of module.structs) {\n      // TODO move to util\n      const key = [module.address, module.name, struct.name].join(SPLITTER)\n      this.typeMapping.set(key, struct)\n    }\n\n    for (const func of module.exposed_functions) {\n      if (!func.is_entry) {\n        continue\n      }\n      const key = [module.address, module.name, func.name].join(SPLITTER)\n      this.funcMapping.set(key, func)\n    }\n  }\n\n  getMoveStruct(type: string): MoveStruct {\n    const struct = this.typeMapping.get(type)\n    if (!struct) {\n      throw new Error('Failed to load type' + type)\n    }\n    return struct\n  }\n\n  getMoveFunction(type: string): MoveFunction {\n    const func = this.funcMapping.get(type)\n    if (!func) {\n      throw new Error('Failed to load function' + type)\n    }\n    return func\n  }\n\n  decode(data: any, type: TypeDescriptor): any {\n    // process simple type\n    if (type.qname.startsWith('&')) {\n      return data\n    }\n    switch (type.qname) {\n      case 'signer': // TODO check this\n      case 'address':\n      case '0x1::string::String':\n      case 'bool':\n      case 'u8':\n      case 'u16':\n      case 'u32':\n        return data\n      case 'u64':\n      case 'u128':\n        return BigInt(data)\n    }\n\n    // process vector\n    if (type.qname === VECTOR_STR) {\n      // vector<u8> as hex string\n      if (type.typeArgs[0].qname === 'u8') {\n        return data\n      }\n\n      const res = []\n      for (const entry of data) {\n        res.push(this.decode(entry, type.typeArgs[0]))\n      }\n      return res\n    }\n\n    // Process complex type\n    const struct = this.getMoveStruct(type.qname)\n\n    const typeCtx = new Map<string, TypeDescriptor>()\n    for (const [idx, typeArg] of type.typeArgs.entries()) {\n      typeCtx.set('T' + idx, typeArg)\n    }\n\n    const typedData: any = {}\n\n    for (const field of struct.fields) {\n      let filedType = parseMoveType(field.type)\n      filedType = filedType.applyTypeArgs(typeCtx)\n      const value = this.decode(data[field.name], filedType)\n      typedData[field.name] = value\n    }\n    return typedData\n  }\n\n  // private decodeInternal(data: any, type: TypeDescriptor, typeArgs: )\n}\n\nexport const GLOBAL_TYPE_REGISTRY = new TypeRegistry()\n"]}

package/lib/aptos-codegen/codegen.js

@@ -179,15 +179,17 @@ function generateModule(moduleByteCode, dependedModules) {
 }
 function generateStructs(module, struct) {
     const genericString = generateStructTypeParameters(struct);
+    const genericStringAny = generateStructTypeParameters(struct, true);
     const fields = struct.fields.map((field) => {
         return `${field.name}: ${(0, typegen_1.generateType)(field.type)}`;
     });
     let eventPayload = '';
     if (isEvent(struct)) {
         eventPayload = `
-    export interface ${struct.name}Instance${genericString} extends 
-        aptos.TypedEventInstance<${struct.name}${genericString}> {
-      data_typed: ${struct.name}${genericString}
+    export interface ${struct.name}Instance extends 
+        aptos.TypedEventInstance<${struct.name}${genericStringAny}> {
+      data_typed: ${struct.name}${genericStringAny}
+      type_arguments: [${struct.generic_type_params.map((_) => 'string').join(', ')}]
     }
     `;
     }
@@ -199,24 +201,24 @@ function generateStructs(module, struct) {
   ${eventPayload}
   `;
 }
-function generateFunctionTypeParameters(func) {
-    let genericString = '';
-    if (func.generic_type_params && func.generic_type_params.length > 0) {
-        const params = func.generic_type_params
-            .map((v, idx) => {
-            return 'T' + idx;
-        })
-            .join(',');
-        genericString = `<${params}>`;
-    }
-    return genericString;
-}
-function generateStructTypeParameters(struct) {
+// function generateFunctionTypeParameters(func: MoveFunction) {
+//   let genericString = ''
+//   if (func.generic_type_params && func.generic_type_params.length > 0) {
+//     const params = func.generic_type_params
+//       .map((v, idx) => {
+//         return 'T' + idx
+//       })
+//       .join(',')
+//     genericString = `<${params}>`
+//   }
+//   return genericString
+// }
+function generateStructTypeParameters(struct, useAny = false) {
     let genericString = '';
     if (struct.generic_type_params && struct.generic_type_params.length > 0) {
         const params = struct.generic_type_params
             .map((v, idx) => {
-            return 'T' + idx;
+            return useAny ? 'any' : 'T' + idx;
         })
             .join(',');
         genericString = `<${params}>`;
@@ -233,11 +235,12 @@ function generateCallArgsStructs(module, func) {
         return `${(0, typegen_1.generateType)(param)}`;
     });
     const camelFuncName = capitalizeFirstChar(camelize(func.name));
-    const genericString = generateFunctionTypeParameters(func);
+    // const genericString = generateFunctionTypeParameters(func)
     return `
-  export interface ${camelFuncName}Payload${genericString} 
+  export interface ${camelFuncName}Payload
       extends aptos.TypedEntryFunctionPayload<[${fields.join(',')}]> {
-    arguments_typed: [${fields.join(',')}]
+    arguments_typed: [${fields.join(',')}],
+    type_arguments: [${func.generic_type_params.map((_) => 'string').join(', ')}]
   }
   `;
 }
@@ -245,10 +248,10 @@ function generateOnEntryFunctions(module, func) {
     if (!func.is_entry) {
         return '';
     }
-    const genericString = generateFunctionTypeParameters(func);
+    // const genericString = generateFunctionTypeParameters(func)
     const camelFuncName = capitalizeFirstChar(camelize(func.name));
     const source = `
-  onEntry${camelFuncName}${genericString}(func: (call: ${module.name}.${camelFuncName}Payload${genericString}, ctx: aptos.AptosContext) => void, filter?: aptos.CallFilter): ${module.name} {
+  onEntry${camelFuncName}(func: (call: ${module.name}.${camelFuncName}Payload, ctx: aptos.AptosContext) => void, filter?: aptos.CallFilter): ${module.name} {
     this.onEntryFunctionCall(func, {
       ...filter,
       function: '${module.name}::${func.name}'
@@ -265,9 +268,9 @@ function generateOnEvents(module, struct) {
     if (!isEvent(struct)) {
         return '';
     }
-    const genericString = generateStructTypeParameters(struct);
+    // const genericString = generateStructTypeParameters(struct)
     const source = `
-  onEvent${struct.name}${genericString}(func: (event: ${module.name}.${struct.name}Instance${genericString}, ctx: aptos.AptosContext) => void): ${module.name} {
+  onEvent${struct.name}(func: (event: ${module.name}.${struct.name}Instance, ctx: aptos.AptosContext) => void): ${module.name} {
     this.onEvent(func, {
       type: '${module.name}::${struct.name}'
     })

package/lib/aptos-codegen/codegen.js.map

@@ -1 +1 @@
-{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../src/aptos-codegen/codegen.ts"],"names":[],"mappings":"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","sourcesContent":["import fs from 'fs'\nimport path from 'path'\nimport prettier from 'prettier'\nimport { MoveFunction, MoveModule, MoveStruct, MoveModuleBytecode } from 'aptos/src/generated'\nimport { generateType, AccountRegister } from './typegen'\nimport { isFrameworkAccount } from '../aptos/utils'\n\nexport function generate(srcDir: string, outputDir: string) {\n  const files = fs.readdirSync(srcDir)\n  outputDir = path.resolve(outputDir)\n\n  fs.mkdirSync(outputDir, { recursive: true })\n\n  const loader = new AccountRegister()\n\n  // The first path, identify import relation and module name (filename) of those imports\n  for (const file of files) {\n    if (!file.endsWith('.json')) {\n      continue\n    }\n    // Reading file is duplicated, but since they are small files probably file\n    // TODO add file manager class\n    const json = fs.readFileSync(path.join(srcDir, file), 'utf-8')\n    const modules = JSON.parse(json)\n\n    for (const module of modules) {\n      if (module.abi) {\n        loader.register(module.abi, path.basename(file, '.json'))\n      }\n    }\n  }\n\n  for (const file of files) {\n    if (!file.endsWith('.json')) {\n      continue\n    }\n    const codeGen = new AccountCodegen(loader, {\n      srcFile: path.join(srcDir, file),\n      outputDir: outputDir,\n    })\n\n    codeGen.generate()\n  }\n\n  // when generating user code, don't need to generate framework account\n  loader.pendingAccounts.delete('0x1')\n  loader.pendingAccounts.delete('0x2')\n  loader.pendingAccounts.delete('0x3')\n\n  if (loader.pendingAccounts.size > 0) {\n    // TODO automatic download dependencies\n    console.error('Missing ABIs from the following accounts', loader.pendingAccounts)\n  }\n}\n\ninterface Config {\n  srcFile: string\n  outputDir: string\n}\n\nexport class AccountCodegen {\n  modules: MoveModuleBytecode[]\n  config: Config\n  loader: AccountRegister\n\n  constructor(loader: AccountRegister, config: Config) {\n    const json = fs.readFileSync(config.srcFile, 'utf-8')\n    this.modules = JSON.parse(json)\n    this.config = config\n    this.loader = loader\n  }\n\n  generate() {\n    if (!this.modules) {\n      return\n    }\n    const baseName = path.basename(this.config.srcFile, '.json')\n\n    let address: string | undefined\n    for (const module of this.modules) {\n      if (module.abi && module.abi.address) {\n        address = module.abi.address\n      }\n    }\n    if (!address) {\n      return\n    }\n\n    const imports = `\n    import { aptos } from \"@sentio/sdk\"\n    import { Address, MoveModule } from \"aptos/src/generated\"\n    `\n\n    const dependedAccounts: string[] = []\n\n    const moduleImports: string[] = []\n\n    const info = this.loader.accountImports.get(address)\n\n    if (info) {\n      for (const [account, moduleImported] of info.imports.entries()) {\n        // Remap to user's filename if possible, TODO codepath not well tested\n        let tsAccountModule = './' + (this.loader.accountImports.get(account)?.moduleName || account)\n        if (isFrameworkAccount(account) && !isFrameworkAccount(address)) {\n          // Decide where to find runtime library\n          let srcRoot = 'lib'\n          if (__dirname.includes('sdk/src/aptos-codegen')) {\n            srcRoot = 'src'\n          }\n          tsAccountModule = `@sentio/sdk/${srcRoot}/builtin/aptos/${account}`\n        }\n        const items = Array.from(moduleImported)\n        moduleImports.push(`import { ${items.join(',')} } from \"${tsAccountModule}\"`)\n\n        // Ideally we should use per module's load types, but it doesn't matter since we are loading the entire\n        // account modules anyway\n        items.forEach((m) => dependedAccounts.push(m))\n      }\n    }\n\n    let source = `\n    /* Autogenerated file. Do not edit manually. */\n    /* tslint:disable */\n    /* eslint-disable */\n  \n    /* Generated modules for account ${address} */\n  \n    ${imports}\n    \n    ${moduleImports.join('\\n')}\n    \n    ${this.modules.map((m) => generateModule(m, dependedAccounts)).join('\\n')}\n    \n    function loadAllTypes(registry: aptos.TypeRegistry) {\n      ${dependedAccounts.map((m) => `${m}.loadTypes(registry)`).join('\\n')}\n\n      ${this.modules\n        .map((m) => {\n          return `registry.load(${m.abi?.name}.ABI)`\n        })\n        .join('\\n')}\n    }\n    ` // source\n\n    source = prettier.format(source, { parser: 'typescript' })\n    fs.writeFileSync(path.join(this.config.outputDir, baseName + '.ts'), source)\n  }\n}\n\nfunction generateModule(moduleByteCode: MoveModuleBytecode, dependedModules: string[]) {\n  if (!moduleByteCode.abi) {\n    return ''\n  }\n  const module = moduleByteCode.abi\n\n  const functions = module.exposed_functions.map((f) => generateOnEntryFunctions(module, f)).filter((s) => s !== '')\n  const events = module.structs.map((e) => generateOnEvents(module, e)).filter((s) => s !== '')\n  const structs = module.structs.map((s) => generateStructs(module, s))\n  const callArgs = module.exposed_functions.map((f) => generateCallArgsStructs(module, f))\n\n  let processor = ''\n  if (functions.length > 0 || events.length > 0) {\n    processor = `export class ${module.name} extends aptos.AptosBaseProcessor {\n\n    constructor(options: aptos.AptosBindOptions) {\n      super(\"${module.name}\", options)\n    }\n    static DEFAULT_OPTIONS: aptos.AptosBindOptions = {\n      address: \"${module.address}\",\n      network: aptos.AptosNetwork.TEST_NET       \n    }\n\n    static bind(options: Partial<aptos.AptosBindOptions> = {}): ${module.name} {\n      return new ${module.name}({ ...${module.name}.DEFAULT_OPTIONS, ...options })\n    }\n    \n    ${functions.join('\\n')}\n    \n    ${events.join('\\n')}\n    \n    loadTypesInternal(registry: aptos.TypeRegistry) {\n      loadAllTypes(registry)\n    }\n  }\n  `\n  }\n\n  return `\n  ${processor}\n\n  export namespace ${module.name} {\n    ${structs.join('\\n')}\n    \n    ${callArgs.join('\\n')}\n       \n    export function loadTypes(registry: aptos.TypeRegistry) {\n      loadAllTypes(registry)\n    }\n    export const ABI: MoveModule = JSON.parse('${JSON.stringify(module)}')\n }\n  `\n}\n\nfunction generateStructs(module: MoveModule, struct: MoveStruct) {\n  const genericString = generateStructTypeParameters(struct)\n\n  const fields = struct.fields.map((field) => {\n    return `${field.name}: ${generateType(field.type)}`\n  })\n\n  let eventPayload = ''\n  if (isEvent(struct)) {\n    eventPayload = `\n    export interface ${struct.name}Instance${genericString} extends \n        aptos.TypedEventInstance<${struct.name}${genericString}> {\n      data_typed: ${struct.name}${genericString}\n    }\n    `\n  }\n\n  return `\n  export class ${struct.name}${genericString} {\n    ${fields.join('\\n')} \n  }\n  \n  ${eventPayload}\n  `\n}\n\nfunction generateFunctionTypeParameters(func: MoveFunction) {\n  let genericString = ''\n  if (func.generic_type_params && func.generic_type_params.length > 0) {\n    const params = func.generic_type_params\n      .map((v, idx) => {\n        return 'T' + idx\n      })\n      .join(',')\n    genericString = `<${params}>`\n  }\n  return genericString\n}\n\nfunction generateStructTypeParameters(struct: MoveStruct) {\n  let genericString = ''\n\n  if (struct.generic_type_params && struct.generic_type_params.length > 0) {\n    const params = struct.generic_type_params\n      .map((v, idx) => {\n        return 'T' + idx\n      })\n      .join(',')\n    genericString = `<${params}>`\n  }\n  return genericString\n}\n\nfunction generateCallArgsStructs(module: MoveModule, func: MoveFunction) {\n  if (!func.is_entry) {\n    return\n  }\n\n  // the first param is always signer so ignore\n  // TODO check if there is any edge case\n  const fields = func.params.slice(1).map((param) => {\n    return `${generateType(param)}`\n  })\n\n  const camelFuncName = capitalizeFirstChar(camelize(func.name))\n\n  const genericString = generateFunctionTypeParameters(func)\n  return `\n  export interface ${camelFuncName}Payload${genericString} \n      extends aptos.TypedEntryFunctionPayload<[${fields.join(',')}]> {\n    arguments_typed: [${fields.join(',')}]\n  }\n  `\n}\n\nfunction generateOnEntryFunctions(module: MoveModule, func: MoveFunction) {\n  if (!func.is_entry) {\n    return ''\n  }\n\n  const genericString = generateFunctionTypeParameters(func)\n\n  const camelFuncName = capitalizeFirstChar(camelize(func.name))\n  const source = `\n  onEntry${camelFuncName}${genericString}(func: (call: ${module.name}.${camelFuncName}Payload${genericString}, ctx: aptos.AptosContext) => void, filter?: aptos.CallFilter): ${module.name} {\n    this.onEntryFunctionCall(func, {\n      ...filter,\n      function: '${module.name}::${func.name}'\n    })\n    return this\n  }`\n\n  return source\n}\n\nfunction isEvent(struct: MoveStruct) {\n  return struct.abilities.includes('drop') && struct.abilities.includes('store') && struct.name.endsWith('Event')\n}\n\nfunction generateOnEvents(module: MoveModule, struct: MoveStruct): string {\n  // for struct that has drop + store\n  if (!isEvent(struct)) {\n    return ''\n  }\n\n  const genericString = generateStructTypeParameters(struct)\n\n  const source = `\n  onEvent${struct.name}${genericString}(func: (event: ${module.name}.${struct.name}Instance${genericString}, ctx: aptos.AptosContext) => void): ${module.name} {\n    this.onEvent(func, {\n      type: '${module.name}::${struct.name}'\n    })\n    return this\n  }\n  `\n  return source\n}\n\nfunction camelize(input: string): string {\n  return input\n    .split('_')\n    .reduce(\n      (res, word, i) =>\n        i === 0 ? word.toLowerCase() : `${res}${word.charAt(0).toUpperCase()}${word.substr(1).toLowerCase()}`,\n      ''\n    )\n}\n\nfunction capitalizeFirstChar(input: string): string {\n  if (!input) {\n    return input\n  }\n  return input[0].toUpperCase() + (input.length > 1 ? input.substring(1) : '')\n}\n"]}
+{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../src/aptos-codegen/codegen.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AACvB,wDAA+B;AAE/B,uCAAyD;AACzD,0CAAmD;AAEnD,SAAgB,QAAQ,CAAC,MAAc,EAAE,SAAiB;IACxD,MAAM,KAAK,GAAG,YAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;IACpC,SAAS,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IAEnC,YAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAE5C,MAAM,MAAM,GAAG,IAAI,yBAAe,EAAE,CAAA;IAEpC,uFAAuF;IACvF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC3B,SAAQ;SACT;QACD,2EAA2E;QAC3E,8BAA8B;QAC9B,MAAM,IAAI,GAAG,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAA;QAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAEhC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,MAAM,CAAC,GAAG,EAAE;gBACd,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,cAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAA;aAC1D;SACF;KACF;IAED,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC3B,SAAQ;SACT;QACD,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,MAAM,EAAE;YACzC,OAAO,EAAE,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC;YAChC,SAAS,EAAE,SAAS;SACrB,CAAC,CAAA;QAEF,OAAO,CAAC,QAAQ,EAAE,CAAA;KACnB;IAED,sEAAsE;IACtE,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACpC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACpC,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAEpC,IAAI,MAAM,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,EAAE;QACnC,uCAAuC;QACvC,OAAO,CAAC,KAAK,CAAC,0CAA0C,EAAE,MAAM,CAAC,eAAe,CAAC,CAAA;KAClF;AACH,CAAC;AA9CD,4BA8CC;AAOD,MAAa,cAAc;IACzB,OAAO,CAAsB;IAC7B,MAAM,CAAQ;IACd,MAAM,CAAiB;IAEvB,YAAY,MAAuB,EAAE,MAAc;QACjD,MAAM,IAAI,GAAG,YAAE,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QACrD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,OAAM;SACP;QACD,MAAM,QAAQ,GAAG,cAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAE5D,IAAI,OAA2B,CAAA;QAC/B,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;YACjC,IAAI,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE;gBACpC,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAA;aAC7B;SACF;QACD,IAAI,CAAC,OAAO,EAAE;YACZ,OAAM;SACP;QAED,MAAM,OAAO,GAAG;;;KAGf,CAAA;QAED,MAAM,gBAAgB,GAAa,EAAE,CAAA;QAErC,MAAM,aAAa,GAAa,EAAE,CAAA;QAElC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAEpD,IAAI,IAAI,EAAE;YACR,KAAK,MAAM,CAAC,OAAO,EAAE,cAAc,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE;gBAC9D,sEAAsE;gBACtE,IAAI,eAAe,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,UAAU,IAAI,OAAO,CAAC,CAAA;gBAC7F,IAAI,IAAA,0BAAkB,EAAC,OAAO,CAAC,IAAI,CAAC,IAAA,0BAAkB,EAAC,OAAO,CAAC,EAAE;oBAC/D,uCAAuC;oBACvC,IAAI,OAAO,GAAG,KAAK,CAAA;oBACnB,IAAI,SAAS,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE;wBAC/C,OAAO,GAAG,KAAK,CAAA;qBAChB;oBACD,eAAe,GAAG,eAAe,OAAO,kBAAkB,OAAO,EAAE,CAAA;iBACpE;gBACD,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;gBACxC,aAAa,CAAC,IAAI,CAAC,YAAY,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,eAAe,GAAG,CAAC,CAAA;gBAE7E,uGAAuG;gBACvG,yBAAyB;gBACzB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;aAC/C;SACF;QAED,IAAI,MAAM,GAAG;;;;;uCAKsB,OAAO;;MAExC,OAAO;;MAEP,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;;MAExB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;;;QAGrE,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;;QAElE,IAAI,CAAC,OAAO;aACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,OAAO,iBAAiB,CAAC,CAAC,GAAG,EAAE,IAAI,OAAO,CAAA;QAC5C,CAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC;;KAEd,CAAA,CAAC,SAAS;QAEX,MAAM,GAAG,kBAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAA;QAC1D,YAAE,CAAC,aAAa,CAAC,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,GAAG,KAAK,CAAC,EAAE,MAAM,CAAC,CAAA;IAC9E,CAAC;CACF;AAvFD,wCAuFC;AAED,SAAS,cAAc,CAAC,cAAkC,EAAE,eAAyB;IACnF,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE;QACvB,OAAO,EAAE,CAAA;KACV;IACD,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAA;IAEjC,MAAM,SAAS,GAAG,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,wBAAwB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;IAClH,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;IAC7F,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAA;IACrE,MAAM,QAAQ,GAAG,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,uBAAuB,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAA;IAExF,IAAI,SAAS,GAAG,EAAE,CAAA;IAClB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QAC7C,SAAS,GAAG,gBAAgB,MAAM,CAAC,IAAI;;;eAG5B,MAAM,CAAC,IAAI;;;kBAGR,MAAM,CAAC,OAAO;;;;kEAIkC,MAAM,CAAC,IAAI;mBAC1D,MAAM,CAAC,IAAI,SAAS,MAAM,CAAC,IAAI;;;MAG5C,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;;MAEpB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;;GAMpB,CAAA;KACA;IAED,OAAO;IACL,SAAS;;qBAEQ,MAAM,CAAC,IAAI;MAC1B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;;MAElB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;;;;;iDAKwB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;;GAEpE,CAAA;AACH,CAAC;AAED,SAAS,eAAe,CAAC,MAAkB,EAAE,MAAkB;IAC7D,MAAM,aAAa,GAAG,4BAA4B,CAAC,MAAM,CAAC,CAAA;IAC1D,MAAM,gBAAgB,GAAG,4BAA4B,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAEnE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACzC,OAAO,GAAG,KAAK,CAAC,IAAI,KAAK,IAAA,sBAAY,EAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAA;IACrD,CAAC,CAAC,CAAA;IAEF,IAAI,YAAY,GAAG,EAAE,CAAA;IACrB,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE;QACnB,YAAY,GAAG;uBACI,MAAM,CAAC,IAAI;mCACC,MAAM,CAAC,IAAI,GAAG,gBAAgB;oBAC7C,MAAM,CAAC,IAAI,GAAG,gBAAgB;yBACzB,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;;KAE9E,CAAA;KACF;IAED,OAAO;iBACQ,MAAM,CAAC,IAAI,GAAG,aAAa;MACtC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;;;IAGnB,YAAY;GACb,CAAA;AACH,CAAC;AAED,gEAAgE;AAChE,2BAA2B;AAC3B,2EAA2E;AAC3E,8CAA8C;AAC9C,2BAA2B;AAC3B,2BAA2B;AAC3B,WAAW;AACX,mBAAmB;AACnB,oCAAoC;AACpC,MAAM;AACN,yBAAyB;AACzB,IAAI;AAEJ,SAAS,4BAA4B,CAAC,MAAkB,EAAE,MAAM,GAAG,KAAK;IACtE,IAAI,aAAa,GAAG,EAAE,CAAA;IAEtB,IAAI,MAAM,CAAC,mBAAmB,IAAI,MAAM,CAAC,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE;QACvE,MAAM,MAAM,GAAG,MAAM,CAAC,mBAAmB;aACtC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;YACd,OAAO,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAA;QACnC,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,CAAA;QACZ,aAAa,GAAG,IAAI,MAAM,GAAG,CAAA;KAC9B;IACD,OAAO,aAAa,CAAA;AACtB,CAAC;AAED,SAAS,uBAAuB,CAAC,MAAkB,EAAE,IAAkB;IACrE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;QAClB,OAAM;KACP;IAED,6CAA6C;IAC7C,uCAAuC;IACvC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAChD,OAAO,GAAG,IAAA,sBAAY,EAAC,KAAK,CAAC,EAAE,CAAA;IACjC,CAAC,CAAC,CAAA;IAEF,MAAM,aAAa,GAAG,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAE9D,6DAA6D;IAC7D,OAAO;qBACY,aAAa;iDACe,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;wBACzC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;uBACjB,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;;GAE5E,CAAA;AACH,CAAC;AAED,SAAS,wBAAwB,CAAC,MAAkB,EAAE,IAAkB;IACtE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;QAClB,OAAO,EAAE,CAAA;KACV;IAED,6DAA6D;IAE7D,MAAM,aAAa,GAAG,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAC9D,MAAM,MAAM,GAAG;WACN,aAAa,iBAAiB,MAAM,CAAC,IAAI,IAAI,aAAa,0EAA0E,MAAM,CAAC,IAAI;;;mBAGvI,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI;;;IAGxC,CAAA;IAEF,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,OAAO,CAAC,MAAkB;IACjC,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;AACjH,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAkB,EAAE,MAAkB;IAC9D,mCAAmC;IACnC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACpB,OAAO,EAAE,CAAA;KACV;IAED,6DAA6D;IAE7D,MAAM,MAAM,GAAG;WACN,MAAM,CAAC,IAAI,kBAAkB,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,gDAAgD,MAAM,CAAC,IAAI;;eAE9G,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI;;;;GAIvC,CAAA;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC7B,OAAO,KAAK;SACT,KAAK,CAAC,GAAG,CAAC;SACV,MAAM,CACL,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,CACf,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,EACvG,EAAE,CACH,CAAA;AACL,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAa;IACxC,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,KAAK,CAAA;KACb;IACD,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;AAC9E,CAAC","sourcesContent":["import fs from 'fs'\nimport path from 'path'\nimport prettier from 'prettier'\nimport { MoveFunction, MoveModule, MoveStruct, MoveModuleBytecode } from 'aptos/src/generated'\nimport { generateType, AccountRegister } from './typegen'\nimport { isFrameworkAccount } from '../aptos/utils'\n\nexport function generate(srcDir: string, outputDir: string) {\n  const files = fs.readdirSync(srcDir)\n  outputDir = path.resolve(outputDir)\n\n  fs.mkdirSync(outputDir, { recursive: true })\n\n  const loader = new AccountRegister()\n\n  // The first path, identify import relation and module name (filename) of those imports\n  for (const file of files) {\n    if (!file.endsWith('.json')) {\n      continue\n    }\n    // Reading file is duplicated, but since they are small files probably file\n    // TODO add file manager class\n    const json = fs.readFileSync(path.join(srcDir, file), 'utf-8')\n    const modules = JSON.parse(json)\n\n    for (const module of modules) {\n      if (module.abi) {\n        loader.register(module.abi, path.basename(file, '.json'))\n      }\n    }\n  }\n\n  for (const file of files) {\n    if (!file.endsWith('.json')) {\n      continue\n    }\n    const codeGen = new AccountCodegen(loader, {\n      srcFile: path.join(srcDir, file),\n      outputDir: outputDir,\n    })\n\n    codeGen.generate()\n  }\n\n  // when generating user code, don't need to generate framework account\n  loader.pendingAccounts.delete('0x1')\n  loader.pendingAccounts.delete('0x2')\n  loader.pendingAccounts.delete('0x3')\n\n  if (loader.pendingAccounts.size > 0) {\n    // TODO automatic download dependencies\n    console.error('Missing ABIs from the following accounts', loader.pendingAccounts)\n  }\n}\n\ninterface Config {\n  srcFile: string\n  outputDir: string\n}\n\nexport class AccountCodegen {\n  modules: MoveModuleBytecode[]\n  config: Config\n  loader: AccountRegister\n\n  constructor(loader: AccountRegister, config: Config) {\n    const json = fs.readFileSync(config.srcFile, 'utf-8')\n    this.modules = JSON.parse(json)\n    this.config = config\n    this.loader = loader\n  }\n\n  generate() {\n    if (!this.modules) {\n      return\n    }\n    const baseName = path.basename(this.config.srcFile, '.json')\n\n    let address: string | undefined\n    for (const module of this.modules) {\n      if (module.abi && module.abi.address) {\n        address = module.abi.address\n      }\n    }\n    if (!address) {\n      return\n    }\n\n    const imports = `\n    import { aptos } from \"@sentio/sdk\"\n    import { Address, MoveModule } from \"aptos/src/generated\"\n    `\n\n    const dependedAccounts: string[] = []\n\n    const moduleImports: string[] = []\n\n    const info = this.loader.accountImports.get(address)\n\n    if (info) {\n      for (const [account, moduleImported] of info.imports.entries()) {\n        // Remap to user's filename if possible, TODO codepath not well tested\n        let tsAccountModule = './' + (this.loader.accountImports.get(account)?.moduleName || account)\n        if (isFrameworkAccount(account) && !isFrameworkAccount(address)) {\n          // Decide where to find runtime library\n          let srcRoot = 'lib'\n          if (__dirname.includes('sdk/src/aptos-codegen')) {\n            srcRoot = 'src'\n          }\n          tsAccountModule = `@sentio/sdk/${srcRoot}/builtin/aptos/${account}`\n        }\n        const items = Array.from(moduleImported)\n        moduleImports.push(`import { ${items.join(',')} } from \"${tsAccountModule}\"`)\n\n        // Ideally we should use per module's load types, but it doesn't matter since we are loading the entire\n        // account modules anyway\n        items.forEach((m) => dependedAccounts.push(m))\n      }\n    }\n\n    let source = `\n    /* Autogenerated file. Do not edit manually. */\n    /* tslint:disable */\n    /* eslint-disable */\n  \n    /* Generated modules for account ${address} */\n  \n    ${imports}\n    \n    ${moduleImports.join('\\n')}\n    \n    ${this.modules.map((m) => generateModule(m, dependedAccounts)).join('\\n')}\n    \n    function loadAllTypes(registry: aptos.TypeRegistry) {\n      ${dependedAccounts.map((m) => `${m}.loadTypes(registry)`).join('\\n')}\n\n      ${this.modules\n        .map((m) => {\n          return `registry.load(${m.abi?.name}.ABI)`\n        })\n        .join('\\n')}\n    }\n    ` // source\n\n    source = prettier.format(source, { parser: 'typescript' })\n    fs.writeFileSync(path.join(this.config.outputDir, baseName + '.ts'), source)\n  }\n}\n\nfunction generateModule(moduleByteCode: MoveModuleBytecode, dependedModules: string[]) {\n  if (!moduleByteCode.abi) {\n    return ''\n  }\n  const module = moduleByteCode.abi\n\n  const functions = module.exposed_functions.map((f) => generateOnEntryFunctions(module, f)).filter((s) => s !== '')\n  const events = module.structs.map((e) => generateOnEvents(module, e)).filter((s) => s !== '')\n  const structs = module.structs.map((s) => generateStructs(module, s))\n  const callArgs = module.exposed_functions.map((f) => generateCallArgsStructs(module, f))\n\n  let processor = ''\n  if (functions.length > 0 || events.length > 0) {\n    processor = `export class ${module.name} extends aptos.AptosBaseProcessor {\n\n    constructor(options: aptos.AptosBindOptions) {\n      super(\"${module.name}\", options)\n    }\n    static DEFAULT_OPTIONS: aptos.AptosBindOptions = {\n      address: \"${module.address}\",\n      network: aptos.AptosNetwork.TEST_NET       \n    }\n\n    static bind(options: Partial<aptos.AptosBindOptions> = {}): ${module.name} {\n      return new ${module.name}({ ...${module.name}.DEFAULT_OPTIONS, ...options })\n    }\n    \n    ${functions.join('\\n')}\n    \n    ${events.join('\\n')}\n    \n    loadTypesInternal(registry: aptos.TypeRegistry) {\n      loadAllTypes(registry)\n    }\n  }\n  `\n  }\n\n  return `\n  ${processor}\n\n  export namespace ${module.name} {\n    ${structs.join('\\n')}\n    \n    ${callArgs.join('\\n')}\n       \n    export function loadTypes(registry: aptos.TypeRegistry) {\n      loadAllTypes(registry)\n    }\n    export const ABI: MoveModule = JSON.parse('${JSON.stringify(module)}')\n }\n  `\n}\n\nfunction generateStructs(module: MoveModule, struct: MoveStruct) {\n  const genericString = generateStructTypeParameters(struct)\n  const genericStringAny = generateStructTypeParameters(struct, true)\n\n  const fields = struct.fields.map((field) => {\n    return `${field.name}: ${generateType(field.type)}`\n  })\n\n  let eventPayload = ''\n  if (isEvent(struct)) {\n    eventPayload = `\n    export interface ${struct.name}Instance extends \n        aptos.TypedEventInstance<${struct.name}${genericStringAny}> {\n      data_typed: ${struct.name}${genericStringAny}\n      type_arguments: [${struct.generic_type_params.map((_) => 'string').join(', ')}]\n    }\n    `\n  }\n\n  return `\n  export class ${struct.name}${genericString} {\n    ${fields.join('\\n')} \n  }\n  \n  ${eventPayload}\n  `\n}\n\n// function generateFunctionTypeParameters(func: MoveFunction) {\n//   let genericString = ''\n//   if (func.generic_type_params && func.generic_type_params.length > 0) {\n//     const params = func.generic_type_params\n//       .map((v, idx) => {\n//         return 'T' + idx\n//       })\n//       .join(',')\n//     genericString = `<${params}>`\n//   }\n//   return genericString\n// }\n\nfunction generateStructTypeParameters(struct: MoveStruct, useAny = false) {\n  let genericString = ''\n\n  if (struct.generic_type_params && struct.generic_type_params.length > 0) {\n    const params = struct.generic_type_params\n      .map((v, idx) => {\n        return useAny ? 'any' : 'T' + idx\n      })\n      .join(',')\n    genericString = `<${params}>`\n  }\n  return genericString\n}\n\nfunction generateCallArgsStructs(module: MoveModule, func: MoveFunction) {\n  if (!func.is_entry) {\n    return\n  }\n\n  // the first param is always signer so ignore\n  // TODO check if there is any edge case\n  const fields = func.params.slice(1).map((param) => {\n    return `${generateType(param)}`\n  })\n\n  const camelFuncName = capitalizeFirstChar(camelize(func.name))\n\n  // const genericString = generateFunctionTypeParameters(func)\n  return `\n  export interface ${camelFuncName}Payload\n      extends aptos.TypedEntryFunctionPayload<[${fields.join(',')}]> {\n    arguments_typed: [${fields.join(',')}],\n    type_arguments: [${func.generic_type_params.map((_) => 'string').join(', ')}]\n  }\n  `\n}\n\nfunction generateOnEntryFunctions(module: MoveModule, func: MoveFunction) {\n  if (!func.is_entry) {\n    return ''\n  }\n\n  // const genericString = generateFunctionTypeParameters(func)\n\n  const camelFuncName = capitalizeFirstChar(camelize(func.name))\n  const source = `\n  onEntry${camelFuncName}(func: (call: ${module.name}.${camelFuncName}Payload, ctx: aptos.AptosContext) => void, filter?: aptos.CallFilter): ${module.name} {\n    this.onEntryFunctionCall(func, {\n      ...filter,\n      function: '${module.name}::${func.name}'\n    })\n    return this\n  }`\n\n  return source\n}\n\nfunction isEvent(struct: MoveStruct) {\n  return struct.abilities.includes('drop') && struct.abilities.includes('store') && struct.name.endsWith('Event')\n}\n\nfunction generateOnEvents(module: MoveModule, struct: MoveStruct): string {\n  // for struct that has drop + store\n  if (!isEvent(struct)) {\n    return ''\n  }\n\n  // const genericString = generateStructTypeParameters(struct)\n\n  const source = `\n  onEvent${struct.name}(func: (event: ${module.name}.${struct.name}Instance, ctx: aptos.AptosContext) => void): ${module.name} {\n    this.onEvent(func, {\n      type: '${module.name}::${struct.name}'\n    })\n    return this\n  }\n  `\n  return source\n}\n\nfunction camelize(input: string): string {\n  return input\n    .split('_')\n    .reduce(\n      (res, word, i) =>\n        i === 0 ? word.toLowerCase() : `${res}${word.charAt(0).toUpperCase()}${word.substr(1).toLowerCase()}`,\n      ''\n    )\n}\n\nfunction capitalizeFirstChar(input: string): string {\n  if (!input) {\n    return input\n  }\n  return input[0].toUpperCase() + (input.length > 1 ? input.substring(1) : '')\n}\n"]}

package/lib/aptos-codegen/typegen.js.map

@@ -1 +1 @@
-{"version":3,"file":"typegen.js","sourceRoot":"","sources":["../../src/aptos-codegen/typegen.ts"],"names":[],"mappings":"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","sourcesContent":["import { MoveModule } from 'aptos/src/generated'\nimport { TypeDescriptor } from '../aptos/types'\nimport { moduleQname, moduleQnameForType, SPLITTER, VECTOR_STR } from '../aptos/utils'\n\nfunction generateTypeForDescriptor(type: TypeDescriptor): string {\n  // TODO &signer is defintely an address, but what if &OTHER_TYPE?\n  if (type.qname.startsWith('&')) {\n    return 'Address'\n  }\n\n  switch (type.qname) {\n    case 'signer': // TODO check this\n    case 'address':\n      return 'Address'\n    case '0x1::string::String':\n      return 'string'\n    case 'bool':\n      return 'Boolean'\n    case 'u8':\n    case 'u16':\n    case 'u32':\n      return 'number'\n    case 'u64':\n    case 'u128':\n      return 'bigint'\n  }\n\n  if (type.qname === VECTOR_STR) {\n    // vector<u8> as hex string\n    const elementTypeQname = type.typeArgs[0].qname\n    if (elementTypeQname === 'u8') {\n      return 'string'\n    }\n    if (elementTypeQname.startsWith('T') && !elementTypeQname.includes(SPLITTER)) {\n      return `${elementTypeQname}[] | string`\n    }\n    return generateTypeForDescriptor(type.typeArgs[0]) + '[]'\n  }\n\n  const simpleName = generateSimpleType(type.qname)\n  if (simpleName.length === 0) {\n    console.error('unexpected error')\n  }\n  if (simpleName.includes('vector')) {\n    console.error('unexpected error')\n  }\n  if (type.typeArgs.length > 0) {\n    // return simpleName\n    return simpleName + '<' + type.typeArgs.map((t) => generateTypeForDescriptor(t)).join(',') + '>'\n  }\n  return simpleName\n}\n\nfunction generateSimpleType(type: string): string {\n  const parts = type.split(SPLITTER)\n  if (parts.length < 2) {\n    return parts[0]\n  }\n\n  return parts.slice(1).join('.')\n}\n\nexport function parseMoveType(type: string) {\n  // type = type.replace('&', '')\n\n  type = type.replaceAll('&mut ', '&')\n  type = type.replaceAll('mut ', '')\n\n  // TODO replace ' ' is not exactly safe, need to double check this\n  type = type.replaceAll(' ', '')\n\n  const stack: TypeDescriptor[] = [new TypeDescriptor('')]\n  let buffer = []\n\n  // xxx:asdf<g1<a,<c,d>>, b, g2<a,b>, e>\n  for (let i = 0; i < type.length; i++) {\n    const ch = type[i]\n    if (ch === '<') {\n      // const symbol = type.slice(symbolStart, i)\n      // symbolStart =\n      const symbol = buffer.join('')\n      buffer = []\n      stack[stack.length - 1].qname = symbol\n      stack.push(new TypeDescriptor(''))\n      continue\n    }\n    if (ch === '>') {\n      const typeParam = stack.pop()\n      if (!typeParam) {\n        throw Error('Uxpectecd stack size')\n      }\n      if (buffer.length > 0) {\n        typeParam.qname = buffer.join('')\n        buffer = []\n      }\n      stack[stack.length - 1].typeArgs.push(typeParam)\n      continue\n    }\n    if (ch === ',') {\n      const typeParam = stack.pop()\n      if (!typeParam) {\n        throw Error('Uxpectecd stack size')\n      }\n      if (buffer.length > 0) {\n        typeParam.qname = buffer.join('')\n        buffer = []\n      }\n\n      stack[stack.length - 1].typeArgs.push(typeParam)\n      // continue parse next param\n      stack.push(new TypeDescriptor(''))\n      continue\n    }\n\n    buffer.push(ch)\n  }\n\n  if (buffer.length > 0) {\n    stack[stack.length - 1].qname = buffer.join('')\n  }\n\n  const res = stack.pop()\n  if (!res || stack.length > 0) {\n    throw Error('Uxpectecd stack size')\n  }\n  return res\n}\n\n// TODO ctx need to have type parameters\nexport function generateType(type: string, ctx?: any): string {\n  return generateTypeForDescriptor(parseMoveType(type))\n}\n\nexport class AccountModulesImportInfo {\n  // account to module\n  imports: Map<string, Set<string>>\n  account: string\n  moduleName: string\n\n  constructor(account: string, tsModuleName: string) {\n    this.account = account\n    this.moduleName = tsModuleName\n    this.imports = new Map<string, Set<string>>()\n  }\n\n  addImport(account: string, module: string) {\n    if (account === this.account) {\n      return\n    }\n    let accountModules = this.imports.get(account)\n    if (!accountModules) {\n      accountModules = new Set<string>()\n      this.imports.set(account, accountModules)\n    }\n    accountModules.add(module)\n  }\n}\n\nexport class AccountRegister {\n  accountImports = new Map<string, AccountModulesImportInfo>()\n  pendingAccounts = new Set<string>()\n\n  // loadedAccount = new Set<string>()\n  typeRegistry = new Map<string, TypeDescriptor>()\n\n  private loadTypeDescriptor(type: string) {\n    let descriptor = this.typeRegistry.get(type)\n\n    // const descriptparseMoveType(type)\n    if (!descriptor) {\n      descriptor = parseMoveType(type)\n      this.typeRegistry.set(type, descriptor)\n    }\n    return descriptor\n  }\n\n  register(module: MoveModule, tsModuleName: string): AccountModulesImportInfo {\n    const currentModuleFqn = moduleQname(module)\n\n    let accountModuleImports = this.accountImports.get(module.address)\n    if (!accountModuleImports) {\n      accountModuleImports = new AccountModulesImportInfo(module.address, tsModuleName)\n      this.accountImports.set(module.address, accountModuleImports)\n      // the account has already be processed, delete pending task\n      this.pendingAccounts.delete(module.address)\n    }\n\n    for (const struct of module.structs) {\n      for (const field of struct.fields) {\n        for (const type of this.loadTypeDescriptor(field.type).dependedTypes()) {\n          const [account, module] = moduleQnameForType(type)\n          accountModuleImports.addImport(account, module)\n          if (!this.accountImports.has(account)) {\n            this.pendingAccounts.add(account)\n          }\n        }\n      }\n    }\n\n    for (const func of module.exposed_functions) {\n      if (!func.is_entry) {\n        continue\n      }\n      for (const param of func.params) {\n        for (const type of this.loadTypeDescriptor(param).dependedTypes()) {\n          const [account, module] = moduleQnameForType(type)\n          accountModuleImports.addImport(account, module)\n          if (!this.accountImports.has(account)) {\n            this.pendingAccounts.add(account)\n          }\n        }\n      }\n    }\n    this.accountImports.set(currentModuleFqn, accountModuleImports)\n    return accountModuleImports\n  }\n}\n"]}
+{"version":3,"file":"typegen.js","sourceRoot":"","sources":["../../src/aptos-codegen/typegen.ts"],"names":[],"mappings":"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","sourcesContent":["import { MoveModule } from 'aptos/src/generated'\nimport { TypeDescriptor } from '../aptos/types'\nimport { moduleQname, moduleQnameForType, SPLITTER, VECTOR_STR } from '../aptos/utils'\n\nfunction generateTypeForDescriptor(type: TypeDescriptor): string {\n  // TODO &signer is defintely an address, but what if &OTHER_TYPE?\n  if (type.qname.startsWith('&')) {\n    return 'Address'\n  }\n\n  switch (type.qname) {\n    case 'signer': // TODO check this\n    case 'address':\n      return 'Address'\n    case '0x1::string::String':\n      return 'string'\n    case 'bool':\n      return 'Boolean'\n    case 'u8':\n    case 'u16':\n    case 'u32':\n      return 'number'\n    case 'u64':\n    case 'u128':\n      return 'bigint'\n  }\n\n  if (type.qname === VECTOR_STR) {\n    // vector<u8> as hex string\n    const elementTypeQname = type.typeArgs[0].qname\n    if (elementTypeQname === 'u8') {\n      return 'string'\n    }\n    if (elementTypeQname.startsWith('T') && !elementTypeQname.includes(SPLITTER)) {\n      return `${elementTypeQname}[] | string`\n    }\n    return generateTypeForDescriptor(type.typeArgs[0]) + '[]'\n  }\n\n  const simpleName = generateSimpleType(type.qname)\n  if (simpleName.length === 0) {\n    console.error('unexpected error')\n  }\n  if (simpleName.includes('vector')) {\n    console.error('unexpected error')\n  }\n  if (type.typeArgs.length > 0) {\n    // return simpleName\n    return simpleName + '<' + type.typeArgs.map((t) => generateTypeForDescriptor(t)).join(',') + '>'\n  }\n  return simpleName\n}\n\nfunction generateSimpleType(type: string): string {\n  const parts = type.split(SPLITTER)\n  if (parts.length < 2) {\n    return parts[0]\n  }\n\n  return parts.slice(1).join('.')\n}\n\nexport function parseMoveType(type: string): TypeDescriptor {\n  // type = type.replace('&', '')\n\n  type = type.replaceAll('&mut ', '&')\n  type = type.replaceAll('mut ', '')\n\n  // TODO replace ' ' is not exactly safe, need to double check this\n  type = type.replaceAll(' ', '')\n\n  const stack: TypeDescriptor[] = [new TypeDescriptor('')]\n  let buffer = []\n\n  // xxx:asdf<g1<a,<c,d>>, b, g2<a,b>, e>\n  for (let i = 0; i < type.length; i++) {\n    const ch = type[i]\n    if (ch === '<') {\n      // const symbol = type.slice(symbolStart, i)\n      // symbolStart =\n      const symbol = buffer.join('')\n      buffer = []\n      stack[stack.length - 1].qname = symbol\n      stack.push(new TypeDescriptor(''))\n      continue\n    }\n    if (ch === '>') {\n      const typeParam = stack.pop()\n      if (!typeParam) {\n        throw Error('Uxpectecd stack size')\n      }\n      if (buffer.length > 0) {\n        typeParam.qname = buffer.join('')\n        buffer = []\n      }\n      stack[stack.length - 1].typeArgs.push(typeParam)\n      continue\n    }\n    if (ch === ',') {\n      const typeParam = stack.pop()\n      if (!typeParam) {\n        throw Error('Uxpectecd stack size')\n      }\n      if (buffer.length > 0) {\n        typeParam.qname = buffer.join('')\n        buffer = []\n      }\n\n      stack[stack.length - 1].typeArgs.push(typeParam)\n      // continue parse next param\n      stack.push(new TypeDescriptor(''))\n      continue\n    }\n\n    buffer.push(ch)\n  }\n\n  if (buffer.length > 0) {\n    stack[stack.length - 1].qname = buffer.join('')\n  }\n\n  const res = stack.pop()\n  if (!res || stack.length > 0) {\n    throw Error('Uxpectecd stack size')\n  }\n  return res\n}\n\n// TODO ctx need to have type parameters\nexport function generateType(type: string, ctx?: any): string {\n  return generateTypeForDescriptor(parseMoveType(type))\n}\n\nexport class AccountModulesImportInfo {\n  // account to module\n  imports: Map<string, Set<string>>\n  account: string\n  moduleName: string\n\n  constructor(account: string, tsModuleName: string) {\n    this.account = account\n    this.moduleName = tsModuleName\n    this.imports = new Map<string, Set<string>>()\n  }\n\n  addImport(account: string, module: string) {\n    if (account === this.account) {\n      return\n    }\n    let accountModules = this.imports.get(account)\n    if (!accountModules) {\n      accountModules = new Set<string>()\n      this.imports.set(account, accountModules)\n    }\n    accountModules.add(module)\n  }\n}\n\nexport class AccountRegister {\n  accountImports = new Map<string, AccountModulesImportInfo>()\n  pendingAccounts = new Set<string>()\n\n  // loadedAccount = new Set<string>()\n  typeRegistry = new Map<string, TypeDescriptor>()\n\n  private loadTypeDescriptor(type: string) {\n    let descriptor = this.typeRegistry.get(type)\n\n    // const descriptparseMoveType(type)\n    if (!descriptor) {\n      descriptor = parseMoveType(type)\n      this.typeRegistry.set(type, descriptor)\n    }\n    return descriptor\n  }\n\n  register(module: MoveModule, tsModuleName: string): AccountModulesImportInfo {\n    const currentModuleFqn = moduleQname(module)\n\n    let accountModuleImports = this.accountImports.get(module.address)\n    if (!accountModuleImports) {\n      accountModuleImports = new AccountModulesImportInfo(module.address, tsModuleName)\n      this.accountImports.set(module.address, accountModuleImports)\n      // the account has already be processed, delete pending task\n      this.pendingAccounts.delete(module.address)\n    }\n\n    for (const struct of module.structs) {\n      for (const field of struct.fields) {\n        for (const type of this.loadTypeDescriptor(field.type).dependedTypes()) {\n          const [account, module] = moduleQnameForType(type)\n          accountModuleImports.addImport(account, module)\n          if (!this.accountImports.has(account)) {\n            this.pendingAccounts.add(account)\n          }\n        }\n      }\n    }\n\n    for (const func of module.exposed_functions) {\n      if (!func.is_entry) {\n        continue\n      }\n      for (const param of func.params) {\n        for (const type of this.loadTypeDescriptor(param).dependedTypes()) {\n          const [account, module] = moduleQnameForType(type)\n          accountModuleImports.addImport(account, module)\n          if (!this.accountImports.has(account)) {\n            this.pendingAccounts.add(account)\n          }\n        }\n      }\n    }\n    this.accountImports.set(currentModuleFqn, accountModuleImports)\n    return accountModuleImports\n  }\n}\n"]}