@sentio/sdk 1.21.1 → 1.21.3

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, RecordMetaData } 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

@@ -265,8 +265,9 @@ function generateOnEvents(module, struct) {
     if (!isEvent(struct)) {
         return '';
     }
+    const genericString = generateStructTypeParameters(struct);
     const source = `
-  onEvent${struct.name}(func: (event: ${module.name}.${struct.name}Instance, ctx: aptos.AptosContext) => void): ${module.name} {
+  onEvent${struct.name}${genericString}(func: (event: ${module.name}.${struct.name}Instance${genericString}, 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  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"]}
+{"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"]}

package/lib/aptos-codegen/typegen.js

@@ -57,9 +57,10 @@ function generateSimpleType(type) {
 }
 function parseMoveType(type) {
     // type = type.replace('&', '')
-    type = type.replace('&mut ', '&');
+    type = type.replaceAll('&mut ', '&');
+    type = type.replaceAll('mut ', '');
     // TODO replace ' ' is not exactly safe, need to double check this
-    type = type.replace(' ', '');
+    type = type.replaceAll(' ', '');
     const stack = [new types_1.TypeDescriptor('')];
     let buffer = [];
     // xxx:asdf<g1<a,<c,d>>, b, g2<a,b>, e>

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

@@ -1 +1 @@
-{"version":3,"file":"typegen.js","sourceRoot":"","sources":["../../src/aptos-codegen/typegen.ts"],"names":[],"mappings":";;;AACA,0CAA+C;AAC/C,0CAAsF;AAEtF,SAAS,yBAAyB,CAAC,IAAoB;IACrD,iEAAiE;IACjE,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QAC9B,OAAO,SAAS,CAAA;KACjB;IAED,QAAQ,IAAI,CAAC,KAAK,EAAE;QAClB,KAAK,QAAQ,CAAC,CAAC,kBAAkB;QACjC,KAAK,SAAS;YACZ,OAAO,SAAS,CAAA;QAClB,KAAK,qBAAqB;YACxB,OAAO,QAAQ,CAAA;QACjB,KAAK,MAAM;YACT,OAAO,SAAS,CAAA;QAClB,KAAK,IAAI,CAAC;QACV,KAAK,KAAK,CAAC;QACX,KAAK,KAAK;YACR,OAAO,QAAQ,CAAA;QACjB,KAAK,KAAK,CAAC;QACX,KAAK,MAAM;YACT,OAAO,QAAQ,CAAA;KAClB;IAED,IAAI,IAAI,CAAC,KAAK,KAAK,kBAAU,EAAE;QAC7B,2BAA2B;QAC3B,MAAM,gBAAgB,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;QAC/C,IAAI,gBAAgB,KAAK,IAAI,EAAE;YAC7B,OAAO,QAAQ,CAAA;SAChB;QACD,IAAI,gBAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,gBAAQ,CAAC,EAAE;YAC5E,OAAO,GAAG,gBAAgB,aAAa,CAAA;SACxC;QACD,OAAO,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAA;KAC1D;IAED,MAAM,UAAU,GAAG,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACjD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QAC3B,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;KAClC;IACD,IAAI,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QACjC,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;KAClC;IACD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QAC5B,oBAAoB;QACpB,OAAO,UAAU,GAAG,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAA;KACjG;IACD,OAAO,UAAU,CAAA;AACnB,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAQ,CAAC,CAAA;IAClC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACpB,OAAO,KAAK,CAAC,CAAC,CAAC,CAAA;KAChB;IAED,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACjC,CAAC;AAED,SAAgB,aAAa,CAAC,IAAY;IACxC,+BAA+B;IAE/B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;IAEjC,kEAAkE;IAClE,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;IAE5B,MAAM,KAAK,GAAqB,CAAC,IAAI,sBAAc,CAAC,EAAE,CAAC,CAAC,CAAA;IACxD,IAAI,MAAM,GAAG,EAAE,CAAA;IAEf,uCAAuC;IACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACpC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QAClB,IAAI,EAAE,KAAK,GAAG,EAAE;YACd,4CAA4C;YAC5C,gBAAgB;YAChB,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAC9B,MAAM,GAAG,EAAE,CAAA;YACX,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,MAAM,CAAA;YACtC,KAAK,CAAC,IAAI,CAAC,IAAI,sBAAc,CAAC,EAAE,CAAC,CAAC,CAAA;YAClC,SAAQ;SACT;QACD,IAAI,EAAE,KAAK,GAAG,EAAE;YACd,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,EAAE,CAAA;YAC7B,IAAI,CAAC,SAAS,EAAE;gBACd,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAA;aACpC;YACD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrB,SAAS,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;gBACjC,MAAM,GAAG,EAAE,CAAA;aACZ;YACD,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAChD,SAAQ;SACT;QACD,IAAI,EAAE,KAAK,GAAG,EAAE;YACd,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,EAAE,CAAA;YAC7B,IAAI,CAAC,SAAS,EAAE;gBACd,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAA;aACpC;YACD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrB,SAAS,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;gBACjC,MAAM,GAAG,EAAE,CAAA;aACZ;YAED,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAChD,4BAA4B;YAC5B,KAAK,CAAC,IAAI,CAAC,IAAI,sBAAc,CAAC,EAAE,CAAC,CAAC,CAAA;YAClC,SAAQ;SACT;QAED,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;KAChB;IAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;KAChD;IAED,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,EAAE,CAAA;IACvB,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QAC5B,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAA;KACpC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AA/DD,sCA+DC;AAED,wCAAwC;AACxC,SAAgB,YAAY,CAAC,IAAY,EAAE,GAAS;IAClD,OAAO,yBAAyB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAA;AACvD,CAAC;AAFD,oCAEC;AAED,MAAa,wBAAwB;IACnC,oBAAoB;IACpB,OAAO,CAA0B;IACjC,OAAO,CAAQ;IACf,UAAU,CAAQ;IAElB,YAAY,OAAe,EAAE,YAAoB;QAC/C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,UAAU,GAAG,YAAY,CAAA;QAC9B,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,EAAuB,CAAA;IAC/C,CAAC;IAED,SAAS,CAAC,OAAe,EAAE,MAAc;QACvC,IAAI,OAAO,KAAK,IAAI,CAAC,OAAO,EAAE;YAC5B,OAAM;SACP;QACD,IAAI,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAC9C,IAAI,CAAC,cAAc,EAAE;YACnB,cAAc,GAAG,IAAI,GAAG,EAAU,CAAA;YAClC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,cAAc,CAAC,CAAA;SAC1C;QACD,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAC5B,CAAC;CACF;AAvBD,4DAuBC;AAED,MAAa,eAAe;IAC1B,cAAc,GAAG,IAAI,GAAG,EAAoC,CAAA;IAC5D,eAAe,GAAG,IAAI,GAAG,EAAU,CAAA;IAEnC,oCAAoC;IACpC,YAAY,GAAG,IAAI,GAAG,EAA0B,CAAA;IAExC,kBAAkB,CAAC,IAAY;QACrC,IAAI,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAE5C,oCAAoC;QACpC,IAAI,CAAC,UAAU,EAAE;YACf,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,CAAA;YAChC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;SACxC;QACD,OAAO,UAAU,CAAA;IACnB,CAAC;IAED,QAAQ,CAAC,MAAkB,EAAE,YAAoB;QAC/C,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,CAAA;QAE5C,IAAI,oBAAoB,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAClE,IAAI,CAAC,oBAAoB,EAAE;YACzB,oBAAoB,GAAG,IAAI,wBAAwB,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;YACjF,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAA;YAC7D,4DAA4D;YAC5D,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;SAC5C;QAED,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;YACnC,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE;gBACjC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,EAAE;oBACtE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,IAAA,0BAAkB,EAAC,IAAI,CAAC,CAAA;oBAClD,oBAAoB,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;oBAC/C,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;wBACrC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;qBAClC;iBACF;aACF;SACF;QAED,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,iBAAiB,EAAE;YAC3C,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,SAAQ;aACT;YACD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE;gBAC/B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,EAAE;oBACjE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,IAAA,0BAAkB,EAAC,IAAI,CAAC,CAAA;oBAClD,oBAAoB,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;oBAC/C,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;wBACrC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;qBAClC;iBACF;aACF;SACF;QACD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAA;QAC/D,OAAO,oBAAoB,CAAA;IAC7B,CAAC;CACF;AA1DD,0CA0DC","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.replace('&mut ', '&')\n\n  // TODO replace ' ' is not exactly safe, need to double check this\n  type = type.replace(' ', '')\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"]}

package/lib/core/context.js

@@ -34,6 +34,7 @@ class EthContext extends BaseContext {
         this.log = log;
         this.block = block;
         this.trace = trace;
+        this.address = address;
         if (log) {
             this.blockNumber = long_1.default.fromNumber(log.blockNumber, true);
             this.transactionHash = log.transactionHash;

package/lib/core/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/core/context.ts"],"names":[],"mappings":"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","sourcesContent":["import { CounterResult, GaugeResult, LogResult, DataDescriptor, RecordMetaData } from '../gen'\nimport { BaseContract, EventFilter } from 'ethers'\nimport { Block, Log } from '@ethersproject/abstract-provider'\nimport { Meter, normalizeLabels } from './meter'\nimport Long from 'long'\nimport { Trace } from './trace'\nimport { Logger } from './logger'\nimport { Labels } from './metadata'\nimport { SOL_MAINMET_ID, SUI_DEVNET_ID } from '../utils/chain'\n\nexport abstract class BaseContext {\n  gauges: GaugeResult[] = []\n  counters: CounterResult[] = []\n  logs: LogResult[] = []\n  meter: Meter\n  logger: Logger\n\n  protected constructor() {\n    this.meter = new Meter(this)\n    this.logger = new Logger(this)\n  }\n\n  abstract getMetaData(descriptor: DataDescriptor | undefined, labels: Labels): RecordMetaData\n}\n\nexport abstract class EthContext extends BaseContext {\n  chainId: number\n  address: string\n  log?: Log\n  block?: Block\n  trace?: Trace\n  blockNumber: Long\n  transactionHash?: string\n\n  protected constructor(chainId: number, address: string, block?: Block, log?: Log, trace?: Trace) {\n    super()\n    this.chainId = chainId\n    this.log = log\n    this.block = block\n    this.trace = trace\n    if (log) {\n      this.blockNumber = Long.fromNumber(log.blockNumber, true)\n      this.transactionHash = log.transactionHash\n    } else if (block) {\n      this.blockNumber = Long.fromNumber(block.number, true)\n    } else if (trace) {\n      this.blockNumber = Long.fromNumber(trace.blockNumber, true)\n      this.transactionHash = trace.transactionHash\n    }\n  }\n}\n\nexport class ContractContext<\n  TContract extends BaseContract,\n  TContractBoundView extends BoundContractView<TContract, ContractView<TContract>>\n> extends EthContext {\n  contract: TContractBoundView\n  contractName: string\n\n  constructor(\n    contractName: string,\n    view: TContractBoundView,\n    chainId: number,\n    block?: Block,\n    log?: Log,\n    trace?: Trace\n  ) {\n    super(chainId, view.rawContract.address, block, log, trace)\n    view.context = this\n    this.contractName = contractName\n    this.contract = view\n  }\n\n  getMetaData(descriptor: DataDescriptor | undefined, labels: Labels): RecordMetaData {\n    if (this.log) {\n      return {\n        address: this.contract.rawContract.address,\n        contractName: this.contractName,\n        blockNumber: this.blockNumber,\n        transactionIndex: this.log.transactionIndex,\n        transactionHash: this.transactionHash || '',\n        logIndex: this.log.logIndex,\n        chainId: this.chainId.toString(),\n        dataDescriptor: descriptor,\n        labels: normalizeLabels(labels),\n      }\n    }\n    if (this.block) {\n      return {\n        address: this.contract.rawContract.address,\n        contractName: this.contractName,\n        blockNumber: this.blockNumber,\n        transactionIndex: -1,\n        transactionHash: '',\n        logIndex: -1,\n        chainId: this.chainId.toString(),\n        dataDescriptor: descriptor,\n        labels: normalizeLabels(labels),\n      }\n    }\n    if (this.trace) {\n      return {\n        address: this.contract.rawContract.address,\n        contractName: this.contractName,\n        blockNumber: this.blockNumber,\n        transactionIndex: this.trace.transactionPosition,\n        transactionHash: this.transactionHash || '',\n        logIndex: -1,\n        chainId: this.chainId.toString(),\n        dataDescriptor: descriptor,\n        labels: normalizeLabels(labels),\n      }\n    }\n    throw new Error(\"Invaid ctx argument can't happen\")\n  }\n}\n\nexport class ContractView<TContract extends BaseContract> {\n  filters: { [name: string]: (...args: Array<any>) => EventFilter }\n  protected contract: TContract\n\n  constructor(contract: TContract) {\n    this.contract = contract\n    this.filters = contract.filters\n  }\n\n  get rawContract() {\n    return this.contract\n  }\n\n  get provider() {\n    return this.contract.provider\n  }\n}\n\nexport class BoundContractView<TContract extends BaseContract, TContractView extends ContractView<TContract>> {\n  protected view: TContractView\n  // context will be set right after context creation (in context's constructor)\n  context: ContractContext<TContract, BoundContractView<TContract, TContractView>>\n\n  constructor(view: TContractView) {\n    this.view = view\n  }\n\n  get rawContract() {\n    return this.view.rawContract\n  }\n\n  get provider() {\n    return this.view.provider\n  }\n\n  get filters() {\n    return this.view.filters\n  }\n}\n\nexport class SolanaContext extends BaseContext {\n  address: string\n  programName: string\n  blockNumber: Long\n\n  constructor(programName: string, address: string, slot: Long) {\n    super()\n    this.programName = programName\n    this.address = address\n    this.blockNumber = slot\n  }\n\n  getMetaData(descriptor: DataDescriptor | undefined, labels: Labels): RecordMetaData {\n    return {\n      address: this.address,\n      contractName: this.programName,\n      blockNumber: this.blockNumber,\n      transactionIndex: 0,\n      transactionHash: '', // TODO add\n      logIndex: 0,\n      chainId: SOL_MAINMET_ID, // TODO set in context\n      dataDescriptor: descriptor,\n      labels: normalizeLabels(labels),\n    }\n  }\n}\n\nexport class SuiContext extends BaseContext {\n  address: string\n  moduleName: string\n  blockNumber: Long\n\n  constructor(address: string, slot: Long) {\n    super()\n    this.address = address\n    this.blockNumber = slot\n  }\n\n  getMetaData(descriptor: DataDescriptor | undefined, labels: Labels): RecordMetaData {\n    return {\n      address: this.address,\n      contractName: this.moduleName,\n      blockNumber: this.blockNumber,\n      transactionIndex: 0,\n      transactionHash: '', // TODO\n      logIndex: 0,\n      chainId: SUI_DEVNET_ID, // TODO set in context\n      dataDescriptor: descriptor,\n      labels: normalizeLabels(labels),\n    }\n  }\n}\n"]}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/core/context.ts"],"names":[],"mappings":"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","sourcesContent":["import { CounterResult, GaugeResult, LogResult, DataDescriptor, RecordMetaData } from '../gen'\nimport { BaseContract, EventFilter } from 'ethers'\nimport { Block, Log } from '@ethersproject/abstract-provider'\nimport { Meter, normalizeLabels } from './meter'\nimport Long from 'long'\nimport { Trace } from './trace'\nimport { Logger } from './logger'\nimport { Labels } from './metadata'\nimport { SOL_MAINMET_ID, SUI_DEVNET_ID } from '../utils/chain'\n\nexport abstract class BaseContext {\n  gauges: GaugeResult[] = []\n  counters: CounterResult[] = []\n  logs: LogResult[] = []\n  meter: Meter\n  logger: Logger\n\n  protected constructor() {\n    this.meter = new Meter(this)\n    this.logger = new Logger(this)\n  }\n\n  abstract getMetaData(descriptor: DataDescriptor | undefined, labels: Labels): RecordMetaData\n}\n\nexport abstract class EthContext extends BaseContext {\n  chainId: number\n  address: string\n  log?: Log\n  block?: Block\n  trace?: Trace\n  blockNumber: Long\n  transactionHash?: string\n\n  protected constructor(chainId: number, address: string, block?: Block, log?: Log, trace?: Trace) {\n    super()\n    this.chainId = chainId\n    this.log = log\n    this.block = block\n    this.trace = trace\n    this.address = address\n    if (log) {\n      this.blockNumber = Long.fromNumber(log.blockNumber, true)\n      this.transactionHash = log.transactionHash\n    } else if (block) {\n      this.blockNumber = Long.fromNumber(block.number, true)\n    } else if (trace) {\n      this.blockNumber = Long.fromNumber(trace.blockNumber, true)\n      this.transactionHash = trace.transactionHash\n    }\n  }\n}\n\nexport class ContractContext<\n  TContract extends BaseContract,\n  TContractBoundView extends BoundContractView<TContract, ContractView<TContract>>\n> extends EthContext {\n  contract: TContractBoundView\n  contractName: string\n\n  constructor(\n    contractName: string,\n    view: TContractBoundView,\n    chainId: number,\n    block?: Block,\n    log?: Log,\n    trace?: Trace\n  ) {\n    super(chainId, view.rawContract.address, block, log, trace)\n    view.context = this\n    this.contractName = contractName\n    this.contract = view\n  }\n\n  getMetaData(descriptor: DataDescriptor | undefined, labels: Labels): RecordMetaData {\n    if (this.log) {\n      return {\n        address: this.contract.rawContract.address,\n        contractName: this.contractName,\n        blockNumber: this.blockNumber,\n        transactionIndex: this.log.transactionIndex,\n        transactionHash: this.transactionHash || '',\n        logIndex: this.log.logIndex,\n        chainId: this.chainId.toString(),\n        dataDescriptor: descriptor,\n        labels: normalizeLabels(labels),\n      }\n    }\n    if (this.block) {\n      return {\n        address: this.contract.rawContract.address,\n        contractName: this.contractName,\n        blockNumber: this.blockNumber,\n        transactionIndex: -1,\n        transactionHash: '',\n        logIndex: -1,\n        chainId: this.chainId.toString(),\n        dataDescriptor: descriptor,\n        labels: normalizeLabels(labels),\n      }\n    }\n    if (this.trace) {\n      return {\n        address: this.contract.rawContract.address,\n        contractName: this.contractName,\n        blockNumber: this.blockNumber,\n        transactionIndex: this.trace.transactionPosition,\n        transactionHash: this.transactionHash || '',\n        logIndex: -1,\n        chainId: this.chainId.toString(),\n        dataDescriptor: descriptor,\n        labels: normalizeLabels(labels),\n      }\n    }\n    throw new Error(\"Invaid ctx argument can't happen\")\n  }\n}\n\nexport class ContractView<TContract extends BaseContract> {\n  filters: { [name: string]: (...args: Array<any>) => EventFilter }\n  protected contract: TContract\n\n  constructor(contract: TContract) {\n    this.contract = contract\n    this.filters = contract.filters\n  }\n\n  get rawContract() {\n    return this.contract\n  }\n\n  get provider() {\n    return this.contract.provider\n  }\n}\n\nexport class BoundContractView<TContract extends BaseContract, TContractView extends ContractView<TContract>> {\n  protected view: TContractView\n  // context will be set right after context creation (in context's constructor)\n  context: ContractContext<TContract, BoundContractView<TContract, TContractView>>\n\n  constructor(view: TContractView) {\n    this.view = view\n  }\n\n  get rawContract() {\n    return this.view.rawContract\n  }\n\n  get provider() {\n    return this.view.provider\n  }\n\n  get filters() {\n    return this.view.filters\n  }\n}\n\nexport class SolanaContext extends BaseContext {\n  address: string\n  programName: string\n  blockNumber: Long\n\n  constructor(programName: string, address: string, slot: Long) {\n    super()\n    this.programName = programName\n    this.address = address\n    this.blockNumber = slot\n  }\n\n  getMetaData(descriptor: DataDescriptor | undefined, labels: Labels): RecordMetaData {\n    return {\n      address: this.address,\n      contractName: this.programName,\n      blockNumber: this.blockNumber,\n      transactionIndex: 0,\n      transactionHash: '', // TODO add\n      logIndex: 0,\n      chainId: SOL_MAINMET_ID, // TODO set in context\n      dataDescriptor: descriptor,\n      labels: normalizeLabels(labels),\n    }\n  }\n}\n\nexport class SuiContext extends BaseContext {\n  address: string\n  moduleName: string\n  blockNumber: Long\n\n  constructor(address: string, slot: Long) {\n    super()\n    this.address = address\n    this.blockNumber = slot\n  }\n\n  getMetaData(descriptor: DataDescriptor | undefined, labels: Labels): RecordMetaData {\n    return {\n      address: this.address,\n      contractName: this.moduleName,\n      blockNumber: this.blockNumber,\n      transactionIndex: 0,\n      transactionHash: '', // TODO\n      logIndex: 0,\n      chainId: SUI_DEVNET_ID, // TODO set in context\n      dataDescriptor: descriptor,\n      labels: normalizeLabels(labels),\n    }\n  }\n}\n"]}

package/lib/tests/aptos.test.js

@@ -212,7 +212,7 @@ const testData = {
                 account_address: '0x21d5fe032affa1c8b10d343e9ad5a5618bc13baf5ed4a674fafaa12c54f416cc',
             },
             sequence_number: '980533',
-            type: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807::SouffleChefCampaign::PullTokenEvent',
+            type: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807::SouffleChefCampaign::PullTokenEvent<0x1::aptos_coin::AptosCoin>',
             data: {
                 receiver: '0x3a80be5daa84f2da7e07b3ec9234da48a5647f757187879c97a1fa03f31f1195',
             },

package/lib/tests/aptos.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"aptos.test.js","sourceRoot":"","sources":["../../src/tests/aptos.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { expect } from 'chai'\nimport { TextEncoder } from 'util'\nimport { HandlerType, ProcessBindingsRequest } from '..'\n\nimport { firstCounterValue, firstGaugeValue, TestProcessorServer } from '../testing'\n\ndescribe('Test Aptos Example', () => {\n  const service = new TestProcessorServer(() => {\n    require('./souffl3')\n  })\n\n  beforeAll(async () => {\n    await service.start({ templateInstances: [] })\n  })\n\n  test('check configuration ', async () => {\n    const config = await service.getConfig({})\n    expect(config.contractConfigs).length(4)\n  })\n\n  test('Check souffl3 transaction dispatch', async () => {\n    const request: ProcessBindingsRequest = {\n      bindings: [\n        {\n          data: {\n            raw: new TextEncoder().encode(JSON.stringify(testData)),\n          },\n          handlerId: 1,\n          handlerType: HandlerType.APT_CALL,\n        },\n      ],\n    }\n    const res = await service.processBindings(request)\n    expect(res.result?.counters).length(1)\n    expect(res.result?.gauges).length(0)\n    expect(res.result?.counters[0].metadata?.blockNumber.toInt()).equal(18483034)\n  })\n\n  test('Check souffl3 function call dispatch', async () => {\n    const request: ProcessBindingsRequest = {\n      bindings: [\n        {\n          data: {\n            raw: new TextEncoder().encode(JSON.stringify(testData)),\n          },\n          handlerId: 0,\n          handlerType: HandlerType.APT_CALL,\n        },\n      ],\n    }\n    const res = await service.processBindings(request)\n    expect(res.result?.counters).length(2)\n    expect(res.result?.gauges).length(0)\n    expect(res.result?.counters[0].metadata?.blockNumber.toInt()).equal(18483034)\n  })\n\n  test('Check souffl3 event dispatch', async () => {\n    const request: ProcessBindingsRequest = {\n      bindings: [\n        {\n          data: {\n            raw: new TextEncoder().encode(JSON.stringify(testData.events[testData.events.length - 1])),\n          },\n          handlerId: 0,\n          handlerType: HandlerType.APT_EVENT,\n        },\n      ],\n    }\n    const res = await service.processBindings(request)\n    expect(res.result?.counters).length(1)\n    expect(res.result?.gauges).length(0)\n    expect(res.result?.counters[0].metadata?.blockNumber.toInt()).equal(18483034)\n  })\n\n  test('Check token deposit event dispatch', async () => {\n    const request: ProcessBindingsRequest = {\n      bindings: [\n        {\n          data: {\n            raw: new TextEncoder().encode(JSON.stringify(tokenTestData)),\n          },\n          handlerId: 2,\n          handlerType: HandlerType.APT_EVENT,\n        },\n      ],\n    }\n    const res = await service.processBindings(request)\n    expect(firstCounterValue(res.result, 'deposit')).equal(1n)\n    expect(firstGaugeValue(res.result, 'version')).equal(0n)\n  })\n\n  test('Check create poposal event dispatch', async () => {\n    const request: ProcessBindingsRequest = {\n      bindings: [\n        {\n          data: {\n            raw: new TextEncoder().encode(JSON.stringify(createProposalData)),\n          },\n          handlerId: 3,\n          handlerType: HandlerType.APT_EVENT,\n        },\n      ],\n    }\n    const res = await service.processBindings(request)\n    expect(firstGaugeValue(res.result, 'size')).equal(2n)\n  })\n})\n\nconst testData = {\n  version: '18483034',\n  hash: '0xbf4df6f390546a793ba9b7caff120002b3257986dbea9c697fd64acf7dfeb052',\n  state_change_hash: '0x6063039cca5a1eb33d3986d3665fc783238579961eaa4746c41e25fa4f72aac6',\n  event_root_hash: '0x425e39bcf994672108f83c34f637e84166af7ecedcbe26aed0dff0d62da8055d',\n  state_checkpoint_hash: null,\n  gas_used: '854',\n  success: true,\n  vm_status: 'Executed successfully',\n  accumulator_root_hash: '0x47aa479d9e15993ea2abe04043c89186fb5da0b5eb8b5c6d18bd55d5f0c2c877',\n  changes: [],\n  sender: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807',\n  sequence_number: '30',\n  max_gas_amount: '20000',\n  gas_unit_price: '1',\n  expiration_timestamp_secs: '1663144544',\n  payload: {\n    function: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807::SouffleChefCampaign::pull_token_v2',\n    type_arguments: ['0x1::aptos_coin::AptosCoin'],\n    arguments: [\n      '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807',\n      '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807',\n      'Souffl3 BlueBerry',\n      '1',\n    ],\n    type: 'entry_function_payload',\n  },\n  signature: {\n    public_key: '0x6c3f579afbf8a728827385039f7604ec1d06e5c802d8f9689ee8ec9d349fedc5',\n    signature:\n      '0xd2db95052e774f095d924030a50c29325a17e8d69d35c748f45bb0e22eb7d3b9e47545c98bd7130fd3ef46cbedc30c9aaeaf39c2d922ee8e7d578c0b1e76f30b',\n    type: 'ed25519_signature',\n  },\n  events: [\n    {\n      guid: {\n        creation_number: '3',\n        account_address: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807',\n      },\n      sequence_number: '10',\n      type: '0x1::coin::WithdrawEvent',\n      data: {\n        amount: '1',\n      },\n    },\n    {\n      version: '18483034',\n      guid: {\n        creation_number: '2',\n        account_address: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807',\n      },\n      sequence_number: '11',\n      type: '0x1::coin::DepositEvent',\n      data: {\n        amount: '1',\n      },\n    },\n    {\n      guid: {\n        creation_number: '9',\n        account_address: '0x21d5fe032affa1c8b10d343e9ad5a5618bc13baf5ed4a674fafaa12c54f416cc',\n      },\n      sequence_number: '9',\n      type: '0x3::token::CreateTokenDataEvent',\n      data: {\n        description:\n          'Souffl3 offers a one-stop marketplace for the launch, listing, and trading of NFT assets on APTOS.\\nWebsite：https://souffl3.com/\\nEveryone can win through our Bake Off campaign on the Aptos Testnet, rewards including Souffl3 Genesis NFT and whitelists of other collab projects, everyone is welcome to participate!',\n        id: {\n          collection: 'Souffl3 BlueBerry',\n          creator: '0x21d5fe032affa1c8b10d343e9ad5a5618bc13baf5ed4a674fafaa12c54f416cc',\n          name: 'Souffl3 BlueBerry #2',\n        },\n        maximum: '999999999999',\n        mutability_config: {\n          description: true,\n          maximum: true,\n          properties: true,\n          royalty: true,\n          uri: true,\n        },\n        name: 'Souffl3 BlueBerry #2',\n        property_keys: ['author', 'point'],\n        property_types: ['string', 'integer'],\n        property_values: ['0x33454e4a4f59204c616273', '0x30'],\n        royalty_payee_address: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807',\n        royalty_points_denominator: '100',\n        royalty_points_numerator: '20',\n        uri: 'https://y3x4txhvirx5zl57efzbl6dg7psaier5q35hhwuqwzjwuahrycya.arweave.net/xu_J3PVEb9yvvyFyFfhm--QEEj2G-nPakLZTagDxwLA',\n      },\n    },\n    {\n      guid: {\n        creation_number: '2',\n        account_address: '0x21d5fe032affa1c8b10d343e9ad5a5618bc13baf5ed4a674fafaa12c54f416cc',\n      },\n      sequence_number: '27',\n      type: '0x3::token::DepositEvent',\n      data: {\n        amount: '1',\n        id: {\n          property_version: '0',\n          token_data_id: {\n            collection: 'Souffl3 BlueBerry',\n            creator: '0x21d5fe032affa1c8b10d343e9ad5a5618bc13baf5ed4a674fafaa12c54f416cc',\n            name: 'Souffl3 BlueBerry #2',\n          },\n        },\n      },\n    },\n    {\n      version: '18483034',\n      guid: {\n        creation_number: '7',\n        account_address: '0x21d5fe032affa1c8b10d343e9ad5a5618bc13baf5ed4a674fafaa12c54f416cc',\n      },\n      sequence_number: '980533',\n      type: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807::SouffleChefCampaign::PullTokenEvent',\n      data: {\n        receiver: '0x3a80be5daa84f2da7e07b3ec9234da48a5647f757187879c97a1fa03f31f1195',\n      },\n    },\n  ],\n  timestamp: '1663143945131218',\n  type: 'user_transaction',\n}\n\nconst tokenTestData = {\n  version: '18483034',\n  guid: {\n    creation_number: '4',\n    account_address: '0x89bc80de59187f707a59ae7a4121718dafe3e6068e0509104ef7e41a56bc97db',\n  },\n  sequence_number: '10',\n  type: '0x3::token::DepositEvent',\n  data: {\n    amount: '1',\n    id: {\n      property_version: '0',\n      token_data_id: {\n        collection: 'Topaz Troopers',\n        creator: '0x9125e4054d884fdc7296b66e12c0d63a7baa0d88c77e8e784987c0a967c670ac',\n        name: 'Topaz Trooper #11293',\n      },\n    },\n  },\n}\n\nconst createProposalData = {\n  version: '1',\n  guid: {\n    creation_number: '5',\n    account_address: '0x1',\n  },\n  sequence_number: '3',\n  type: '0x1::voting::CreateProposalEvent',\n  data: {\n    early_resolution_vote_threshold: {\n      vec: ['9272156337856446330'],\n    },\n    execution_hash: '0x31549239ce8abdc1e9c259178614c3d44d015bd6d48635ddcfbfa4a77e7222b0',\n    expiration_secs: '1665463839',\n    metadata: {\n      data: [\n        {\n          key: 'metadata_hash',\n          value:\n            '0x61633230656566373063616466363939663530353564323463356363353931396463306330656562643463303662653332346336323030313561633361653066',\n        },\n        {\n          key: 'metadata_location',\n          value:\n            '0x68747470733a2f2f676973742e67697468756275736572636f6e74656e742e636f6d2f6d6f76656b6576696e2f30353766623134356234303836366566663863323263393166623964613931392f7261772f626162383566306637343334663030386138373831656563376663616464316163356135353438312f6769737466696c65312e747874',\n        },\n      ],\n    },\n    min_vote_threshold: '100000000000000',\n    proposal_id: '3',\n  },\n}\n"]}
+{"version":3,"file":"aptos.test.js","sourceRoot":"","sources":["../../src/tests/aptos.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { expect } from 'chai'\nimport { TextEncoder } from 'util'\nimport { HandlerType, ProcessBindingsRequest } from '..'\n\nimport { firstCounterValue, firstGaugeValue, TestProcessorServer } from '../testing'\n\ndescribe('Test Aptos Example', () => {\n  const service = new TestProcessorServer(() => {\n    require('./souffl3')\n  })\n\n  beforeAll(async () => {\n    await service.start({ templateInstances: [] })\n  })\n\n  test('check configuration ', async () => {\n    const config = await service.getConfig({})\n    expect(config.contractConfigs).length(4)\n  })\n\n  test('Check souffl3 transaction dispatch', async () => {\n    const request: ProcessBindingsRequest = {\n      bindings: [\n        {\n          data: {\n            raw: new TextEncoder().encode(JSON.stringify(testData)),\n          },\n          handlerId: 1,\n          handlerType: HandlerType.APT_CALL,\n        },\n      ],\n    }\n    const res = await service.processBindings(request)\n    expect(res.result?.counters).length(1)\n    expect(res.result?.gauges).length(0)\n    expect(res.result?.counters[0].metadata?.blockNumber.toInt()).equal(18483034)\n  })\n\n  test('Check souffl3 function call dispatch', async () => {\n    const request: ProcessBindingsRequest = {\n      bindings: [\n        {\n          data: {\n            raw: new TextEncoder().encode(JSON.stringify(testData)),\n          },\n          handlerId: 0,\n          handlerType: HandlerType.APT_CALL,\n        },\n      ],\n    }\n    const res = await service.processBindings(request)\n    expect(res.result?.counters).length(2)\n    expect(res.result?.gauges).length(0)\n    expect(res.result?.counters[0].metadata?.blockNumber.toInt()).equal(18483034)\n  })\n\n  test('Check souffl3 event dispatch', async () => {\n    const request: ProcessBindingsRequest = {\n      bindings: [\n        {\n          data: {\n            raw: new TextEncoder().encode(JSON.stringify(testData.events[testData.events.length - 1])),\n          },\n          handlerId: 0,\n          handlerType: HandlerType.APT_EVENT,\n        },\n      ],\n    }\n    const res = await service.processBindings(request)\n    expect(res.result?.counters).length(1)\n    expect(res.result?.gauges).length(0)\n    expect(res.result?.counters[0].metadata?.blockNumber.toInt()).equal(18483034)\n  })\n\n  test('Check token deposit event dispatch', async () => {\n    const request: ProcessBindingsRequest = {\n      bindings: [\n        {\n          data: {\n            raw: new TextEncoder().encode(JSON.stringify(tokenTestData)),\n          },\n          handlerId: 2,\n          handlerType: HandlerType.APT_EVENT,\n        },\n      ],\n    }\n    const res = await service.processBindings(request)\n    expect(firstCounterValue(res.result, 'deposit')).equal(1n)\n    expect(firstGaugeValue(res.result, 'version')).equal(0n)\n  })\n\n  test('Check create poposal event dispatch', async () => {\n    const request: ProcessBindingsRequest = {\n      bindings: [\n        {\n          data: {\n            raw: new TextEncoder().encode(JSON.stringify(createProposalData)),\n          },\n          handlerId: 3,\n          handlerType: HandlerType.APT_EVENT,\n        },\n      ],\n    }\n    const res = await service.processBindings(request)\n    expect(firstGaugeValue(res.result, 'size')).equal(2n)\n  })\n})\n\nconst testData = {\n  version: '18483034',\n  hash: '0xbf4df6f390546a793ba9b7caff120002b3257986dbea9c697fd64acf7dfeb052',\n  state_change_hash: '0x6063039cca5a1eb33d3986d3665fc783238579961eaa4746c41e25fa4f72aac6',\n  event_root_hash: '0x425e39bcf994672108f83c34f637e84166af7ecedcbe26aed0dff0d62da8055d',\n  state_checkpoint_hash: null,\n  gas_used: '854',\n  success: true,\n  vm_status: 'Executed successfully',\n  accumulator_root_hash: '0x47aa479d9e15993ea2abe04043c89186fb5da0b5eb8b5c6d18bd55d5f0c2c877',\n  changes: [],\n  sender: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807',\n  sequence_number: '30',\n  max_gas_amount: '20000',\n  gas_unit_price: '1',\n  expiration_timestamp_secs: '1663144544',\n  payload: {\n    function: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807::SouffleChefCampaign::pull_token_v2',\n    type_arguments: ['0x1::aptos_coin::AptosCoin'],\n    arguments: [\n      '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807',\n      '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807',\n      'Souffl3 BlueBerry',\n      '1',\n    ],\n    type: 'entry_function_payload',\n  },\n  signature: {\n    public_key: '0x6c3f579afbf8a728827385039f7604ec1d06e5c802d8f9689ee8ec9d349fedc5',\n    signature:\n      '0xd2db95052e774f095d924030a50c29325a17e8d69d35c748f45bb0e22eb7d3b9e47545c98bd7130fd3ef46cbedc30c9aaeaf39c2d922ee8e7d578c0b1e76f30b',\n    type: 'ed25519_signature',\n  },\n  events: [\n    {\n      guid: {\n        creation_number: '3',\n        account_address: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807',\n      },\n      sequence_number: '10',\n      type: '0x1::coin::WithdrawEvent',\n      data: {\n        amount: '1',\n      },\n    },\n    {\n      version: '18483034',\n      guid: {\n        creation_number: '2',\n        account_address: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807',\n      },\n      sequence_number: '11',\n      type: '0x1::coin::DepositEvent',\n      data: {\n        amount: '1',\n      },\n    },\n    {\n      guid: {\n        creation_number: '9',\n        account_address: '0x21d5fe032affa1c8b10d343e9ad5a5618bc13baf5ed4a674fafaa12c54f416cc',\n      },\n      sequence_number: '9',\n      type: '0x3::token::CreateTokenDataEvent',\n      data: {\n        description:\n          'Souffl3 offers a one-stop marketplace for the launch, listing, and trading of NFT assets on APTOS.\\nWebsite：https://souffl3.com/\\nEveryone can win through our Bake Off campaign on the Aptos Testnet, rewards including Souffl3 Genesis NFT and whitelists of other collab projects, everyone is welcome to participate!',\n        id: {\n          collection: 'Souffl3 BlueBerry',\n          creator: '0x21d5fe032affa1c8b10d343e9ad5a5618bc13baf5ed4a674fafaa12c54f416cc',\n          name: 'Souffl3 BlueBerry #2',\n        },\n        maximum: '999999999999',\n        mutability_config: {\n          description: true,\n          maximum: true,\n          properties: true,\n          royalty: true,\n          uri: true,\n        },\n        name: 'Souffl3 BlueBerry #2',\n        property_keys: ['author', 'point'],\n        property_types: ['string', 'integer'],\n        property_values: ['0x33454e4a4f59204c616273', '0x30'],\n        royalty_payee_address: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807',\n        royalty_points_denominator: '100',\n        royalty_points_numerator: '20',\n        uri: 'https://y3x4txhvirx5zl57efzbl6dg7psaier5q35hhwuqwzjwuahrycya.arweave.net/xu_J3PVEb9yvvyFyFfhm--QEEj2G-nPakLZTagDxwLA',\n      },\n    },\n    {\n      guid: {\n        creation_number: '2',\n        account_address: '0x21d5fe032affa1c8b10d343e9ad5a5618bc13baf5ed4a674fafaa12c54f416cc',\n      },\n      sequence_number: '27',\n      type: '0x3::token::DepositEvent',\n      data: {\n        amount: '1',\n        id: {\n          property_version: '0',\n          token_data_id: {\n            collection: 'Souffl3 BlueBerry',\n            creator: '0x21d5fe032affa1c8b10d343e9ad5a5618bc13baf5ed4a674fafaa12c54f416cc',\n            name: 'Souffl3 BlueBerry #2',\n          },\n        },\n      },\n    },\n    {\n      version: '18483034',\n      guid: {\n        creation_number: '7',\n        account_address: '0x21d5fe032affa1c8b10d343e9ad5a5618bc13baf5ed4a674fafaa12c54f416cc',\n      },\n      sequence_number: '980533',\n      type: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807::SouffleChefCampaign::PullTokenEvent<0x1::aptos_coin::AptosCoin>',\n      data: {\n        receiver: '0x3a80be5daa84f2da7e07b3ec9234da48a5647f757187879c97a1fa03f31f1195',\n      },\n    },\n  ],\n  timestamp: '1663143945131218',\n  type: 'user_transaction',\n}\n\nconst tokenTestData = {\n  version: '18483034',\n  guid: {\n    creation_number: '4',\n    account_address: '0x89bc80de59187f707a59ae7a4121718dafe3e6068e0509104ef7e41a56bc97db',\n  },\n  sequence_number: '10',\n  type: '0x3::token::DepositEvent',\n  data: {\n    amount: '1',\n    id: {\n      property_version: '0',\n      token_data_id: {\n        collection: 'Topaz Troopers',\n        creator: '0x9125e4054d884fdc7296b66e12c0d63a7baa0d88c77e8e784987c0a967c670ac',\n        name: 'Topaz Trooper #11293',\n      },\n    },\n  },\n}\n\nconst createProposalData = {\n  version: '1',\n  guid: {\n    creation_number: '5',\n    account_address: '0x1',\n  },\n  sequence_number: '3',\n  type: '0x1::voting::CreateProposalEvent',\n  data: {\n    early_resolution_vote_threshold: {\n      vec: ['9272156337856446330'],\n    },\n    execution_hash: '0x31549239ce8abdc1e9c259178614c3d44d015bd6d48635ddcfbfa4a77e7222b0',\n    expiration_secs: '1665463839',\n    metadata: {\n      data: [\n        {\n          key: 'metadata_hash',\n          value:\n            '0x61633230656566373063616466363939663530353564323463356363353931396463306330656562643463303662653332346336323030313561633361653066',\n        },\n        {\n          key: 'metadata_location',\n          value:\n            '0x68747470733a2f2f676973742e67697468756275736572636f6e74656e742e636f6d2f6d6f76656b6576696e2f30353766623134356234303836366566663863323263393166623964613931392f7261772f626162383566306637343334663030386138373831656563376663616464316163356135353438312f6769737466696c65312e747874',\n        },\n      ],\n    },\n    min_vote_threshold: '100000000000000',\n    proposal_id: '3',\n  },\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "1.21.1",
+  "version": "1.21.3",
   "scripts": {
     "compile_target": "yarn tsc -b src/target-ethers-sentio/tsconfig.json",
     "compile": "tsc -p . && cp src/cli/webpack.config.js lib/cli && cp src/utils/*.csv lib/utils",

package/src/aptos/aptos-processor.ts

@@ -1,4 +1,4 @@
-import { ProcessResult, RecordMetaData } from '../gen'
+import { ProcessResult } from '../gen'
 import {
   AptosBindOptions,
   AptosContext,
@@ -199,15 +199,20 @@ export class AptosBaseProcessor {
     this.loadTypes(registry)
     // TODO check if module is not loaded
 
+    const typeDescriptor = 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, 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 } as TypedEventInstance<any>
+    return { ...event, data_typed: dataTyped, type_arguments: typeArguments } as TypedEventInstance<any>
   }
 
   private decodeFunctionPayload(

package/src/aptos/types.ts

@@ -17,6 +17,8 @@ export type TypedEventInstance<T> = EventInstance & {
   // undefined if there is converting error, usually because the ABI/data
   // mismatch
   data_typed: T
+
+  type_arguments: string[]
 }
 
 // Don't use intermedidate type to make IDE happier
@@ -39,8 +41,15 @@ export class TypeDescriptor {
     this.typeArgs = typeParams || []
   }
 
+  getSignature(): string {
+    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: Map<string, TypeDescriptor>): TypeDescriptor {
+  applyTypeArgs(ctx: Map<string, TypeDescriptor>): TypeDescriptor {
     const replace = ctx.get(this.qname)
     if (replace) {
       return replace
@@ -55,7 +64,7 @@ export class TypeDescriptor {
       if (replace) {
         typeArgs.push(replace)
       } else {
-        typeArgs.push(arg.applyArgs(ctx))
+        typeArgs.push(arg.applyTypeArgs(ctx))
       }
     }
     return new TypeDescriptor(this.qname, typeArgs)
@@ -190,7 +199,7 @@ export class TypeRegistry {
 
     for (const field of struct.fields) {
       let filedType = parseMoveType(field.type)
-      filedType = filedType.applyArgs(typeCtx)
+      filedType = filedType.applyTypeArgs(typeCtx)
       const value = this.decode(data[field.name], filedType)
       typedData[field.name] = value
     }

package/src/aptos-codegen/codegen.ts

@@ -305,8 +305,11 @@ function generateOnEvents(module: MoveModule, struct: MoveStruct): string {
   if (!isEvent(struct)) {
     return ''
   }
+
+  const genericString = generateStructTypeParameters(struct)
+
   const source = `
-  onEvent${struct.name}(func: (event: ${module.name}.${struct.name}Instance, ctx: aptos.AptosContext) => void): ${module.name} {
+  onEvent${struct.name}${genericString}(func: (event: ${module.name}.${struct.name}Instance${genericString}, ctx: aptos.AptosContext) => void): ${module.name} {
     this.onEvent(func, {
       type: '${module.name}::${struct.name}'
     })

package/src/aptos-codegen/typegen.test.ts

@@ -17,6 +17,21 @@ describe('type gen', () => {
     assert(res.typeArgs.length === 0)
   })
 
+  test('test depended types', async () => {
+    const typeString =
+      '0x1::table_with_length::TableWithLength<T0, 0xd5f9f2b1c24faee8f07b790e570c75dfa1b7d8c1e9a60162fbd92ade03ea29e4::iterable_table::IterableValue<T0, T1>>'
+    const res = parseMoveType(typeString)
+
+    const deps = res.dependedTypes()
+    assert(deps.length === 2)
+    assert(
+      deps[0] === '0xd5f9f2b1c24faee8f07b790e570c75dfa1b7d8c1e9a60162fbd92ade03ea29e4::iterable_table::IterableValue'
+    )
+    assert(deps[1] === '0x1::table_with_length::TableWithLength')
+
+    const computedTypeString = res.getSignature()
+    assert(computedTypeString === typeString)
+  })
   // test('type type gen', async () => {
   //
   //   const res = parseGenericType('x<g1<a,g2<c,d>>,b,g3<a,b>,e>')

package/src/aptos-codegen/typegen.ts

@@ -60,13 +60,14 @@ function generateSimpleType(type: string): string {
   return parts.slice(1).join('.')
 }
 
-export function parseMoveType(type: string) {
+export function parseMoveType(type: string): TypeDescriptor {
   // type = type.replace('&', '')
 
-  type = type.replace('&mut ', '&')
+  type = type.replaceAll('&mut ', '&')
+  type = type.replaceAll('mut ', '')
 
   // TODO replace ' ' is not exactly safe, need to double check this
-  type = type.replace(' ', '')
+  type = type.replaceAll(' ', '')
 
   const stack: TypeDescriptor[] = [new TypeDescriptor('')]
   let buffer = []

package/src/core/context.ts

@@ -38,6 +38,7 @@ export abstract class EthContext extends BaseContext {
     this.log = log
     this.block = block
     this.trace = trace
+    this.address = address
     if (log) {
       this.blockNumber = Long.fromNumber(log.blockNumber, true)
       this.transactionHash = log.transactionHash

package/src/tests/aptos.test.ts

@@ -222,7 +222,7 @@ const testData = {
         account_address: '0x21d5fe032affa1c8b10d343e9ad5a5618bc13baf5ed4a674fafaa12c54f416cc',
       },
       sequence_number: '980533',
-      type: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807::SouffleChefCampaign::PullTokenEvent',
+      type: '0x4188c8694687e844677c2aa87171019e23d61cac60de5082a278a8aa47e9d807::SouffleChefCampaign::PullTokenEvent<0x1::aptos_coin::AptosCoin>',
       data: {
         receiver: '0x3a80be5daa84f2da7e07b3ec9234da48a5647f757187879c97a1fa03f31f1195',
       },