@sentio/sdk 2.5.0 → 2.5.1-rc.2

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/eth/codegen/event-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"event-handler.js","sourceRoot":"","sources":["../../../src/eth/codegen/event-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,gCAAgC,EAAE,MAAM,WAAW,CAAA;AACxF,OAAO,EAAE,+BAA+B,EAAE,MAAM,YAAY,CAAA;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAA;AAE9E,MAAM,UAAU,oBAAoB,CAAC,KAAuB,EAAE,YAAoB,EAAE,eAAwB;IAC1G,MAAM,SAAS,GAAG,eAAe,CAAC,CAAC,CAAC,gCAAgC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAA;IACxF,MAAM,eAAe,GAAG,eAAe,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,SAAS,CAAA;IAErE,MAAM,UAAU,GAAG,+BAA+B,CAAC,KAAK,CAAC,CAAA;IACzD,OAAO;WACE,SAAS;uBACG,eAAe,eAAe,YAAY;eAClD,eAAe,iBAAiB,eAAe;;;;2CAInB,UAAU,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;;;;GAIhG,CAAA;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,MAA0B,EAAE,YAAoB;IACpF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;KAC5D;SAAM;QACL,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KACjF;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAuB,EAAE,eAAwB;IAC5E,MAAM,SAAS,GAAG,eAAe,CAAC,CAAC,CAAC,gCAAgC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAA;IAExF,MAAM,UAAU,GAAG,+BAA+B,CAAC,KAAK,CAAC,CAAA;IACzD,OAAO;MACH,SAAS,IAAI,mBAAmB,CAAC,KAAK,CAAC,MAAM,CAAC,wCAAwC,UAAU,MAAM,KAAK,CAAC,MAAM;SACnH,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,MAAM,GAAG,EAAE,CAAC;SACtC,IAAI,CAAC,GAAG,CAAC;GACX,CAAA;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,MAA0B;IAC7D,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;KAC/C;SAAM;QACL,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAA;KACvD;AACH,CAAC","sourcesContent":["import { EventDeclaration, Contract, getFullSignatureAsSymbolForEvent } from 'typechain'\nimport { getFullSignatureForEventPatched } from './types.js'\nimport { generateEventInputs } from '@sentio/ethers-v6/dist/codegen/events.js'\n\nexport function generateEventHandler(event: EventDeclaration, contractName: string, includeArgTypes: boolean): string {\n  const eventName = includeArgTypes ? getFullSignatureAsSymbolForEvent(event) : event.name\n  const eventNamePrefix = includeArgTypes ? eventName + '_' : eventName\n\n  const filterName = getFullSignatureForEventPatched(event)\n  return `\n  onEvent${eventName}(\n    handler: (event: ${eventNamePrefix}Event, ctx: ${contractName}Context) => void,\n    filter?: ${eventNamePrefix}EventFilter | ${eventNamePrefix}EventFilter[],\n    fetchConfig?: EthFetchConfig\n  ) {\n    if (!filter) {\n      filter = templateContract.filters['${filterName}'](${event.inputs.map(() => 'null').join(',')})\n    }\n    return super.onEvent(handler, filter!, fetchConfig)\n  }\n  `\n}\n\nexport function generateEventHandlers(events: EventDeclaration[], contractName: string): string {\n  if (events.length === 1) {\n    return generateEventHandler(events[0], contractName, false)\n  } else {\n    return events.map((e) => generateEventHandler(e, contractName, true)).join('\\n')\n  }\n}\n\nfunction generateEventFilter(event: EventDeclaration, includeArgTypes: boolean): string {\n  const eventName = includeArgTypes ? getFullSignatureAsSymbolForEvent(event) : event.name\n\n  const filterName = getFullSignatureForEventPatched(event)\n  return `\n    ${eventName}(${generateEventInputs(event.inputs)}) { return templateContract.filters['${filterName}'](${event.inputs\n    .map((i, idx) => i.name || `arg${idx}`)\n    .join(',')}) }\n  `\n}\n\nexport function generateEventFilters(events: EventDeclaration[]): string[] {\n  if (events.length === 1) {\n    return [generateEventFilter(events[0], false)]\n  } else {\n    return events.map((e) => generateEventFilter(e, true))\n  }\n}\n"]}
+{"version":3,"file":"event-handler.js","sourceRoot":"","sources":["../../../src/eth/codegen/event-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,gCAAgC,EAAE,MAAM,WAAW,CAAA;AAC9E,OAAO,EAAE,+BAA+B,EAAE,MAAM,YAAY,CAAA;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAA;AAE9E,MAAM,UAAU,oBAAoB,CAAC,KAAuB,EAAE,YAAoB,EAAE,eAAwB;IAC1G,MAAM,SAAS,GAAG,eAAe,CAAC,CAAC,CAAC,gCAAgC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAA;IACxF,MAAM,eAAe,GAAG,eAAe,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,SAAS,CAAA;IAErE,MAAM,UAAU,GAAG,+BAA+B,CAAC,KAAK,CAAC,CAAA;IACzD,OAAO;WACE,SAAS;uBACG,eAAe,eAAe,YAAY;eAClD,eAAe,iBAAiB,eAAe;;;;2CAInB,UAAU,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;;;;GAIhG,CAAA;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,MAA0B,EAAE,YAAoB;IACpF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,CAAA;KAC5D;SAAM;QACL,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;KACjF;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAuB,EAAE,eAAwB;IAC5E,MAAM,SAAS,GAAG,eAAe,CAAC,CAAC,CAAC,gCAAgC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAA;IAExF,MAAM,UAAU,GAAG,+BAA+B,CAAC,KAAK,CAAC,CAAA;IACzD,OAAO;MACH,SAAS,IAAI,mBAAmB,CAAC,KAAK,CAAC,MAAM,CAAC,wCAAwC,UAAU,MAAM,KAAK,CAAC,MAAM;SACnH,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,MAAM,GAAG,EAAE,CAAC;SACtC,IAAI,CAAC,GAAG,CAAC;GACX,CAAA;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,MAA0B;IAC7D,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;KAC/C;SAAM;QACL,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAA;KACvD;AACH,CAAC","sourcesContent":["import { EventDeclaration, getFullSignatureAsSymbolForEvent } from 'typechain'\nimport { getFullSignatureForEventPatched } from './types.js'\nimport { generateEventInputs } from '@sentio/ethers-v6/dist/codegen/events.js'\n\nexport function generateEventHandler(event: EventDeclaration, contractName: string, includeArgTypes: boolean): string {\n  const eventName = includeArgTypes ? getFullSignatureAsSymbolForEvent(event) : event.name\n  const eventNamePrefix = includeArgTypes ? eventName + '_' : eventName\n\n  const filterName = getFullSignatureForEventPatched(event)\n  return `\n  onEvent${eventName}(\n    handler: (event: ${eventNamePrefix}Event, ctx: ${contractName}Context) => void,\n    filter?: ${eventNamePrefix}EventFilter | ${eventNamePrefix}EventFilter[],\n    fetchConfig?: EthFetchConfig\n  ) {\n    if (!filter) {\n      filter = templateContract.filters['${filterName}'](${event.inputs.map(() => 'null').join(',')})\n    }\n    return super.onEvent(handler, filter!, fetchConfig)\n  }\n  `\n}\n\nexport function generateEventHandlers(events: EventDeclaration[], contractName: string): string {\n  if (events.length === 1) {\n    return generateEventHandler(events[0], contractName, false)\n  } else {\n    return events.map((e) => generateEventHandler(e, contractName, true)).join('\\n')\n  }\n}\n\nfunction generateEventFilter(event: EventDeclaration, includeArgTypes: boolean): string {\n  const eventName = includeArgTypes ? getFullSignatureAsSymbolForEvent(event) : event.name\n\n  const filterName = getFullSignatureForEventPatched(event)\n  return `\n    ${eventName}(${generateEventInputs(event.inputs)}) { return templateContract.filters['${filterName}'](${event.inputs\n    .map((i, idx) => i.name || `arg${idx}`)\n    .join(',')}) }\n  `\n}\n\nexport function generateEventFilters(events: EventDeclaration[]): string[] {\n  if (events.length === 1) {\n    return [generateEventFilter(events[0], false)]\n  } else {\n    return events.map((e) => generateEventFilter(e, true))\n  }\n}\n"]}

package/lib/eth/codegen/functions-handler.js

@@ -2,6 +2,7 @@ import { generateOutputComplexTypeAsArray, generateOutputComplexTypesAsObject, }
 import sha3 from 'js-sha3';
 import { getSignatureForFn } from 'typechain';
 import { getFullSignatureAsSymbolForFunction } from './types.js';
+import { upperFirst } from 'lodash-es';
 export function generateCallHandlers(fns, contractName) {
     if (fns.length === 1) {
         return generateCallHandler(fns[0], contractName);
@@ -15,7 +16,7 @@ export function codegenCallTraceTypes(fns) {
     return fns.map((fn) => codegenCallTraceType(fn, getFullSignatureAsSymbolForFunction(fn))).join('\n');
 }
 function codegenCallTraceType(fn, overloadedName) {
-    const identifier = capitalizeFirstChar(overloadedName ?? fn.name);
+    const identifier = upperFirst(overloadedName ?? fn.name);
     const components = fn.inputs.map((input, i) => ({ name: input.name ?? `arg${i.toString()}`, type: input.type }));
     const arrayOutput = generateOutputComplexTypeAsArray(components, { useStructs: true });
     const objectOutput = generateOutputComplexTypesAsObject(components, { useStructs: true }) || '{}';
@@ -31,18 +32,12 @@ function generateCallHandler(fn, contractName, overloadedName) {
     const test = new TextEncoder().encode(signature);
     const sighash = '0x' + sha3.keccak_256(test).substring(0, 8);
     return `
-  onCall${capitalizeFirstChar(overloadedName ?? fn.name)}(
-    handler: (call: ${capitalizeFirstChar(overloadedName ?? fn.name)}CallTrace, ctx: ${contractName}Context) => void,
+  onCall${upperFirst(overloadedName ?? fn.name)}(
+    handler: (call: ${upperFirst(overloadedName ?? fn.name)}CallTrace, ctx: ${contractName}Context) => void,
     fetchConfig?: EthFetchConfig
   ) {
     return super.onTrace("${sighash}", handler, fetchConfig);
   }
 `;
 }
-function capitalizeFirstChar(input) {
-    if (!input) {
-        return input;
-    }
-    return input[0].toUpperCase() + (input.length > 1 ? input.substring(1) : '');
-}
 //# sourceMappingURL=functions-handler.js.map

package/lib/eth/codegen/functions-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"functions-handler.js","sourceRoot":"","sources":["../../../src/eth/codegen/functions-handler.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  generateOutputComplexTypeAsArray,\n  generateOutputComplexTypesAsObject,\n} from '@sentio/ethers-v6/dist/codegen/types.js'\nimport sha3 from 'js-sha3'\nimport { FunctionDeclaration, getSignatureForFn } from 'typechain'\nimport { getFullSignatureAsSymbolForFunction } from './types.js'\n\nexport function generateCallHandlers(fns: FunctionDeclaration[], contractName: string): string {\n  if (fns.length === 1) {\n    return generateCallHandler(fns[0], contractName)\n  }\n\n  return fns.map((fn) => generateCallHandler(fn, contractName, getFullSignatureAsSymbolForFunction(fn))).join('\\n')\n}\n\nexport function codegenCallTraceTypes(fns: FunctionDeclaration[]): string {\n  if (fns.length === 1) {\n    return codegenCallTraceType(fns[0])\n  }\n\n  return fns.map((fn) => codegenCallTraceType(fn, getFullSignatureAsSymbolForFunction(fn))).join('\\n')\n}\n\nfunction codegenCallTraceType(fn: FunctionDeclaration, overloadedName?: string): string {\n  const identifier = capitalizeFirstChar(overloadedName ?? fn.name)\n\n  const components = fn.inputs.map((input, i) => ({ name: input.name ?? `arg${i.toString()}`, type: input.type }))\n  const arrayOutput = generateOutputComplexTypeAsArray(components, { useStructs: true })\n  const objectOutput = generateOutputComplexTypesAsObject(components, { useStructs: true }) || '{}'\n\n  return `\n  export interface ${identifier}CallObject ${objectOutput}\n    \n  export type ${identifier}CallTrace = TypedCallTrace<${arrayOutput}, ${identifier}CallObject> & Trace\n  `\n}\n\nfunction generateCallHandler(fn: FunctionDeclaration, contractName: string, overloadedName?: string): string {\n  const signature = getSignatureForFn(fn)\n  // utils.toUtf8Bytes(signature))\n\n  const test = new TextEncoder().encode(signature)\n  const sighash = '0x' + sha3.keccak_256(test).substring(0, 8)\n\n  return `\n  onCall${capitalizeFirstChar(overloadedName ?? fn.name)}(\n    handler: (call: ${capitalizeFirstChar(overloadedName ?? fn.name)}CallTrace, ctx: ${contractName}Context) => void,\n    fetchConfig?: EthFetchConfig\n  ) {\n    return super.onTrace(\"${sighash}\", handler, fetchConfig);\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":"functions-handler.js","sourceRoot":"","sources":["../../../src/eth/codegen/functions-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gCAAgC,EAChC,kCAAkC,GACnC,MAAM,yCAAyC,CAAA;AAChD,OAAO,IAAI,MAAM,SAAS,CAAA;AAC1B,OAAO,EAAuB,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAClE,OAAO,EAAE,mCAAmC,EAAE,MAAM,YAAY,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAEtC,MAAM,UAAU,oBAAoB,CAAC,GAA0B,EAAE,YAAoB;IACnF,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;QACpB,OAAO,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAA;KACjD;IAED,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,mCAAmC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACnH,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,GAA0B;IAC9D,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;QACpB,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;KACpC;IAED,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,oBAAoB,CAAC,EAAE,EAAE,mCAAmC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACtG,CAAC;AAED,SAAS,oBAAoB,CAAC,EAAuB,EAAE,cAAuB;IAC5E,MAAM,UAAU,GAAG,UAAU,CAAC,cAAc,IAAI,EAAE,CAAC,IAAI,CAAC,CAAA;IAExD,MAAM,UAAU,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAChH,MAAM,WAAW,GAAG,gCAAgC,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAA;IACtF,MAAM,YAAY,GAAG,kCAAkC,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,IAAI,IAAI,CAAA;IAEjG,OAAO;qBACY,UAAU,cAAc,YAAY;;gBAEzC,UAAU,8BAA8B,WAAW,KAAK,UAAU;GAC/E,CAAA;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,EAAuB,EAAE,YAAoB,EAAE,cAAuB;IACjG,MAAM,SAAS,GAAG,iBAAiB,CAAC,EAAE,CAAC,CAAA;IACvC,gCAAgC;IAEhC,MAAM,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IAChD,MAAM,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAE5D,OAAO;UACC,UAAU,CAAC,cAAc,IAAI,EAAE,CAAC,IAAI,CAAC;sBACzB,UAAU,CAAC,cAAc,IAAI,EAAE,CAAC,IAAI,CAAC,mBAAmB,YAAY;;;4BAG9D,OAAO;;CAElC,CAAA;AACD,CAAC","sourcesContent":["import {\n  generateOutputComplexTypeAsArray,\n  generateOutputComplexTypesAsObject,\n} from '@sentio/ethers-v6/dist/codegen/types.js'\nimport sha3 from 'js-sha3'\nimport { FunctionDeclaration, getSignatureForFn } from 'typechain'\nimport { getFullSignatureAsSymbolForFunction } from './types.js'\nimport { upperFirst } from 'lodash-es'\n\nexport function generateCallHandlers(fns: FunctionDeclaration[], contractName: string): string {\n  if (fns.length === 1) {\n    return generateCallHandler(fns[0], contractName)\n  }\n\n  return fns.map((fn) => generateCallHandler(fn, contractName, getFullSignatureAsSymbolForFunction(fn))).join('\\n')\n}\n\nexport function codegenCallTraceTypes(fns: FunctionDeclaration[]): string {\n  if (fns.length === 1) {\n    return codegenCallTraceType(fns[0])\n  }\n\n  return fns.map((fn) => codegenCallTraceType(fn, getFullSignatureAsSymbolForFunction(fn))).join('\\n')\n}\n\nfunction codegenCallTraceType(fn: FunctionDeclaration, overloadedName?: string): string {\n  const identifier = upperFirst(overloadedName ?? fn.name)\n\n  const components = fn.inputs.map((input, i) => ({ name: input.name ?? `arg${i.toString()}`, type: input.type }))\n  const arrayOutput = generateOutputComplexTypeAsArray(components, { useStructs: true })\n  const objectOutput = generateOutputComplexTypesAsObject(components, { useStructs: true }) || '{}'\n\n  return `\n  export interface ${identifier}CallObject ${objectOutput}\n    \n  export type ${identifier}CallTrace = TypedCallTrace<${arrayOutput}, ${identifier}CallObject> & Trace\n  `\n}\n\nfunction generateCallHandler(fn: FunctionDeclaration, contractName: string, overloadedName?: string): string {\n  const signature = getSignatureForFn(fn)\n  // utils.toUtf8Bytes(signature))\n\n  const test = new TextEncoder().encode(signature)\n  const sighash = '0x' + sha3.keccak_256(test).substring(0, 8)\n\n  return `\n  onCall${upperFirst(overloadedName ?? fn.name)}(\n    handler: (call: ${upperFirst(overloadedName ?? fn.name)}CallTrace, ctx: ${contractName}Context) => void,\n    fetchConfig?: EthFetchConfig\n  ) {\n    return super.onTrace(\"${sighash}\", handler, fetchConfig);\n  }\n`\n}\n"]}

package/lib/eth/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/eth/context.ts"],"names":[],"mappings":"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","sourcesContent":["import { BaseContract, Transaction, TransactionReceipt } from 'ethers'\nimport { LogParams, BlockParams } from 'ethers/providers'\n\nimport { RecordMetaData } from '@sentio/protos'\nimport { Trace } from './trace.js'\nimport { Labels, normalizeLabels } from '../core/index.js'\nimport { CHAIN_IDS } from '../core/chain.js'\nimport { BaseContext } from '../core/base-context.js'\n\nexport abstract class EthContext extends BaseContext {\n  chainId: number\n  address: string\n  private readonly log?: LogParams\n  block?: BlockParams\n  private readonly trace?: Trace\n  blockNumber: bigint | number\n  transactionHash?: string\n  transaction?: Transaction\n  transactionReceipt?: TransactionReceipt\n  timestamp: Date\n\n  constructor(\n    chainId: number,\n    address: string,\n    timestamp?: Date,\n    block?: BlockParams,\n    log?: LogParams,\n    trace?: Trace,\n    transaction?: Transaction,\n    transactionReceipt?: TransactionReceipt\n  ) {\n    super()\n    this.chainId = chainId\n    this.log = log\n    this.block = block\n    this.trace = trace\n    this.address = address\n    this.transaction = transaction\n    this.transactionReceipt = transactionReceipt\n    this.timestamp = timestamp || new Date(0)\n    if (log) {\n      this.blockNumber = log.blockNumber\n      this.transactionHash = log.transactionHash\n    } else if (block) {\n      this.blockNumber = block.number\n    } else if (trace) {\n      this.blockNumber = trace.blockNumber\n      this.transactionHash = trace.transactionHash\n    }\n  }\n\n  protected abstract getContractName(): string\n\n  getMetaData(name: string, labels: Labels): RecordMetaData {\n    if (this.log) {\n      return {\n        address: this.address,\n        contractName: this.getContractName(),\n        blockNumber: BigInt(this.blockNumber),\n        transactionIndex: this.log.transactionIndex,\n        transactionHash: this.transactionHash || '',\n        logIndex: this.log.index,\n        chainId: this.chainId.toString(),\n        name: name,\n        labels: normalizeLabels(labels),\n      }\n    }\n    if (this.block) {\n      return {\n        address: this.address,\n        contractName: this.getContractName(),\n        blockNumber: BigInt(this.blockNumber),\n        transactionIndex: -1,\n        transactionHash: '',\n        logIndex: -1,\n        chainId: this.chainId.toString(),\n        name: name,\n        labels: normalizeLabels(labels),\n      }\n    }\n    if (this.trace) {\n      return {\n        address: this.address,\n        contractName: this.getContractName(),\n        blockNumber: BigInt(this.blockNumber),\n        transactionIndex: this.trace.transactionPosition,\n        transactionHash: this.transactionHash || '',\n        logIndex: -1,\n        chainId: this.chainId.toString(),\n        name: name,\n        labels: normalizeLabels(labels),\n      }\n    }\n    throw new Error(\"Invaid ctx argument can't happen\")\n  }\n}\n\nexport class AccountContext extends EthContext {\n  // constructor(chainId: number, address: string, block?: Block, log?: Log, trace?: Trace) {\n  //   super(chainId, address, new Date(0), block, log, trace)\n  // }\n  protected getContractName(): string {\n    return 'account'\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    timestamp?: Date,\n    block?: BlockParams,\n    log?: LogParams,\n    trace?: Trace,\n    transaction?: Transaction,\n    transactionReceipt?: TransactionReceipt\n  ) {\n    super(chainId, view.address, timestamp, block, log, trace, transaction, transactionReceipt)\n    view.context = this\n    this.contractName = contractName\n    this.contract = view\n  }\n\n  protected getContractName(): string {\n    return this.contractName\n  }\n}\n\nexport class ContractView<TContract extends BaseContract> {\n  protected contract: TContract\n\n  constructor(contract: TContract) {\n    this.contract = contract\n  }\n\n  get rawContract() {\n    return this.contract\n  }\n\n  get provider() {\n    if (this.contract.runner?.provider) {\n      return this.contract.runner.provider\n    }\n    throw Error(\"Can't find provider for contract\" + this.contract.toString())\n  }\n}\n\nexport class BoundContractView<TContract extends BaseContract, TContractView extends ContractView<TContract>> {\n  protected view: TContractView\n  readonly address: string\n  // context will be set right after context creation (in context's constructor)\n  context: ContractContext<TContract, BoundContractView<TContract, TContractView>>\n\n  constructor(address: string, view: TContractView) {\n    this.address = address\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.rawContract.filters\n  }\n}\n"]}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/eth/context.ts"],"names":[],"mappings":"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","sourcesContent":["import { BaseContract, Transaction, TransactionReceipt } from 'ethers'\nimport { LogParams, BlockParams } from 'ethers/providers'\n\nimport { RecordMetaData } from '@sentio/protos'\nimport { Trace } from './trace.js'\nimport { Labels, normalizeLabels } from '../core/index.js'\nimport { BaseContext } from '../core/base-context.js'\n\nexport abstract class EthContext extends BaseContext {\n  chainId: number\n  address: string\n  private readonly log?: LogParams\n  block?: BlockParams\n  private readonly trace?: Trace\n  blockNumber: bigint | number\n  transactionHash?: string\n  transaction?: Transaction\n  transactionReceipt?: TransactionReceipt\n  timestamp: Date\n\n  constructor(\n    chainId: number,\n    address: string,\n    timestamp?: Date,\n    block?: BlockParams,\n    log?: LogParams,\n    trace?: Trace,\n    transaction?: Transaction,\n    transactionReceipt?: TransactionReceipt\n  ) {\n    super()\n    this.chainId = chainId\n    this.log = log\n    this.block = block\n    this.trace = trace\n    this.address = address\n    this.transaction = transaction\n    this.transactionReceipt = transactionReceipt\n    this.timestamp = timestamp || new Date(0)\n    if (log) {\n      this.blockNumber = log.blockNumber\n      this.transactionHash = log.transactionHash\n    } else if (block) {\n      this.blockNumber = block.number\n    } else if (trace) {\n      this.blockNumber = trace.blockNumber\n      this.transactionHash = trace.transactionHash\n    }\n  }\n\n  protected abstract getContractName(): string\n\n  getMetaData(name: string, labels: Labels): RecordMetaData {\n    if (this.log) {\n      return {\n        address: this.address,\n        contractName: this.getContractName(),\n        blockNumber: BigInt(this.blockNumber),\n        transactionIndex: this.log.transactionIndex,\n        transactionHash: this.transactionHash || '',\n        logIndex: this.log.index,\n        chainId: this.chainId.toString(),\n        name: name,\n        labels: normalizeLabels(labels),\n      }\n    }\n    if (this.block) {\n      return {\n        address: this.address,\n        contractName: this.getContractName(),\n        blockNumber: BigInt(this.blockNumber),\n        transactionIndex: -1,\n        transactionHash: '',\n        logIndex: -1,\n        chainId: this.chainId.toString(),\n        name: name,\n        labels: normalizeLabels(labels),\n      }\n    }\n    if (this.trace) {\n      return {\n        address: this.address,\n        contractName: this.getContractName(),\n        blockNumber: BigInt(this.blockNumber),\n        transactionIndex: this.trace.transactionPosition,\n        transactionHash: this.transactionHash || '',\n        logIndex: -1,\n        chainId: this.chainId.toString(),\n        name: name,\n        labels: normalizeLabels(labels),\n      }\n    }\n    throw new Error(\"Invaid ctx argument can't happen\")\n  }\n}\n\nexport class AccountContext extends EthContext {\n  // constructor(chainId: number, address: string, block?: Block, log?: Log, trace?: Trace) {\n  //   super(chainId, address, new Date(0), block, log, trace)\n  // }\n  protected getContractName(): string {\n    return 'account'\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    timestamp?: Date,\n    block?: BlockParams,\n    log?: LogParams,\n    trace?: Trace,\n    transaction?: Transaction,\n    transactionReceipt?: TransactionReceipt\n  ) {\n    super(chainId, view.address, timestamp, block, log, trace, transaction, transactionReceipt)\n    view.context = this\n    this.contractName = contractName\n    this.contract = view\n  }\n\n  protected getContractName(): string {\n    return this.contractName\n  }\n}\n\nexport class ContractView<TContract extends BaseContract> {\n  protected contract: TContract\n\n  constructor(contract: TContract) {\n    this.contract = contract\n  }\n\n  get rawContract() {\n    return this.contract\n  }\n\n  get provider() {\n    if (this.contract.runner?.provider) {\n      return this.contract.runner.provider\n    }\n    throw Error(\"Can't find provider for contract\" + this.contract.toString())\n  }\n}\n\nexport class BoundContractView<TContract extends BaseContract, TContractView extends ContractView<TContract>> {\n  protected view: TContractView\n  readonly address: string\n  // context will be set right after context creation (in context's constructor)\n  context: ContractContext<TContract, BoundContractView<TContract, TContractView>>\n\n  constructor(address: string, view: TContractView) {\n    this.address = address\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.rawContract.filters\n  }\n}\n"]}

package/lib/eth/index.d.ts

@@ -4,7 +4,6 @@ export { BaseProcessorTemplate } from './base-processor-template.js';
 export { getProvider, DummyProvider } from './provider.js';
 export type { TypedCallTrace, Trace } from './trace.js';
 export * from './eth.js';
-export * from './error.js';
 export { BindOptions, AccountBindOptions } from './bind-options.js';
 export { getProcessor, addProcessor, getContractByABI, addContractByABI } from './binds.js';
 export { ContractContext, ContractView, BoundContractView } from './context.js';

package/lib/eth/index.js

@@ -3,7 +3,6 @@ export { GenericProcessor } from './generic-processor.js';
 export { BaseProcessorTemplate } from './base-processor-template.js';
 export { getProvider, DummyProvider } from './provider.js';
 export * from './eth.js';
-export * from './error.js';
 export { BindOptions, AccountBindOptions } from './bind-options.js';
 export { getProcessor, addProcessor, getContractByABI, addContractByABI } from './binds.js';
 export { ContractContext, ContractView, BoundContractView } from './context.js';

package/lib/eth/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/eth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAE1D,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAC3F,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAE/E,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA","sourcesContent":["export { BaseProcessor } from './base-processor.js'\nexport { GenericProcessor } from './generic-processor.js'\nexport { BaseProcessorTemplate } from './base-processor-template.js'\nexport { getProvider, DummyProvider } from './provider.js'\nexport type { TypedCallTrace, Trace } from './trace.js'\nexport * from './eth.js'\nexport * from './error.js'\nexport { BindOptions, AccountBindOptions } from './bind-options.js'\nexport { getProcessor, addProcessor, getContractByABI, addContractByABI } from './binds.js'\nexport { ContractContext, ContractView, BoundContractView } from './context.js'\n\nexport { EthPlugin } from './eth-plugin.js'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/eth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAE1D,cAAc,UAAU,CAAA;AACxB,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAC3F,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAE/E,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA","sourcesContent":["export { BaseProcessor } from './base-processor.js'\nexport { GenericProcessor } from './generic-processor.js'\nexport { BaseProcessorTemplate } from './base-processor-template.js'\nexport { getProvider, DummyProvider } from './provider.js'\nexport type { TypedCallTrace, Trace } from './trace.js'\nexport * from './eth.js'\nexport { BindOptions, AccountBindOptions } from './bind-options.js'\nexport { getProcessor, addProcessor, getContractByABI, addContractByABI } from './binds.js'\nexport { ContractContext, ContractView, BoundContractView } from './context.js'\n\nexport { EthPlugin } from './eth-plugin.js'\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

@@ -5,7 +5,7 @@ import chalk from 'chalk';
 import { format } from 'prettier';
 import { isFrameworkAccount, moduleQname, normalizeToJSName, SPLITTER } from './utils.js';
 import { generateTypeForDescriptor } from './ts-type.js';
-import { camelCase } from 'lodash-es';
+import { camelCase, upperFirst } from 'lodash-es';
 export class AbstractCodegen {
     TEST_NET;
     MAIN_NET;
@@ -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,29 +195,29 @@ export class AbstractCodegen {
         return genericString;
     }
     generateCallArgsStructs(module, func) {
-        if (!func.is_entry) {
+        if (!func.isEntry) {
             return;
         }
         const fields = this.getMeaningfulFunctionParams(func.params).map((param) => {
             return generateTypeForDescriptor(param, module.address, this.ADDRESS_TYPE);
         });
-        const camelFuncName = capitalizeFirstChar(camelCase(func.name));
+        const camelFuncName = upperFirst(camelCase(func.name));
         const genericString = this.generateFunctionTypeParameters(func);
         return `
   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)
         const moduleName = normalizeToJSName(module.name);
-        const camelFuncName = capitalizeFirstChar(camelCase(func.name));
+        const camelFuncName = upperFirst(camelCase(func.name));
         const source = `
   onEntry${camelFuncName}(func: (call: ${moduleName}.${camelFuncName}Payload, ctx: ${this.PREFIX}Context) => void, filter?: CallFilter, fetchConfig?: MoveFetchConfig): ${moduleName} {
     this.onEntryFunctionCall(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 [
@@ -332,10 +332,4 @@ export class AccountCodegen {
         ];
     }
 }
-function capitalizeFirstChar(input) {
-    if (!input) {
-        return input;
-    }
-    return input[0].toUpperCase() + (input.length > 1 ? input.substring(1) : '');
-}
 //# sourceMappingURL=abstract-codegen.js.map