@sentio/sdk 2.5.0-rc.3 → 2.5.1-rc.1

package/lib/aptos/codegen/codegen.js

@@ -1,5 +1,5 @@
 import * as fs from 'fs';
-import { toNeutralModule } from '../move-types.js';
+import { toInternalModule } from '../move-types.js';
 import { moduleQname, SPLITTER } from '../../move/index.js';
 import chalk from 'chalk';
 import { AptosNetwork } from '../network.js';
@@ -33,8 +33,8 @@ class AptosCodegen extends AbstractCodegen {
         const client = getRpcClient(network);
         return await client.getAccountModules(account);
     }
-    toNeutral(modules) {
-        return modules.flatMap((m) => (m.abi ? [toNeutralModule(m)] : []));
+    toInternalModules(modules) {
+        return modules.flatMap((m) => (m.abi ? [toInternalModule(m)] : []));
     }
     getMeaningfulFunctionParams(params) {
         return getMeaningfulFunctionParams(params);

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 * as fs from 'fs'\nimport { MoveModuleBytecode, toNeutralModule } from '../move-types.js'\nimport { moduleQname, SPLITTER, TypeDescriptor } from '../../move/index.js'\nimport chalk from 'chalk'\nimport { AptosNetwork } from '../network.js'\nimport { AptosClient } from 'aptos-sdk'\nimport { getMeaningfulFunctionParams } from '../utils.js'\nimport { NeutralMoveModule, NeutralMoveStruct } from '../../move/neutral-models.js'\nimport { AbstractCodegen } from '../../move/abstract-codegen.js'\n\nexport async function codegen(abisDir: string, outDir = 'src/types/aptos') {\n  if (!fs.existsSync(abisDir)) {\n    return\n  }\n  console.log(chalk.green('Generated Types for Aptos'))\n  const gen = new AptosCodegen()\n  await gen.generate(abisDir, outDir)\n}\n\nfunction getRpcEndpoint(network: AptosNetwork): string {\n  switch (network) {\n    case AptosNetwork.TEST_NET:\n      return 'https://testnet.aptoslabs.com/'\n  }\n  return 'https://mainnet.aptoslabs.com/'\n}\n\nfunction getRpcClient(network: AptosNetwork): AptosClient {\n  return new AptosClient(getRpcEndpoint(network))\n}\n\nclass AptosCodegen extends AbstractCodegen<MoveModuleBytecode[], AptosNetwork> {\n  ADDRESS_TYPE = 'Address'\n  MAIN_NET = AptosNetwork.MAIN_NET\n  TEST_NET = AptosNetwork.TEST_NET\n  PREFIX = 'Aptos'\n\n  async fetchModules(account: string, network: AptosNetwork): Promise<MoveModuleBytecode[]> {\n    const client = getRpcClient(network)\n    return await client.getAccountModules(account)\n  }\n\n  toNeutral(modules: MoveModuleBytecode[]): NeutralMoveModule[] {\n    return modules.flatMap((m) => (m.abi ? [toNeutralModule(m)] : []))\n  }\n\n  getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {\n    return getMeaningfulFunctionParams(params)\n  }\n\n  getEventStructs(module: NeutralMoveModule) {\n    const qname = moduleQname(module)\n    const structMap = new Map<string, NeutralMoveStruct>()\n    const eventMap = new Map<string, NeutralMoveStruct>()\n\n    for (const struct of module.structs) {\n      structMap.set(qname + SPLITTER + struct.name, struct)\n    }\n\n    for (const struct of module.structs) {\n      for (const field of struct.fields) {\n        const t = field.type\n        if (t.qname === '0x1::event::EventHandle') {\n          const event = t.typeArgs[0].qname\n          const eventStruct = structMap.get(event)\n          if (eventStruct) {\n            eventMap.set(event, eventStruct)\n          }\n        }\n      }\n    }\n\n    return eventMap\n  }\n}\n"]}
+{"version":3,"file":"codegen.js","sourceRoot":"","sources":["../../../src/aptos/codegen/codegen.ts"],"names":[],"mappings":"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","sourcesContent":["import * as fs from 'fs'\nimport { MoveModuleBytecode, toInternalModule } from '../move-types.js'\nimport { moduleQname, SPLITTER, TypeDescriptor } from '../../move/index.js'\nimport chalk from 'chalk'\nimport { AptosNetwork } from '../network.js'\nimport { AptosClient } from 'aptos-sdk'\nimport { getMeaningfulFunctionParams } from '../utils.js'\nimport { InternalMoveModule, InternalMoveStruct } from '../../move/internal-models.js'\nimport { AbstractCodegen } from '../../move/abstract-codegen.js'\n\nexport async function codegen(abisDir: string, outDir = 'src/types/aptos') {\n  if (!fs.existsSync(abisDir)) {\n    return\n  }\n  console.log(chalk.green('Generated Types for Aptos'))\n  const gen = new AptosCodegen()\n  await gen.generate(abisDir, outDir)\n}\n\nfunction getRpcEndpoint(network: AptosNetwork): string {\n  switch (network) {\n    case AptosNetwork.TEST_NET:\n      return 'https://testnet.aptoslabs.com/'\n  }\n  return 'https://mainnet.aptoslabs.com/'\n}\n\nfunction getRpcClient(network: AptosNetwork): AptosClient {\n  return new AptosClient(getRpcEndpoint(network))\n}\n\nclass AptosCodegen extends AbstractCodegen<MoveModuleBytecode[], AptosNetwork> {\n  ADDRESS_TYPE = 'Address'\n  MAIN_NET = AptosNetwork.MAIN_NET\n  TEST_NET = AptosNetwork.TEST_NET\n  PREFIX = 'Aptos'\n\n  async fetchModules(account: string, network: AptosNetwork): Promise<MoveModuleBytecode[]> {\n    const client = getRpcClient(network)\n    return await client.getAccountModules(account)\n  }\n\n  toInternalModules(modules: MoveModuleBytecode[]): InternalMoveModule[] {\n    return modules.flatMap((m) => (m.abi ? [toInternalModule(m)] : []))\n  }\n\n  getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {\n    return getMeaningfulFunctionParams(params)\n  }\n\n  getEventStructs(module: InternalMoveModule) {\n    const qname = moduleQname(module)\n    const structMap = new Map<string, InternalMoveStruct>()\n    const eventMap = new Map<string, InternalMoveStruct>()\n\n    for (const struct of module.structs) {\n      structMap.set(qname + SPLITTER + struct.name, struct)\n    }\n\n    for (const struct of module.structs) {\n      for (const field of struct.fields) {\n        const t = field.type\n        if (t.qname === '0x1::event::EventHandle') {\n          const event = t.typeArgs[0].qname\n          const eventStruct = structMap.get(event)\n          if (eventStruct) {\n            eventMap.set(event, eventStruct)\n          }\n        }\n      }\n    }\n\n    return eventMap\n  }\n}\n"]}

package/lib/aptos/move-coder.js

@@ -1,4 +1,4 @@
-import { toNeutralModule, } from './move-types.js';
+import { toInternalModule, } from './move-types.js';
 import { getMeaningfulFunctionParams } from './utils.js';
 import { AbstractMoveCoder } from '../move/abstract-move-coder.js';
 export class MoveCoder extends AbstractMoveCoder {
@@ -9,7 +9,7 @@ export class MoveCoder extends AbstractMoveCoder {
         if (this.contains(module.abi.address, module.abi.name)) {
             return;
         }
-        this.loadNeutral(toNeutralModule(module));
+        this.loadInternal(toInternalModule(module));
     }
     decodeEvent(event) {
         return this.decodedInternal(event);

package/lib/aptos/move-coder.js.map

@@ -1 +1 @@
-{"version":3,"file":"move-coder.js","sourceRoot":"","sources":["../../src/aptos/move-coder.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,eAAe,GAEhB,MAAM,iBAAiB,CAAA;AAGxB,OAAO,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAA;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAElE,MAAM,OAAO,SAAU,SAAQ,iBAAuC;IACpE,IAAI,CAAC,MAA0B;QAC7B,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YACf,MAAM,KAAK,CAAC,oBAAoB,CAAC,CAAA;SAClC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACtD,OAAM;SACP;QACD,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAA;IAC3C,CAAC;IAED,WAAW,CAAI,KAAY;QACzB,OAAO,IAAI,CAAC,eAAe,CAAI,KAAK,CAA0B,CAAA;IAChE,CAAC;IACD,qBAAqB,CAAI,SAAiB,EAAE,SAAkB;QAC5D,OAAO,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,SAAS,CAA4B,CAAA;IACtF,CAAC;IACD,cAAc,CAAI,GAAiB;QACjC,OAAO,IAAI,CAAC,eAAe,CAAI,GAAG,CAAC,CAAA;IACrC,CAAC;IACD,wBAAwB,CAAI,SAAiB,EAAE,SAAyB;QACtE,OAAO,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;IAC3D,CAAC;IAED,qBAAqB,CAAC,OAAgD;QACpE,MAAM,cAAc,GAAU,EAAE,CAAA;QAEhC,IAAI;YACF,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;YACnD,MAAM,MAAM,GAAG,2BAA2B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACvD,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE;gBACpD,sGAAsG;gBACtG,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;gBAC3B,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;aAC/C;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAA;YAChE,OAAO,OAAO,CAAA;SACf;QAED,OAAO;YACL,GAAG,OAAO;YACV,iBAAiB,EAAE,cAAc;SACA,CAAA;IACrC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,SAAS,EAAE,CAAA;AAEzC,MAAM,UAAU,gBAAgB;IAC9B,OAAO,UAAU,CAAA;AACnB,CAAC","sourcesContent":["import {\n  Event,\n  MoveModule,\n  MoveModuleBytecode,\n  MoveResource,\n  toNeutralModule,\n  TransactionPayload_EntryFunctionPayload,\n} from './move-types.js'\n\nimport { TypedEventInstance, TypedMoveResource, TypedEntryFunctionPayload } from './models.js'\nimport { getMeaningfulFunctionParams } from './utils.js'\nimport { AbstractMoveCoder } from '../move/abstract-move-coder.js'\n\nexport class MoveCoder extends AbstractMoveCoder<Event | MoveResource> {\n  load(module: MoveModuleBytecode) {\n    if (!module.abi) {\n      throw Error('Module without abi')\n    }\n    if (this.contains(module.abi.address, module.abi.name)) {\n      return\n    }\n    this.loadNeutral(toNeutralModule(module))\n  }\n\n  decodeEvent<T>(event: Event): TypedEventInstance<T> | undefined {\n    return this.decodedInternal<T>(event) as TypedEventInstance<T>\n  }\n  filterAndDecodeEvents<T>(typeQname: string, resources: Event[]): TypedEventInstance<T>[] {\n    return this.filterAndDecodeInternal(typeQname, resources) as TypedEventInstance<T>[]\n  }\n  decodeResource<T>(res: MoveResource): TypedMoveResource<T> | undefined {\n    return this.decodedInternal<T>(res)\n  }\n  filterAndDecodeResources<T>(typeQname: string, resources: MoveResource[]): TypedMoveResource<T>[] {\n    return this.filterAndDecodeInternal(typeQname, resources)\n  }\n\n  decodeFunctionPayload(payload: TransactionPayload_EntryFunctionPayload): TransactionPayload_EntryFunctionPayload {\n    const argumentsTyped: any[] = []\n\n    try {\n      const func = this.getMoveFunction(payload.function)\n      const params = getMeaningfulFunctionParams(func.params)\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 = params[idx]\n        argumentsTyped.push(this.decode(arg, argType))\n      }\n    } catch (e) {\n      console.error('Decoding error for ', JSON.stringify(payload), e)\n      return payload\n    }\n\n    return {\n      ...payload,\n      arguments_decoded: argumentsTyped,\n    } as TypedEntryFunctionPayload<any>\n  }\n}\n\nexport const MOVE_CODER = new MoveCoder()\n\nexport function defaultMoveCoder(): MoveCoder {\n  return MOVE_CODER\n}\n"]}
+{"version":3,"file":"move-coder.js","sourceRoot":"","sources":["../../src/aptos/move-coder.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,gBAAgB,GAEjB,MAAM,iBAAiB,CAAA;AAGxB,OAAO,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAA;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAElE,MAAM,OAAO,SAAU,SAAQ,iBAAuC;IACpE,IAAI,CAAC,MAA0B;QAC7B,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YACf,MAAM,KAAK,CAAC,oBAAoB,CAAC,CAAA;SAClC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACtD,OAAM;SACP;QACD,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAA;IAC7C,CAAC;IAED,WAAW,CAAI,KAAY;QACzB,OAAO,IAAI,CAAC,eAAe,CAAI,KAAK,CAA0B,CAAA;IAChE,CAAC;IACD,qBAAqB,CAAI,SAAiB,EAAE,SAAkB;QAC5D,OAAO,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,SAAS,CAA4B,CAAA;IACtF,CAAC;IACD,cAAc,CAAI,GAAiB;QACjC,OAAO,IAAI,CAAC,eAAe,CAAI,GAAG,CAAC,CAAA;IACrC,CAAC;IACD,wBAAwB,CAAI,SAAiB,EAAE,SAAyB;QACtE,OAAO,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;IAC3D,CAAC;IAED,qBAAqB,CAAC,OAAgD;QACpE,MAAM,cAAc,GAAU,EAAE,CAAA;QAEhC,IAAI;YACF,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;YACnD,MAAM,MAAM,GAAG,2BAA2B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACvD,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE;gBACpD,sGAAsG;gBACtG,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;gBAC3B,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;aAC/C;SACF;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAA;YAChE,OAAO,OAAO,CAAA;SACf;QAED,OAAO;YACL,GAAG,OAAO;YACV,iBAAiB,EAAE,cAAc;SACA,CAAA;IACrC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,SAAS,EAAE,CAAA;AAEzC,MAAM,UAAU,gBAAgB;IAC9B,OAAO,UAAU,CAAA;AACnB,CAAC","sourcesContent":["import {\n  Event,\n  MoveModuleBytecode,\n  MoveResource,\n  toInternalModule,\n  TransactionPayload_EntryFunctionPayload,\n} from './move-types.js'\n\nimport { TypedEventInstance, TypedMoveResource, TypedEntryFunctionPayload } from './models.js'\nimport { getMeaningfulFunctionParams } from './utils.js'\nimport { AbstractMoveCoder } from '../move/abstract-move-coder.js'\n\nexport class MoveCoder extends AbstractMoveCoder<Event | MoveResource> {\n  load(module: MoveModuleBytecode) {\n    if (!module.abi) {\n      throw Error('Module without abi')\n    }\n    if (this.contains(module.abi.address, module.abi.name)) {\n      return\n    }\n    this.loadInternal(toInternalModule(module))\n  }\n\n  decodeEvent<T>(event: Event): TypedEventInstance<T> | undefined {\n    return this.decodedInternal<T>(event) as TypedEventInstance<T>\n  }\n  filterAndDecodeEvents<T>(typeQname: string, resources: Event[]): TypedEventInstance<T>[] {\n    return this.filterAndDecodeInternal(typeQname, resources) as TypedEventInstance<T>[]\n  }\n  decodeResource<T>(res: MoveResource): TypedMoveResource<T> | undefined {\n    return this.decodedInternal<T>(res)\n  }\n  filterAndDecodeResources<T>(typeQname: string, resources: MoveResource[]): TypedMoveResource<T>[] {\n    return this.filterAndDecodeInternal(typeQname, resources)\n  }\n\n  decodeFunctionPayload(payload: TransactionPayload_EntryFunctionPayload): TransactionPayload_EntryFunctionPayload {\n    const argumentsTyped: any[] = []\n\n    try {\n      const func = this.getMoveFunction(payload.function)\n      const params = getMeaningfulFunctionParams(func.params)\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 = params[idx]\n        argumentsTyped.push(this.decode(arg, argType))\n      }\n    } catch (e) {\n      console.error('Decoding error for ', JSON.stringify(payload), e)\n      return payload\n    }\n\n    return {\n      ...payload,\n      arguments_decoded: argumentsTyped,\n    } as TypedEntryFunctionPayload<any>\n  }\n}\n\nexport const MOVE_CODER = new MoveCoder()\n\nexport function defaultMoveCoder(): MoveCoder {\n  return MOVE_CODER\n}\n"]}

package/lib/aptos/move-types.d.ts

@@ -1,5 +1,5 @@
 import { Types } from 'aptos-sdk';
-import { NeutralMoveFunction, NeutralMoveModule, NeutralMoveStruct, NeutralMoveStructField } from '../move/neutral-models.js';
+import { InternalMoveFunction, InternalMoveModule, InternalMoveStruct, InternalMoveStructField } from '../move/internal-models.js';
 export type Address = Types.Address;
 export type Event = Types.Event;
 export type MoveFunction = Types.MoveFunction;
@@ -10,7 +10,7 @@ export type MoveStructField = Types.MoveStructField;
 export type MoveModuleBytecode = Types.MoveModuleBytecode;
 export type TransactionPayload_EntryFunctionPayload = Types.TransactionPayload_EntryFunctionPayload;
 export type Transaction_UserTransaction = Types.Transaction_UserTransaction;
-export declare function toNeutralModule(module: MoveModuleBytecode): NeutralMoveModule;
-export declare function toNeutralFunction(func: MoveFunction): NeutralMoveFunction;
-export declare function toNeutralStruct(struct: MoveStruct): NeutralMoveStruct;
-export declare function toNeutralField(module: MoveStructField): NeutralMoveStructField;
+export declare function toInternalModule(module: MoveModuleBytecode): InternalMoveModule;
+export declare function toInternalFunction(func: MoveFunction): InternalMoveFunction;
+export declare function toInternalStruct(struct: MoveStruct): InternalMoveStruct;
+export declare function toInternalField(module: MoveStructField): InternalMoveStructField;

package/lib/aptos/move-types.js

@@ -1,50 +1,50 @@
 import { Types } from 'aptos-sdk';
-import { NeutralMoveFunctionVisibility, } from '../move/neutral-models.js';
+import { InternalMoveFunctionVisibility, } from '../move/internal-models.js';
 import { parseMoveType } from '../move/index.js';
-export function toNeutralModule(module) {
+export function toInternalModule(module) {
     if (!module.abi) {
         throw Error('module with no ABI found');
     }
     const abi = module.abi;
     return {
         address: abi.address,
-        exposed_functions: abi.exposed_functions.map(toNeutralFunction),
+        exposedFunctions: abi.exposed_functions.map(toInternalFunction),
         name: abi.name,
-        structs: abi.structs.map(toNeutralStruct),
+        structs: abi.structs.map(toInternalStruct),
     };
 }
-export function toNeutralFunction(func) {
+export function toInternalFunction(func) {
     let visibility;
     switch (func.visibility) {
         case Types.MoveFunctionVisibility.PRIVATE:
-            visibility = NeutralMoveFunctionVisibility.PRIVATE;
+            visibility = InternalMoveFunctionVisibility.PRIVATE;
             break;
         case Types.MoveFunctionVisibility.PUBLIC:
-            visibility = NeutralMoveFunctionVisibility.PUBLIC;
+            visibility = InternalMoveFunctionVisibility.PUBLIC;
             break;
         case Types.MoveFunctionVisibility.FRIEND:
-            visibility = NeutralMoveFunctionVisibility.FRIEND;
+            visibility = InternalMoveFunctionVisibility.FRIEND;
             break;
     }
     return {
-        generic_type_params: func.generic_type_params,
-        is_entry: func.is_entry,
+        typeParams: func.generic_type_params,
+        isEntry: func.is_entry,
         name: func.name,
         params: func.params.map(parseMoveType),
         return: func.return.map(parseMoveType),
         visibility: visibility,
     };
 }
-export function toNeutralStruct(struct) {
+export function toInternalStruct(struct) {
     return {
         abilities: struct.abilities,
-        fields: struct.fields.map(toNeutralField),
-        generic_type_params: struct.generic_type_params,
-        is_native: struct.is_native,
+        fields: struct.fields.map(toInternalField),
+        typeParams: struct.generic_type_params,
+        isNative: struct.is_native,
         name: struct.name,
     };
 }
-export function toNeutralField(module) {
+export function toInternalField(module) {
     return {
         name: module.name,
         type: parseMoveType(module.type),

package/lib/aptos/move-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"move-types.js","sourceRoot":"","sources":["../../src/aptos/move-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AACjC,OAAO,EAEL,6BAA6B,GAI9B,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAahD,MAAM,UAAU,eAAe,CAAC,MAA0B;IACxD,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;QACf,MAAM,KAAK,CAAC,0BAA0B,CAAC,CAAA;KACxC;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAA;IACtB,OAAO;QACL,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,iBAAiB,CAAC;QAC/D,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;KAC1C,CAAA;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAAkB;IAClD,IAAI,UAAU,CAAA;IACd,QAAQ,IAAI,CAAC,UAAU,EAAE;QACvB,KAAK,KAAK,CAAC,sBAAsB,CAAC,OAAO;YACvC,UAAU,GAAG,6BAA6B,CAAC,OAAO,CAAA;YAClD,MAAK;QACP,KAAK,KAAK,CAAC,sBAAsB,CAAC,MAAM;YACtC,UAAU,GAAG,6BAA6B,CAAC,MAAM,CAAA;YACjD,MAAK;QACP,KAAK,KAAK,CAAC,sBAAsB,CAAC,MAAM;YACtC,UAAU,GAAG,6BAA6B,CAAC,MAAM,CAAA;YACjD,MAAK;KACR;IACD,OAAO;QACL,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;QAC7C,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC;QACtC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC;QACtC,UAAU,EAAE,UAAU;KACvB,CAAA;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAAkB;IAChD,OAAO;QACL,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC;QACzC,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;QAC/C,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,IAAI,EAAE,MAAM,CAAC,IAAI;KAClB,CAAA;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAuB;IACpD,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC;KACjC,CAAA;AACH,CAAC","sourcesContent":["import { Types } from 'aptos-sdk'\nimport {\n  NeutralMoveFunction,\n  NeutralMoveFunctionVisibility,\n  NeutralMoveModule,\n  NeutralMoveStruct,\n  NeutralMoveStructField,\n} from '../move/neutral-models.js'\nimport { parseMoveType } from '../move/index.js'\n\nexport type Address = Types.Address\nexport type Event = Types.Event\nexport type MoveFunction = Types.MoveFunction\nexport type MoveModule = Types.MoveModule\nexport type MoveResource = Types.MoveResource\nexport type MoveStruct = Types.MoveStruct\nexport type MoveStructField = Types.MoveStructField\nexport type MoveModuleBytecode = Types.MoveModuleBytecode\nexport type TransactionPayload_EntryFunctionPayload = Types.TransactionPayload_EntryFunctionPayload\nexport type Transaction_UserTransaction = Types.Transaction_UserTransaction\n\nexport function toNeutralModule(module: MoveModuleBytecode): NeutralMoveModule {\n  if (!module.abi) {\n    throw Error('module with no ABI found')\n  }\n  const abi = module.abi\n  return {\n    address: abi.address,\n    exposed_functions: abi.exposed_functions.map(toNeutralFunction),\n    name: abi.name,\n    structs: abi.structs.map(toNeutralStruct),\n  }\n}\n\nexport function toNeutralFunction(func: MoveFunction): NeutralMoveFunction {\n  let visibility\n  switch (func.visibility) {\n    case Types.MoveFunctionVisibility.PRIVATE:\n      visibility = NeutralMoveFunctionVisibility.PRIVATE\n      break\n    case Types.MoveFunctionVisibility.PUBLIC:\n      visibility = NeutralMoveFunctionVisibility.PUBLIC\n      break\n    case Types.MoveFunctionVisibility.FRIEND:\n      visibility = NeutralMoveFunctionVisibility.FRIEND\n      break\n  }\n  return {\n    generic_type_params: func.generic_type_params,\n    is_entry: func.is_entry,\n    name: func.name,\n    params: func.params.map(parseMoveType),\n    return: func.return.map(parseMoveType),\n    visibility: visibility,\n  }\n}\n\nexport function toNeutralStruct(struct: MoveStruct): NeutralMoveStruct {\n  return {\n    abilities: struct.abilities,\n    fields: struct.fields.map(toNeutralField),\n    generic_type_params: struct.generic_type_params,\n    is_native: struct.is_native,\n    name: struct.name,\n  }\n}\n\nexport function toNeutralField(module: MoveStructField): NeutralMoveStructField {\n  return {\n    name: module.name,\n    type: parseMoveType(module.type),\n  }\n}\n"]}
+{"version":3,"file":"move-types.js","sourceRoot":"","sources":["../../src/aptos/move-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAA;AACjC,OAAO,EAEL,8BAA8B,GAI/B,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAahD,MAAM,UAAU,gBAAgB,CAAC,MAA0B;IACzD,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;QACf,MAAM,KAAK,CAAC,0BAA0B,CAAC,CAAA;KACxC;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAA;IACtB,OAAO;QACL,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,gBAAgB,EAAE,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,kBAAkB,CAAC;QAC/D,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;KAC3C,CAAA;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAkB;IACnD,IAAI,UAAU,CAAA;IACd,QAAQ,IAAI,CAAC,UAAU,EAAE;QACvB,KAAK,KAAK,CAAC,sBAAsB,CAAC,OAAO;YACvC,UAAU,GAAG,8BAA8B,CAAC,OAAO,CAAA;YACnD,MAAK;QACP,KAAK,KAAK,CAAC,sBAAsB,CAAC,MAAM;YACtC,UAAU,GAAG,8BAA8B,CAAC,MAAM,CAAA;YAClD,MAAK;QACP,KAAK,KAAK,CAAC,sBAAsB,CAAC,MAAM;YACtC,UAAU,GAAG,8BAA8B,CAAC,MAAM,CAAA;YAClD,MAAK;KACR;IACD,OAAO;QACL,UAAU,EAAE,IAAI,CAAC,mBAAmB;QACpC,OAAO,EAAE,IAAI,CAAC,QAAQ;QACtB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC;QACtC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC;QACtC,UAAU,EAAE,UAAU;KACvB,CAAA;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAkB;IACjD,OAAO;QACL,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC;QAC1C,UAAU,EAAE,MAAM,CAAC,mBAAmB;QACtC,QAAQ,EAAE,MAAM,CAAC,SAAS;QAC1B,IAAI,EAAE,MAAM,CAAC,IAAI;KAClB,CAAA;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAAuB;IACrD,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC;KACjC,CAAA;AACH,CAAC","sourcesContent":["import { Types } from 'aptos-sdk'\nimport {\n  InternalMoveFunction,\n  InternalMoveFunctionVisibility,\n  InternalMoveModule,\n  InternalMoveStruct,\n  InternalMoveStructField,\n} from '../move/internal-models.js'\nimport { parseMoveType } from '../move/index.js'\n\nexport type Address = Types.Address\nexport type Event = Types.Event\nexport type MoveFunction = Types.MoveFunction\nexport type MoveModule = Types.MoveModule\nexport type MoveResource = Types.MoveResource\nexport type MoveStruct = Types.MoveStruct\nexport type MoveStructField = Types.MoveStructField\nexport type MoveModuleBytecode = Types.MoveModuleBytecode\nexport type TransactionPayload_EntryFunctionPayload = Types.TransactionPayload_EntryFunctionPayload\nexport type Transaction_UserTransaction = Types.Transaction_UserTransaction\n\nexport function toInternalModule(module: MoveModuleBytecode): InternalMoveModule {\n  if (!module.abi) {\n    throw Error('module with no ABI found')\n  }\n  const abi = module.abi\n  return {\n    address: abi.address,\n    exposedFunctions: abi.exposed_functions.map(toInternalFunction),\n    name: abi.name,\n    structs: abi.structs.map(toInternalStruct),\n  }\n}\n\nexport function toInternalFunction(func: MoveFunction): InternalMoveFunction {\n  let visibility\n  switch (func.visibility) {\n    case Types.MoveFunctionVisibility.PRIVATE:\n      visibility = InternalMoveFunctionVisibility.PRIVATE\n      break\n    case Types.MoveFunctionVisibility.PUBLIC:\n      visibility = InternalMoveFunctionVisibility.PUBLIC\n      break\n    case Types.MoveFunctionVisibility.FRIEND:\n      visibility = InternalMoveFunctionVisibility.FRIEND\n      break\n  }\n  return {\n    typeParams: func.generic_type_params,\n    isEntry: func.is_entry,\n    name: func.name,\n    params: func.params.map(parseMoveType),\n    return: func.return.map(parseMoveType),\n    visibility: visibility,\n  }\n}\n\nexport function toInternalStruct(struct: MoveStruct): InternalMoveStruct {\n  return {\n    abilities: struct.abilities,\n    fields: struct.fields.map(toInternalField),\n    typeParams: struct.generic_type_params,\n    isNative: struct.is_native,\n    name: struct.name,\n  }\n}\n\nexport function toInternalField(module: MoveStructField): InternalMoveStructField {\n  return {\n    name: module.name,\n    type: parseMoveType(module.type),\n  }\n}\n"]}

package/lib/move/abstract-codegen.d.ts

@@ -1,4 +1,4 @@
-import { NeutralMoveFunction, NeutralMoveModule, NeutralMoveStruct } from './neutral-models.js';
+import { InternalMoveFunction, InternalMoveModule, InternalMoveStruct } from './internal-models.js';
 import { AccountRegister } from './account.js';
 import { TypeDescriptor } from './types.js';
 interface OutputFile {
@@ -17,28 +17,28 @@ export declare abstract class AbstractCodegen<ModuleTypes, NetworkType> {
     PREFIX: string;
     STRUCT_FIELD_NAME: string;
     abstract fetchModules(account: string, network: NetworkType): Promise<ModuleTypes>;
-    abstract toNeutral(modules: ModuleTypes): NeutralMoveModule[];
-    abstract getEventStructs(module: NeutralMoveModule): Map<string, NeutralMoveStruct>;
+    abstract toInternalModules(modules: ModuleTypes): InternalMoveModule[];
+    abstract getEventStructs(module: InternalMoveModule): Map<string, InternalMoveStruct>;
     abstract getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[];
     readModulesFile(fullPath: string): any;
     generate(srcDir: string, outputDir: string): Promise<void>;
     generateForNetwork(srcDir: string, outputDir: string, network: NetworkType): Promise<void>;
     generateNetworkOption(network: NetworkType): "TEST_NET" | "MAIN_NET";
-    generateModule(module: NeutralMoveModule, network: NetworkType): string;
-    generateStructs(module: NeutralMoveModule, struct: NeutralMoveStruct, events: Set<string>): string;
-    generateFunctionTypeParameters(func: NeutralMoveFunction): string;
-    generateStructTypeParameters(struct: NeutralMoveStruct, useAny?: boolean): string;
-    generateCallArgsStructs(module: NeutralMoveModule, func: NeutralMoveFunction): string | undefined;
-    generateOnEntryFunctions(module: NeutralMoveModule, func: NeutralMoveFunction): string;
-    generateOnEvents(module: NeutralMoveModule, struct: NeutralMoveStruct): string;
+    generateModule(module: InternalMoveModule, network: NetworkType): string;
+    generateStructs(module: InternalMoveModule, struct: InternalMoveStruct, events: Set<string>): string;
+    generateFunctionTypeParameters(func: InternalMoveFunction): string;
+    generateStructTypeParameters(struct: InternalMoveStruct, useAny?: boolean): string;
+    generateCallArgsStructs(module: InternalMoveModule, func: InternalMoveFunction): string | undefined;
+    generateOnEntryFunctions(module: InternalMoveModule, func: InternalMoveFunction): string;
+    generateOnEvents(module: InternalMoveModule, struct: InternalMoveStruct): string;
 }
 export declare class AccountCodegen<ModuleType, NetworkType> {
-    modules: NeutralMoveModule[];
+    modules: InternalMoveModule[];
     config: Config<NetworkType>;
     abi: ModuleType;
     loader: AccountRegister;
     moduleGen: AbstractCodegen<ModuleType, NetworkType>;
-    constructor(moduleGen: AbstractCodegen<ModuleType, NetworkType>, loader: AccountRegister, abi: ModuleType, modules: NeutralMoveModule[], config: Config<NetworkType>);
+    constructor(moduleGen: AbstractCodegen<ModuleType, NetworkType>, loader: AccountRegister, abi: ModuleType, modules: InternalMoveModule[], config: Config<NetworkType>);
     generate(): OutputFile[];
 }
 export {};

package/lib/move/abstract-codegen.js

@@ -42,7 +42,7 @@ export class AbstractCodegen {
             }
             const fullPath = path.resolve(srcDir, file);
             const abi = this.readModulesFile(fullPath);
-            const modules = this.toNeutral(abi);
+            const modules = this.toInternalModules(abi);
             for (const module of modules) {
                 loader.register(module, path.basename(file, '.json'));
             }
@@ -58,7 +58,7 @@ export class AbstractCodegen {
                 console.log(`download dependent module for account ${account} at ${network}`);
                 try {
                     const rawModules = await this.fetchModules(account, network);
-                    const modules = this.toNeutral(rawModules);
+                    const modules = this.toInternalModules(rawModules);
                     fs.writeFileSync(path.resolve(srcDir, account + '.json'), JSON.stringify(rawModules, null, '\t'));
                     for (const module of modules) {
                         loader.register(module, account);
@@ -100,7 +100,7 @@ export class AbstractCodegen {
         return 'MAIN_NET';
     }
     generateModule(module, network) {
-        const functions = module.exposed_functions
+        const functions = module.exposedFunctions
             .map((f) => this.generateOnEntryFunctions(module, f))
             .filter((s) => s !== '');
         const eventStructs = this.getEventStructs(module);
@@ -109,7 +109,7 @@ export class AbstractCodegen {
             .map((e) => this.generateOnEvents(module, e))
             .filter((s) => s !== '');
         const structs = module.structs.map((s) => this.generateStructs(module, s, eventTypes));
-        const callArgs = module.exposed_functions.map((f) => this.generateCallArgsStructs(module, f));
+        const callArgs = module.exposedFunctions.map((f) => this.generateCallArgsStructs(module, f));
         const moduleName = normalizeToJSName(module.name);
         let processor = '';
         if (functions.length > 0 || events.length > 0) {
@@ -120,15 +120,15 @@ export class AbstractCodegen {
     }
     static DEFAULT_OPTIONS: ${this.PREFIX}BindOptions = {
       address: "${module.address}",
-      network: ${this.PREFIX}Network.${this.generateNetworkOption(network)}       
+      network: ${this.PREFIX}Network.${this.generateNetworkOption(network)}
     }
 
     static bind(options: Partial<${this.PREFIX}BindOptions> = {}): ${moduleName} {
       return new ${moduleName}({ ...${moduleName}.DEFAULT_OPTIONS, ...options })
     }
-    
+
     ${functions.join('\n')}
-    
+
     ${events.join('\n')}
   }
   `;
@@ -138,7 +138,7 @@ export class AbstractCodegen {
 
   export namespace ${moduleName} {
     ${structs.join('\n')}
-    
+
     ${callArgs.join('\n')}
  }
   `;
@@ -154,26 +154,26 @@ export class AbstractCodegen {
         let eventPayload = '';
         if (events.has(moduleQname(module) + SPLITTER + struct.name)) {
             eventPayload = `
-    export interface ${structName}Instance extends 
+    export interface ${structName}Instance extends
         TypedEventInstance<${structName}${genericStringAny}> {
       ${this.STRUCT_FIELD_NAME}_decoded: ${structName}${genericStringAny}
-      type_arguments: [${struct.generic_type_params.map((_) => 'string').join(', ')}]
+      type_arguments: [${struct.typeParams.map((_) => 'string').join(', ')}]
     }
     `;
         }
         return `
   export class ${structName}${genericString} {
     static TYPE_QNAME = '${module.address}::${module.name}::${struct.name}'
-    ${fields.join('\n')} 
+    ${fields.join('\n')}
   }
-  
+
   ${eventPayload}
   `;
     }
     generateFunctionTypeParameters(func) {
         let genericString = '';
-        if (func.generic_type_params && func.generic_type_params.length > 0) {
-            const params = func.generic_type_params
+        if (func.typeParams && func.typeParams.length > 0) {
+            const params = func.typeParams
                 .map((v, idx) => {
                 return `T${idx}=any`;
             })
@@ -184,8 +184,8 @@ export class AbstractCodegen {
     }
     generateStructTypeParameters(struct, useAny = false) {
         let genericString = '';
-        if (struct.generic_type_params && struct.generic_type_params.length > 0) {
-            const params = struct.generic_type_params
+        if (struct.typeParams && struct.typeParams.length > 0) {
+            const params = struct.typeParams
                 .map((v, idx) => {
                 return useAny ? 'any' : 'T' + idx;
             })
@@ -195,7 +195,7 @@ export class AbstractCodegen {
         return genericString;
     }
     generateCallArgsStructs(module, func) {
-        if (!func.is_entry) {
+        if (!func.isEntry) {
             return;
         }
         const fields = this.getMeaningfulFunctionParams(func.params).map((param) => {
@@ -207,12 +207,12 @@ export class AbstractCodegen {
   export interface ${camelFuncName}Payload${genericString}
       extends TypedEntryFunctionPayload<[${fields.join(',')}]> {
     arguments_decoded: [${fields.join(',')}],
-    type_arguments: [${func.generic_type_params.map((_) => 'string').join(', ')}]
+    type_arguments: [${func.typeParams.map((_) => 'string').join(', ')}]
   }
   `;
     }
     generateOnEntryFunctions(module, func) {
-        if (!func.is_entry) {
+        if (!func.isEntry) {
             return '';
         }
         // const genericString = generateFunctionTypeParameters(func)
@@ -276,8 +276,8 @@ export class AccountCodegen {
         }
         const imports = `
     import { CallFilter } from "@sentio/sdk/move"
-    import { 
-      MoveCoder, defaultMoveCoder, ${this.moduleGen.PREFIX}BindOptions, ${this.moduleGen.PREFIX}BaseProcessor, 
+    import {
+      MoveCoder, defaultMoveCoder, ${this.moduleGen.PREFIX}BindOptions, ${this.moduleGen.PREFIX}BaseProcessor,
       TypedEventInstance, ${this.moduleGen.PREFIX}Network, TypedEntryFunctionPayload,
       ${this.moduleGen.PREFIX}Context } from "@sentio/sdk/${this.moduleGen.PREFIX.toLowerCase()}"
     import { MoveFetchConfig } from "@sentio/protos"
@@ -304,15 +304,15 @@ export class AccountCodegen {
     /* Autogenerated file. Do not edit manually. */
     /* tslint:disable */
     /* eslint-disable */
-  
+
     /* Generated modules for account ${address} */
-  
+
     ${imports}
-    
+
     ${moduleImports.join('\n')}
-    
+
     ${this.modules.map((m) => this.moduleGen.generateModule(m, this.config.network)).join('\n')}
-    
+
     const MODULES = JSON.parse('${JSON.stringify(this.abi)}')
 
     export function loadAllTypes(coder: MoveCoder) {
@@ -321,7 +321,7 @@ export class AccountCodegen {
         coder.load(m as any)
       }
     }
-    
+
     loadAllTypes(defaultMoveCoder())
     `; // source
         return [

package/lib/move/abstract-codegen.js.map

@@ -1 +1 @@
-{"version":3,"file":"abstract-codegen.js","sourceRoot":"","sources":["../../src/move/abstract-codegen.ts"],"names":[],"mappings":"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","sourcesContent":["import { NeutralMoveFunction, NeutralMoveModule, NeutralMoveStruct } from './neutral-models.js'\nimport path from 'path'\nimport fs from 'fs'\nimport { AccountModulesImportInfo, AccountRegister } from './account.js'\nimport chalk from 'chalk'\nimport { format } from 'prettier'\nimport { isFrameworkAccount, moduleQname, normalizeToJSName, SPLITTER } from './utils.js'\nimport { generateTypeForDescriptor } from './ts-type.js'\nimport { camelCase } from 'lodash-es'\nimport { TypeDescriptor } from './types.js'\n\ninterface OutputFile {\n  fileName: string\n  fileContent: string\n}\n\ninterface Config<NetworkType> {\n  fileName: string\n  outputDir: string\n  network: NetworkType\n}\n\nexport abstract class AbstractCodegen<ModuleTypes, NetworkType> {\n  TEST_NET: NetworkType\n  MAIN_NET: NetworkType\n  ADDRESS_TYPE: string\n  PREFIX: string\n  STRUCT_FIELD_NAME: string = 'data'\n\n  abstract fetchModules(account: string, network: NetworkType): Promise<ModuleTypes>\n  abstract toNeutral(modules: ModuleTypes): NeutralMoveModule[]\n  abstract getEventStructs(module: NeutralMoveModule): Map<string, NeutralMoveStruct>\n\n  abstract getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[]\n\n  readModulesFile(fullPath: string) {\n    return JSON.parse(fs.readFileSync(fullPath, 'utf-8'))\n  }\n\n  async generate(srcDir: string, outputDir: string) {\n    await this.generateForNetwork(srcDir, outputDir, this.MAIN_NET)\n    await this.generateForNetwork(path.join(srcDir, 'testnet'), path.join(outputDir, 'testnet'), this.TEST_NET)\n  }\n\n  async generateForNetwork(srcDir: string, outputDir: string, network: NetworkType) {\n    if (!fs.existsSync(srcDir)) {\n      return\n    }\n    if (network === this.TEST_NET) {\n      console.log('Found testnet directory, generate code for testnet modules')\n    }\n    const files = fs.readdirSync(srcDir)\n    outputDir = path.resolve(outputDir)\n    const outputs: OutputFile[] = []\n\n    fs.mkdirSync(outputDir, { recursive: true })\n\n    const loader = new AccountRegister()\n\n    // when generating user code, don't need to generate framework account\n    loader.accountImports.set('0x1', new AccountModulesImportInfo('0x1', '0x1'))\n    loader.accountImports.set('0x2', new AccountModulesImportInfo('0x2', '0x2'))\n    loader.accountImports.set('0x3', new AccountModulesImportInfo('0x3', '0x3'))\n    // const client = getRpcClient(network)\n\n    for (const file of files) {\n      if (!file.endsWith('.json')) {\n        continue\n      }\n      const fullPath = path.resolve(srcDir, file)\n      const abi = this.readModulesFile(fullPath)\n      const modules = this.toNeutral(abi)\n\n      for (const module of modules) {\n        loader.register(module, path.basename(file, '.json'))\n      }\n      const codeGen = new AccountCodegen(this, loader, abi, modules, {\n        fileName: path.basename(file, '.json'),\n        outputDir: outputDir,\n        network,\n      })\n\n      outputs.push(...codeGen.generate())\n    }\n\n    while (loader.pendingAccounts.size > 0) {\n      for (const account of loader.pendingAccounts) {\n        console.log(`download dependent module for account ${account} at ${network}`)\n\n        try {\n          const rawModules = await this.fetchModules(account, network)\n          const modules = this.toNeutral(rawModules)\n\n          fs.writeFileSync(path.resolve(srcDir, account + '.json'), JSON.stringify(rawModules, null, '\\t'))\n\n          for (const module of modules) {\n            loader.register(module, account)\n          }\n          const codeGen = new AccountCodegen(this, loader, rawModules, modules, {\n            fileName: account,\n            outputDir: outputDir,\n            network,\n          })\n\n          outputs.push(...codeGen.generate())\n        } catch (e) {\n          console.error(\n            chalk.red(\n              'Error downloading account module, check if you choose the right network，or download account modules manually into your director'\n            )\n          )\n          console.error(e)\n          process.exit(1)\n        }\n      }\n    }\n\n    for (const output of outputs) {\n      const content = format(output.fileContent, { parser: 'typescript' })\n      fs.writeFileSync(path.join(outputDir, output.fileName), content)\n    }\n\n    const rootFile = path.join(outputDir, 'index.ts')\n    fs.writeFileSync(\n      rootFile,\n      `/* Autogenerated file. Do not edit manually. */\n/* tslint:disable */\n/* eslint-disable */\n`\n    )\n    for (const output of outputs) {\n      const parsed = path.parse(output.fileName)\n      const content = `export * as _${parsed.name} from './${parsed.name}.js'\\n`\n      fs.appendFileSync(rootFile, content)\n    }\n  }\n\n  generateNetworkOption(network: NetworkType) {\n    switch (network) {\n      case this.TEST_NET:\n        return 'TEST_NET'\n    }\n    return 'MAIN_NET'\n  }\n\n  generateModule(module: NeutralMoveModule, network: NetworkType) {\n    const functions = module.exposed_functions\n      .map((f) => this.generateOnEntryFunctions(module, f))\n      .filter((s) => s !== '')\n\n    const eventStructs = this.getEventStructs(module)\n    const eventTypes = new Set(eventStructs.keys())\n    const events = Array.from(eventStructs.values())\n      .map((e) => this.generateOnEvents(module, e))\n      .filter((s) => s !== '')\n    const structs = module.structs.map((s) => this.generateStructs(module, s, eventTypes))\n    const callArgs = module.exposed_functions.map((f) => this.generateCallArgsStructs(module, f))\n\n    const moduleName = normalizeToJSName(module.name)\n    let processor = ''\n    if (functions.length > 0 || events.length > 0) {\n      processor = `export class ${moduleName} extends ${this.PREFIX}BaseProcessor {\n\n    constructor(options: ${this.PREFIX}BindOptions) {\n      super(\"${module.name}\", options)\n    }\n    static DEFAULT_OPTIONS: ${this.PREFIX}BindOptions = {\n      address: \"${module.address}\",\n      network: ${this.PREFIX}Network.${this.generateNetworkOption(network)}       \n    }\n\n    static bind(options: Partial<${this.PREFIX}BindOptions> = {}): ${moduleName} {\n      return new ${moduleName}({ ...${moduleName}.DEFAULT_OPTIONS, ...options })\n    }\n    \n    ${functions.join('\\n')}\n    \n    ${events.join('\\n')}\n  }\n  `\n    }\n\n    return `\n  ${processor}\n\n  export namespace ${moduleName} {\n    ${structs.join('\\n')}\n    \n    ${callArgs.join('\\n')}\n }\n  `\n  }\n\n  generateStructs(module: NeutralMoveModule, struct: NeutralMoveStruct, events: Set<string>) {\n    const genericString = this.generateStructTypeParameters(struct)\n    const genericStringAny = this.generateStructTypeParameters(struct, true)\n\n    const structName = normalizeToJSName(struct.name)\n\n    const fields = struct.fields.map((field) => {\n      const type = generateTypeForDescriptor(field.type, module.address, this.ADDRESS_TYPE)\n      return `${field.name}: ${type}`\n    })\n\n    let eventPayload = ''\n    if (events.has(moduleQname(module) + SPLITTER + struct.name)) {\n      eventPayload = `\n    export interface ${structName}Instance extends \n        TypedEventInstance<${structName}${genericStringAny}> {\n      ${this.STRUCT_FIELD_NAME}_decoded: ${structName}${genericStringAny}\n      type_arguments: [${struct.generic_type_params.map((_) => 'string').join(', ')}]\n    }\n    `\n    }\n\n    return `\n  export class ${structName}${genericString} {\n    static TYPE_QNAME = '${module.address}::${module.name}::${struct.name}'\n    ${fields.join('\\n')} \n  }\n  \n  ${eventPayload}\n  `\n  }\n\n  generateFunctionTypeParameters(func: NeutralMoveFunction) {\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}=any`\n        })\n        .join(',')\n      genericString = `<${params}>`\n    }\n    return genericString\n  }\n\n  generateStructTypeParameters(struct: NeutralMoveStruct, useAny = false) {\n    let genericString = ''\n\n    if (struct.generic_type_params && struct.generic_type_params.length > 0) {\n      const params = struct.generic_type_params\n        .map((v, idx) => {\n          return useAny ? 'any' : 'T' + idx\n        })\n        .join(',')\n      genericString = `<${params}>`\n    }\n    return genericString\n  }\n\n  generateCallArgsStructs(module: NeutralMoveModule, func: NeutralMoveFunction) {\n    if (!func.is_entry) {\n      return\n    }\n\n    const fields = this.getMeaningfulFunctionParams(func.params).map((param) => {\n      return generateTypeForDescriptor(param, module.address, this.ADDRESS_TYPE)\n    })\n\n    const camelFuncName = capitalizeFirstChar(camelCase(func.name))\n\n    const genericString = this.generateFunctionTypeParameters(func)\n    return `\n  export interface ${camelFuncName}Payload${genericString}\n      extends TypedEntryFunctionPayload<[${fields.join(',')}]> {\n    arguments_decoded: [${fields.join(',')}],\n    type_arguments: [${func.generic_type_params.map((_) => 'string').join(', ')}]\n  }\n  `\n  }\n\n  generateOnEntryFunctions(module: NeutralMoveModule, func: NeutralMoveFunction) {\n    if (!func.is_entry) {\n      return ''\n    }\n\n    // const genericString = generateFunctionTypeParameters(func)\n    const moduleName = normalizeToJSName(module.name)\n\n    const camelFuncName = capitalizeFirstChar(camelCase(func.name))\n    const source = `\n  onEntry${camelFuncName}(func: (call: ${moduleName}.${camelFuncName}Payload, ctx: ${this.PREFIX}Context) => void, filter?: CallFilter, fetchConfig?: MoveFetchConfig): ${moduleName} {\n    this.onEntryFunctionCall(func, {\n      ...filter,\n      function: '${module.name}::${func.name}'\n    },\n    fetchConfig)\n    return this\n  }`\n\n    return source\n  }\n\n  generateOnEvents(module: NeutralMoveModule, struct: NeutralMoveStruct): string {\n    // for struct that has drop + store\n    // if (!isEvent(struct, module)) {\n    //   return ''\n    // }\n\n    // const genericString = generateStructTypeParameters(struct)\n\n    const moduleName = normalizeToJSName(module.name)\n    const source = `\n  onEvent${struct.name}(func: (event: ${moduleName}.${normalizeToJSName(struct.name)}Instance, ctx: ${\n      this.PREFIX\n    }Context) => void, fetchConfig?: MoveFetchConfig): ${moduleName} {\n    this.onMoveEvent(func, {\n      type: '${module.name}::${struct.name}'\n    },\n    fetchConfig)\n    return this\n  }\n  `\n    return source\n  }\n}\n\nexport class AccountCodegen<ModuleType, NetworkType> {\n  modules: NeutralMoveModule[]\n  config: Config<NetworkType>\n  abi: ModuleType\n  loader: AccountRegister\n  moduleGen: AbstractCodegen<ModuleType, NetworkType>\n\n  constructor(\n    moduleGen: AbstractCodegen<ModuleType, NetworkType>,\n    loader: AccountRegister,\n    abi: ModuleType,\n    modules: NeutralMoveModule[],\n    config: Config<NetworkType>\n  ) {\n    // const json = fs.readFileSync(config.srcFile, 'utf-8')\n    this.moduleGen = moduleGen\n    this.abi = abi\n    this.modules = modules\n    this.config = config\n    this.loader = loader\n  }\n\n  generate(): OutputFile[] {\n    if (!this.modules) {\n      return []\n    }\n    // const baseName = path.basename(this.config.fileName, '.json')\n\n    let address: string | undefined\n    for (const module of this.modules) {\n      address = module.address\n    }\n    if (!address) {\n      return []\n    }\n\n    const imports = `\n    import { CallFilter } from \"@sentio/sdk/move\"\n    import { \n      MoveCoder, defaultMoveCoder, ${this.moduleGen.PREFIX}BindOptions, ${this.moduleGen.PREFIX}BaseProcessor, \n      TypedEventInstance, ${this.moduleGen.PREFIX}Network, TypedEntryFunctionPayload,\n      ${this.moduleGen.PREFIX}Context } from \"@sentio/sdk/${this.moduleGen.PREFIX.toLowerCase()}\"\n    import { MoveFetchConfig } from \"@sentio/protos\"\n    import { ${this.moduleGen.ADDRESS_TYPE} } from \"@sentio/sdk/${this.moduleGen.PREFIX.toLowerCase()}\"\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] of info.imports.entries()) {\n        // Remap to user's filename if possible, TODO codepath not well tested\n        const tsAccountModule = './' + (this.loader.accountImports.get(account)?.moduleName || account)\n        if (isFrameworkAccount(account) && !isFrameworkAccount(address)) {\n          // Decide where to find runtime library\n          moduleImports.push(`import { _${account} } from \"@sentio/sdk/${this.moduleGen.PREFIX.toLowerCase()}/builtin\"`)\n        } else {\n          moduleImports.push(`import * as _${account} from \"${tsAccountModule}.js\"`)\n        }\n\n        dependedAccounts.push(account)\n      }\n    }\n\n    const 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) => this.moduleGen.generateModule(m, this.config.network)).join('\\n')}\n    \n    const MODULES = JSON.parse('${JSON.stringify(this.abi)}')\n\n    export function loadAllTypes(coder: MoveCoder) {\n      ${dependedAccounts.map((a) => `_${a}.loadAllTypes(coder)`).join('\\n')}\n      for (const m of Object.values(MODULES)) {\n        coder.load(m as any)\n      }\n    }\n    \n    loadAllTypes(defaultMoveCoder())\n    ` // source\n\n    return [\n      {\n        fileName: this.config.fileName + '.ts',\n        fileContent: source,\n      },\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":"abstract-codegen.js","sourceRoot":"","sources":["../../src/move/abstract-codegen.ts"],"names":[],"mappings":"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","sourcesContent":["import { InternalMoveFunction, InternalMoveModule, InternalMoveStruct } from './internal-models.js'\nimport path from 'path'\nimport fs from 'fs'\nimport { AccountModulesImportInfo, AccountRegister } from './account.js'\nimport chalk from 'chalk'\nimport { format } from 'prettier'\nimport { isFrameworkAccount, moduleQname, normalizeToJSName, SPLITTER } from './utils.js'\nimport { generateTypeForDescriptor } from './ts-type.js'\nimport { camelCase } from 'lodash-es'\nimport { TypeDescriptor } from './types.js'\n\ninterface OutputFile {\n  fileName: string\n  fileContent: string\n}\n\ninterface Config<NetworkType> {\n  fileName: string\n  outputDir: string\n  network: NetworkType\n}\n\nexport abstract class AbstractCodegen<ModuleTypes, NetworkType> {\n  TEST_NET: NetworkType\n  MAIN_NET: NetworkType\n  ADDRESS_TYPE: string\n  PREFIX: string\n  STRUCT_FIELD_NAME: string = 'data'\n\n  abstract fetchModules(account: string, network: NetworkType): Promise<ModuleTypes>\n  abstract toInternalModules(modules: ModuleTypes): InternalMoveModule[]\n  // Get the structs that represent Events\n  abstract getEventStructs(module: InternalMoveModule): Map<string, InternalMoveStruct>\n  // Get the parameters that actually have arguments in runtime\n  // Aptos first signer and Sui's last TxContext are no use\n  abstract getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[]\n\n  readModulesFile(fullPath: string) {\n    return JSON.parse(fs.readFileSync(fullPath, 'utf-8'))\n  }\n\n  async generate(srcDir: string, outputDir: string) {\n    await this.generateForNetwork(srcDir, outputDir, this.MAIN_NET)\n    await this.generateForNetwork(path.join(srcDir, 'testnet'), path.join(outputDir, 'testnet'), this.TEST_NET)\n  }\n\n  async generateForNetwork(srcDir: string, outputDir: string, network: NetworkType) {\n    if (!fs.existsSync(srcDir)) {\n      return\n    }\n    if (network === this.TEST_NET) {\n      console.log('Found testnet directory, generate code for testnet modules')\n    }\n    const files = fs.readdirSync(srcDir)\n    outputDir = path.resolve(outputDir)\n    const outputs: OutputFile[] = []\n\n    fs.mkdirSync(outputDir, { recursive: true })\n\n    const loader = new AccountRegister()\n\n    // when generating user code, don't need to generate framework account\n    loader.accountImports.set('0x1', new AccountModulesImportInfo('0x1', '0x1'))\n    loader.accountImports.set('0x2', new AccountModulesImportInfo('0x2', '0x2'))\n    loader.accountImports.set('0x3', new AccountModulesImportInfo('0x3', '0x3'))\n    // const client = getRpcClient(network)\n\n    for (const file of files) {\n      if (!file.endsWith('.json')) {\n        continue\n      }\n      const fullPath = path.resolve(srcDir, file)\n      const abi = this.readModulesFile(fullPath)\n      const modules = this.toInternalModules(abi)\n\n      for (const module of modules) {\n        loader.register(module, path.basename(file, '.json'))\n      }\n      const codeGen = new AccountCodegen(this, loader, abi, modules, {\n        fileName: path.basename(file, '.json'),\n        outputDir: outputDir,\n        network,\n      })\n\n      outputs.push(...codeGen.generate())\n    }\n\n    while (loader.pendingAccounts.size > 0) {\n      for (const account of loader.pendingAccounts) {\n        console.log(`download dependent module for account ${account} at ${network}`)\n\n        try {\n          const rawModules = await this.fetchModules(account, network)\n          const modules = this.toInternalModules(rawModules)\n\n          fs.writeFileSync(path.resolve(srcDir, account + '.json'), JSON.stringify(rawModules, null, '\\t'))\n\n          for (const module of modules) {\n            loader.register(module, account)\n          }\n          const codeGen = new AccountCodegen(this, loader, rawModules, modules, {\n            fileName: account,\n            outputDir: outputDir,\n            network,\n          })\n\n          outputs.push(...codeGen.generate())\n        } catch (e) {\n          console.error(\n            chalk.red(\n              'Error downloading account module, check if you choose the right network，or download account modules manually into your director'\n            )\n          )\n          console.error(e)\n          process.exit(1)\n        }\n      }\n    }\n\n    for (const output of outputs) {\n      const content = format(output.fileContent, { parser: 'typescript' })\n      fs.writeFileSync(path.join(outputDir, output.fileName), content)\n    }\n\n    const rootFile = path.join(outputDir, 'index.ts')\n    fs.writeFileSync(\n      rootFile,\n      `/* Autogenerated file. Do not edit manually. */\n/* tslint:disable */\n/* eslint-disable */\n`\n    )\n    for (const output of outputs) {\n      const parsed = path.parse(output.fileName)\n      const content = `export * as _${parsed.name} from './${parsed.name}.js'\\n`\n      fs.appendFileSync(rootFile, content)\n    }\n  }\n\n  generateNetworkOption(network: NetworkType) {\n    switch (network) {\n      case this.TEST_NET:\n        return 'TEST_NET'\n    }\n    return 'MAIN_NET'\n  }\n\n  generateModule(module: InternalMoveModule, network: NetworkType) {\n    const functions = module.exposedFunctions\n      .map((f) => this.generateOnEntryFunctions(module, f))\n      .filter((s) => s !== '')\n\n    const eventStructs = this.getEventStructs(module)\n    const eventTypes = new Set(eventStructs.keys())\n    const events = Array.from(eventStructs.values())\n      .map((e) => this.generateOnEvents(module, e))\n      .filter((s) => s !== '')\n    const structs = module.structs.map((s) => this.generateStructs(module, s, eventTypes))\n    const callArgs = module.exposedFunctions.map((f) => this.generateCallArgsStructs(module, f))\n\n    const moduleName = normalizeToJSName(module.name)\n    let processor = ''\n    if (functions.length > 0 || events.length > 0) {\n      processor = `export class ${moduleName} extends ${this.PREFIX}BaseProcessor {\n\n    constructor(options: ${this.PREFIX}BindOptions) {\n      super(\"${module.name}\", options)\n    }\n    static DEFAULT_OPTIONS: ${this.PREFIX}BindOptions = {\n      address: \"${module.address}\",\n      network: ${this.PREFIX}Network.${this.generateNetworkOption(network)}\n    }\n\n    static bind(options: Partial<${this.PREFIX}BindOptions> = {}): ${moduleName} {\n      return new ${moduleName}({ ...${moduleName}.DEFAULT_OPTIONS, ...options })\n    }\n\n    ${functions.join('\\n')}\n\n    ${events.join('\\n')}\n  }\n  `\n    }\n\n    return `\n  ${processor}\n\n  export namespace ${moduleName} {\n    ${structs.join('\\n')}\n\n    ${callArgs.join('\\n')}\n }\n  `\n  }\n\n  generateStructs(module: InternalMoveModule, struct: InternalMoveStruct, events: Set<string>) {\n    const genericString = this.generateStructTypeParameters(struct)\n    const genericStringAny = this.generateStructTypeParameters(struct, true)\n\n    const structName = normalizeToJSName(struct.name)\n\n    const fields = struct.fields.map((field) => {\n      const type = generateTypeForDescriptor(field.type, module.address, this.ADDRESS_TYPE)\n      return `${field.name}: ${type}`\n    })\n\n    let eventPayload = ''\n    if (events.has(moduleQname(module) + SPLITTER + struct.name)) {\n      eventPayload = `\n    export interface ${structName}Instance extends\n        TypedEventInstance<${structName}${genericStringAny}> {\n      ${this.STRUCT_FIELD_NAME}_decoded: ${structName}${genericStringAny}\n      type_arguments: [${struct.typeParams.map((_) => 'string').join(', ')}]\n    }\n    `\n    }\n\n    return `\n  export class ${structName}${genericString} {\n    static TYPE_QNAME = '${module.address}::${module.name}::${struct.name}'\n    ${fields.join('\\n')}\n  }\n\n  ${eventPayload}\n  `\n  }\n\n  generateFunctionTypeParameters(func: InternalMoveFunction) {\n    let genericString = ''\n    if (func.typeParams && func.typeParams.length > 0) {\n      const params = func.typeParams\n        .map((v, idx) => {\n          return `T${idx}=any`\n        })\n        .join(',')\n      genericString = `<${params}>`\n    }\n    return genericString\n  }\n\n  generateStructTypeParameters(struct: InternalMoveStruct, useAny = false) {\n    let genericString = ''\n\n    if (struct.typeParams && struct.typeParams.length > 0) {\n      const params = struct.typeParams\n        .map((v, idx) => {\n          return useAny ? 'any' : 'T' + idx\n        })\n        .join(',')\n      genericString = `<${params}>`\n    }\n    return genericString\n  }\n\n  generateCallArgsStructs(module: InternalMoveModule, func: InternalMoveFunction) {\n    if (!func.isEntry) {\n      return\n    }\n\n    const fields = this.getMeaningfulFunctionParams(func.params).map((param) => {\n      return generateTypeForDescriptor(param, module.address, this.ADDRESS_TYPE)\n    })\n\n    const camelFuncName = capitalizeFirstChar(camelCase(func.name))\n\n    const genericString = this.generateFunctionTypeParameters(func)\n    return `\n  export interface ${camelFuncName}Payload${genericString}\n      extends TypedEntryFunctionPayload<[${fields.join(',')}]> {\n    arguments_decoded: [${fields.join(',')}],\n    type_arguments: [${func.typeParams.map((_) => 'string').join(', ')}]\n  }\n  `\n  }\n\n  generateOnEntryFunctions(module: InternalMoveModule, func: InternalMoveFunction) {\n    if (!func.isEntry) {\n      return ''\n    }\n\n    // const genericString = generateFunctionTypeParameters(func)\n    const moduleName = normalizeToJSName(module.name)\n\n    const camelFuncName = capitalizeFirstChar(camelCase(func.name))\n    const source = `\n  onEntry${camelFuncName}(func: (call: ${moduleName}.${camelFuncName}Payload, ctx: ${this.PREFIX}Context) => void, filter?: CallFilter, fetchConfig?: MoveFetchConfig): ${moduleName} {\n    this.onEntryFunctionCall(func, {\n      ...filter,\n      function: '${module.name}::${func.name}'\n    },\n    fetchConfig)\n    return this\n  }`\n\n    return source\n  }\n\n  generateOnEvents(module: InternalMoveModule, struct: InternalMoveStruct): string {\n    // for struct that has drop + store\n    // if (!isEvent(struct, module)) {\n    //   return ''\n    // }\n\n    // const genericString = generateStructTypeParameters(struct)\n\n    const moduleName = normalizeToJSName(module.name)\n    const source = `\n  onEvent${struct.name}(func: (event: ${moduleName}.${normalizeToJSName(struct.name)}Instance, ctx: ${\n      this.PREFIX\n    }Context) => void, fetchConfig?: MoveFetchConfig): ${moduleName} {\n    this.onMoveEvent(func, {\n      type: '${module.name}::${struct.name}'\n    },\n    fetchConfig)\n    return this\n  }\n  `\n    return source\n  }\n}\n\nexport class AccountCodegen<ModuleType, NetworkType> {\n  modules: InternalMoveModule[]\n  config: Config<NetworkType>\n  abi: ModuleType\n  loader: AccountRegister\n  moduleGen: AbstractCodegen<ModuleType, NetworkType>\n\n  constructor(\n    moduleGen: AbstractCodegen<ModuleType, NetworkType>,\n    loader: AccountRegister,\n    abi: ModuleType,\n    modules: InternalMoveModule[],\n    config: Config<NetworkType>\n  ) {\n    // const json = fs.readFileSync(config.srcFile, 'utf-8')\n    this.moduleGen = moduleGen\n    this.abi = abi\n    this.modules = modules\n    this.config = config\n    this.loader = loader\n  }\n\n  generate(): OutputFile[] {\n    if (!this.modules) {\n      return []\n    }\n    // const baseName = path.basename(this.config.fileName, '.json')\n\n    let address: string | undefined\n    for (const module of this.modules) {\n      address = module.address\n    }\n    if (!address) {\n      return []\n    }\n\n    const imports = `\n    import { CallFilter } from \"@sentio/sdk/move\"\n    import {\n      MoveCoder, defaultMoveCoder, ${this.moduleGen.PREFIX}BindOptions, ${this.moduleGen.PREFIX}BaseProcessor,\n      TypedEventInstance, ${this.moduleGen.PREFIX}Network, TypedEntryFunctionPayload,\n      ${this.moduleGen.PREFIX}Context } from \"@sentio/sdk/${this.moduleGen.PREFIX.toLowerCase()}\"\n    import { MoveFetchConfig } from \"@sentio/protos\"\n    import { ${this.moduleGen.ADDRESS_TYPE} } from \"@sentio/sdk/${this.moduleGen.PREFIX.toLowerCase()}\"\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] of info.imports.entries()) {\n        // Remap to user's filename if possible, TODO codepath not well tested\n        const tsAccountModule = './' + (this.loader.accountImports.get(account)?.moduleName || account)\n        if (isFrameworkAccount(account) && !isFrameworkAccount(address)) {\n          // Decide where to find runtime library\n          moduleImports.push(`import { _${account} } from \"@sentio/sdk/${this.moduleGen.PREFIX.toLowerCase()}/builtin\"`)\n        } else {\n          moduleImports.push(`import * as _${account} from \"${tsAccountModule}.js\"`)\n        }\n\n        dependedAccounts.push(account)\n      }\n    }\n\n    const 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) => this.moduleGen.generateModule(m, this.config.network)).join('\\n')}\n\n    const MODULES = JSON.parse('${JSON.stringify(this.abi)}')\n\n    export function loadAllTypes(coder: MoveCoder) {\n      ${dependedAccounts.map((a) => `_${a}.loadAllTypes(coder)`).join('\\n')}\n      for (const m of Object.values(MODULES)) {\n        coder.load(m as any)\n      }\n    }\n\n    loadAllTypes(defaultMoveCoder())\n    ` // source\n\n    return [\n      {\n        fileName: this.config.fileName + '.ts',\n        fileContent: source,\n      },\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/move/abstract-move-coder.d.ts

@@ -1,5 +1,5 @@
 import { TypeDescriptor } from './types.js';
-import { NeutralMoveFunction, NeutralMoveModule, NeutralMoveStruct } from './neutral-models.js';
+import { InternalMoveFunction, InternalMoveModule, InternalMoveStruct } from './internal-models.js';
 type StructWithTag<Base> = Base & {
     type: string;
     data: any;
@@ -13,10 +13,10 @@ export declare abstract class AbstractMoveCoder<StructType> {
     private typeMapping;
     private funcMapping;
     contains(account: string, name: string): boolean;
-    loadNeutral(module: NeutralMoveModule): void;
+    loadInternal(module: InternalMoveModule): void;
     protected dataToBigInt(data: any): bigint;
-    protected getMoveStruct(type: string): NeutralMoveStruct;
-    protected getMoveFunction(type: string): NeutralMoveFunction;
+    protected getMoveStruct(type: string): InternalMoveStruct;
+    protected getMoveFunction(type: string): InternalMoveFunction;
     protected decode(data: any, type: TypeDescriptor): any;
     protected filterAndDecodeInternal<T>(typeQname: string, structs: StructWithTag<StructType>[]): DecodedStructWithTag<StructType, T>[];
     protected decodedInternal<T>(typeStruct: StructWithTag<StructType>): DecodedStructWithTag<StructType, T> | undefined;

package/lib/move/abstract-move-coder.js

@@ -8,7 +8,7 @@ export class AbstractMoveCoder {
     contains(account, name) {
         return this.moduleMapping.has(account + '::' + name);
     }
-    loadNeutral(module) {
+    loadInternal(module) {
         if (this.contains(module.address, module.name)) {
             return;
         }
@@ -18,8 +18,8 @@ export class AbstractMoveCoder {
             const key = [module.address, module.name, struct.name].join(SPLITTER);
             this.typeMapping.set(key, struct);
         }
-        for (const func of module.exposed_functions) {
-            if (!func.is_entry) {
+        for (const func of module.exposedFunctions) {
+            if (!func.isEntry) {
                 continue;
             }
             const key = [module.address, module.name, func.name].join(SPLITTER);