@sentio/sdk 1.22.2 → 1.23.0

package/lib/aptos/aptos-processor.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AptosBaseProcessor = void 0;
 const _1 = require(".");
 const long_1 = __importDefault(require("long"));
-const chain_1 = require("../utils/chain");
 const types_1 = require("./types");
 const typegen_1 = require("../aptos-codegen/typegen");
+const network_1 = require("./network");
 class EventHandler {
     filters;
     handler;
@@ -31,11 +31,13 @@ class AptosBaseProcessor {
     //   return undefined
     // }
     onTransaction(handler) {
-        const address = this.config.address;
-        const moduleName = this.moduleName;
+        // const address = this.config.address
+        // const moduleName = this.moduleName
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        const processor = this;
         this.callHandlers.push({
             handler: async function (tx) {
-                const ctx = new _1.AptosContext(moduleName, address, long_1.default.fromString(tx.version), tx);
+                const ctx = new _1.AptosContext(processor.moduleName, processor.config.network, processor.config.address, long_1.default.fromString(tx.version), tx);
                 if (tx) {
                     handler(tx, ctx);
                 }
@@ -63,7 +65,7 @@ class AptosBaseProcessor {
         const processor = this;
         this.eventHandlers.push({
             handler: async function (txn) {
-                const ctx = new _1.AptosContext(processor.moduleName, processor.config.address, long_1.default.fromString(txn.version), txn);
+                const ctx = new _1.AptosContext(processor.moduleName, processor.config.network, processor.config.address, long_1.default.fromString(txn.version), txn);
                 if (txn && txn.events) {
                     const events = txn.events;
                     txn.events = [];
@@ -96,7 +98,7 @@ class AptosBaseProcessor {
         const processor = this;
         this.callHandlers.push({
             handler: async function (tx) {
-                const ctx = new _1.AptosContext(processor.moduleName, processor.config.address, long_1.default.fromString(tx.version), tx);
+                const ctx = new _1.AptosContext(processor.moduleName, processor.config.network, processor.config.address, long_1.default.fromString(tx.version), tx);
                 if (tx) {
                     const payload = tx.payload;
                     const decoded = processor.decodeFunctionPayload(payload);
@@ -120,16 +122,11 @@ class AptosBaseProcessor {
         this.config = {
             startVersion: startVersion,
             address: options.address,
-            network: options.network || _1.AptosNetwork.TEST_NET,
+            network: options.network || _1.AptosNetwork.MAIN_NET,
         };
     }
     getChainId() {
-        switch (this.config.network) {
-            case _1.AptosNetwork.TEST_NET:
-                return chain_1.APTOS_TESTNET_ID;
-            case _1.AptosNetwork.MAIN_NET:
-                return chain_1.APTOS_MAINNET_ID;
-        }
+        return (0, network_1.getChainId)(this.config.network);
     }
     loadTypes(registry) {
         if (registry.contains(this.config.address, this.moduleName)) {

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

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

package/lib/aptos/context.d.ts

@@ -2,12 +2,13 @@ import Long from 'long';
 import { DataDescriptor, RecordMetaData } from '../gen';
 import { Labels } from '../core/metadata';
 import { BaseContext } from '../core/context';
-import { Transaction_UserTransaction } from './';
+import { AptosNetwork, Transaction_UserTransaction } from './';
 export declare class AptosContext extends BaseContext {
     address: string;
+    network: AptosNetwork;
     moduleName: string;
     version: Long;
     transaction: Transaction_UserTransaction;
-    constructor(moduleName: string, address: string, version: Long, transaction?: Transaction_UserTransaction);
+    constructor(moduleName: string, network: AptosNetwork, address: string, version: Long, transaction?: Transaction_UserTransaction);
     getMetaData(descriptor: DataDescriptor | undefined, labels: Labels): RecordMetaData;
 }

package/lib/aptos/context.js

@@ -1,17 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AptosContext = void 0;
-const chain_1 = require("../utils/chain");
 const meter_1 = require("../core/meter");
 const context_1 = require("../core/context");
+const network_1 = require("./network");
 class AptosContext extends context_1.BaseContext {
     address;
+    network;
     moduleName;
     version;
     transaction;
-    constructor(moduleName, address, version, transaction) {
+    constructor(moduleName, network, address, version, transaction) {
         super();
         this.address = address;
+        this.network = network;
         this.moduleName = moduleName;
         this.version = version;
         if (transaction) {
@@ -26,7 +28,7 @@ class AptosContext extends context_1.BaseContext {
             transactionIndex: 0,
             transactionHash: this.transaction?.hash || '',
             logIndex: 0,
-            chainId: chain_1.APTOS_TESTNET_ID,
+            chainId: (0, network_1.getChainId)(this.network),
             dataDescriptor: descriptor,
             labels: (0, meter_1.normalizeLabels)(labels),
         };

package/lib/aptos/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/aptos/context.ts"],"names":[],"mappings":";;;AAGA,0CAAiD;AACjD,yCAA+C;AAC/C,6CAA6C;AAG7C,MAAa,YAAa,SAAQ,qBAAW;IAC3C,OAAO,CAAQ;IACf,UAAU,CAAQ;IAClB,OAAO,CAAM;IACb,WAAW,CAA6B;IAExC,YAAY,UAAkB,EAAE,OAAe,EAAE,OAAa,EAAE,WAAyC;QACvG,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,WAAW,EAAE;YACf,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;SAC/B;IACH,CAAC;IAED,WAAW,CAAC,UAAsC,EAAE,MAAc;QAChE,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,YAAY,EAAE,IAAI,CAAC,UAAU;YAC7B,WAAW,EAAE,IAAI,CAAC,OAAO;YACzB,gBAAgB,EAAE,CAAC;YACnB,eAAe,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,IAAI,EAAE;YAC7C,QAAQ,EAAE,CAAC;YACX,OAAO,EAAE,wBAAgB;YACzB,cAAc,EAAE,UAAU;YAC1B,MAAM,EAAE,IAAA,uBAAe,EAAC,MAAM,CAAC;SAChC,CAAA;IACH,CAAC;CACF;AA7BD,oCA6BC","sourcesContent":["import Long from 'long'\nimport { DataDescriptor, RecordMetaData } from '../gen'\nimport { Labels } from '../core/metadata'\nimport { APTOS_TESTNET_ID } from '../utils/chain'\nimport { normalizeLabels } from '../core/meter'\nimport { BaseContext } from '../core/context'\nimport { Transaction_UserTransaction } from './'\n\nexport class AptosContext extends BaseContext {\n  address: string\n  moduleName: string\n  version: Long\n  transaction: Transaction_UserTransaction\n\n  constructor(moduleName: string, address: string, version: Long, transaction?: Transaction_UserTransaction) {\n    super()\n    this.address = address\n    this.moduleName = moduleName\n    this.version = version\n    if (transaction) {\n      this.transaction = transaction\n    }\n  }\n\n  getMetaData(descriptor: DataDescriptor | undefined, labels: Labels): RecordMetaData {\n    return {\n      address: this.address,\n      contractName: this.moduleName,\n      blockNumber: this.version,\n      transactionIndex: 0,\n      transactionHash: this.transaction?.hash || '', // TODO\n      logIndex: 0,\n      chainId: APTOS_TESTNET_ID, // TODO set in context\n      dataDescriptor: descriptor,\n      labels: normalizeLabels(labels),\n    }\n  }\n}\n"]}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/aptos/context.ts"],"names":[],"mappings":";;;AAGA,yCAA+C;AAC/C,6CAA6C;AAE7C,uCAAsC;AAEtC,MAAa,YAAa,SAAQ,qBAAW;IAC3C,OAAO,CAAQ;IACf,OAAO,CAAc;IACrB,UAAU,CAAQ;IAClB,OAAO,CAAM;IACb,WAAW,CAA6B;IAExC,YACE,UAAkB,EAClB,OAAqB,EACrB,OAAe,EACf,OAAa,EACb,WAAyC;QAEzC,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,WAAW,EAAE;YACf,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;SAC/B;IACH,CAAC;IAED,WAAW,CAAC,UAAsC,EAAE,MAAc;QAChE,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,YAAY,EAAE,IAAI,CAAC,UAAU;YAC7B,WAAW,EAAE,IAAI,CAAC,OAAO;YACzB,gBAAgB,EAAE,CAAC;YACnB,eAAe,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,IAAI,EAAE;YAC7C,QAAQ,EAAE,CAAC;YACX,OAAO,EAAE,IAAA,oBAAU,EAAC,IAAI,CAAC,OAAO,CAAC;YACjC,cAAc,EAAE,UAAU;YAC1B,MAAM,EAAE,IAAA,uBAAe,EAAC,MAAM,CAAC;SAChC,CAAA;IACH,CAAC;CACF;AArCD,oCAqCC","sourcesContent":["import Long from 'long'\nimport { DataDescriptor, RecordMetaData } from '../gen'\nimport { Labels } from '../core/metadata'\nimport { normalizeLabels } from '../core/meter'\nimport { BaseContext } from '../core/context'\nimport { AptosNetwork, Transaction_UserTransaction } from './'\nimport { getChainId } from './network'\n\nexport class AptosContext extends BaseContext {\n  address: string\n  network: AptosNetwork\n  moduleName: string\n  version: Long\n  transaction: Transaction_UserTransaction\n\n  constructor(\n    moduleName: string,\n    network: AptosNetwork,\n    address: string,\n    version: Long,\n    transaction?: Transaction_UserTransaction\n  ) {\n    super()\n    this.address = address\n    this.network = network\n    this.moduleName = moduleName\n    this.version = version\n    if (transaction) {\n      this.transaction = transaction\n    }\n  }\n\n  getMetaData(descriptor: DataDescriptor | undefined, labels: Labels): RecordMetaData {\n    return {\n      address: this.address,\n      contractName: this.moduleName,\n      blockNumber: this.version,\n      transactionIndex: 0,\n      transactionHash: this.transaction?.hash || '', // TODO\n      logIndex: 0,\n      chainId: getChainId(this.network),\n      dataDescriptor: descriptor,\n      labels: normalizeLabels(labels),\n    }\n  }\n}\n"]}

package/lib/aptos/index.d.ts

@@ -1,6 +1,6 @@
-export type { Transaction_UserTransaction, TransactionPayload_EntryFunctionPayload } from 'aptos/src/generated';
+export type { Transaction_UserTransaction, TransactionPayload_EntryFunctionPayload } from 'aptos-sdk/src/generated';
 export type { EventInstance, TypedEventInstance, TypeRegistry, TypedEntryFunctionPayload } from './types';
 export type { FunctionNameAndCallFilter, EventFilter, CallFilter, ArgumentsFilter } from './aptos-processor';
 export { AptosBaseProcessor } from './aptos-processor';
 export { AptosContext } from './context';
-export { AptosBindOptions, AptosNetwork } from './bind-options';
+export { AptosBindOptions, AptosNetwork } from './network';

package/lib/aptos/index.js

@@ -5,7 +5,7 @@ var aptos_processor_1 = require("./aptos-processor");
 Object.defineProperty(exports, "AptosBaseProcessor", { enumerable: true, get: function () { return aptos_processor_1.AptosBaseProcessor; } });
 var context_1 = require("./context");
 Object.defineProperty(exports, "AptosContext", { enumerable: true, get: function () { return context_1.AptosContext; } });
-var bind_options_1 = require("./bind-options");
-Object.defineProperty(exports, "AptosBindOptions", { enumerable: true, get: function () { return bind_options_1.AptosBindOptions; } });
-Object.defineProperty(exports, "AptosNetwork", { enumerable: true, get: function () { return bind_options_1.AptosNetwork; } });
+var network_1 = require("./network");
+Object.defineProperty(exports, "AptosBindOptions", { enumerable: true, get: function () { return network_1.AptosBindOptions; } });
+Object.defineProperty(exports, "AptosNetwork", { enumerable: true, get: function () { return network_1.AptosNetwork; } });
 //# sourceMappingURL=index.js.map

package/lib/aptos/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/aptos/index.ts"],"names":[],"mappings":";;;AAGA,qDAAsD;AAA7C,qHAAA,kBAAkB,OAAA;AAC3B,qCAAwC;AAA/B,uGAAA,YAAY,OAAA;AACrB,+CAA+D;AAAtD,gHAAA,gBAAgB,OAAA;AAAE,4GAAA,YAAY,OAAA","sourcesContent":["export type { Transaction_UserTransaction, TransactionPayload_EntryFunctionPayload } from 'aptos/src/generated'\nexport type { EventInstance, TypedEventInstance, TypeRegistry, TypedEntryFunctionPayload } from './types'\nexport type { FunctionNameAndCallFilter, EventFilter, CallFilter, ArgumentsFilter } from './aptos-processor'\nexport { AptosBaseProcessor } from './aptos-processor'\nexport { AptosContext } from './context'\nexport { AptosBindOptions, AptosNetwork } from './bind-options'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/aptos/index.ts"],"names":[],"mappings":";;;AAGA,qDAAsD;AAA7C,qHAAA,kBAAkB,OAAA;AAC3B,qCAAwC;AAA/B,uGAAA,YAAY,OAAA;AACrB,qCAA0D;AAAjD,2GAAA,gBAAgB,OAAA;AAAE,uGAAA,YAAY,OAAA","sourcesContent":["export type { Transaction_UserTransaction, TransactionPayload_EntryFunctionPayload } from 'aptos-sdk/src/generated'\nexport type { EventInstance, TypedEventInstance, TypeRegistry, TypedEntryFunctionPayload } from './types'\nexport type { FunctionNameAndCallFilter, EventFilter, CallFilter, ArgumentsFilter } from './aptos-processor'\nexport { AptosBaseProcessor } from './aptos-processor'\nexport { AptosContext } from './context'\nexport { AptosBindOptions, AptosNetwork } from './network'\n"]}

package/lib/aptos/{bind-options.d.ts → network.d.ts}

@@ -3,6 +3,9 @@ export declare enum AptosNetwork {
     MAIN_NET = 1,
     TEST_NET = 2
 }
+export declare function getChainId(network: AptosNetwork): string;
+export declare function getChainName(network: AptosNetwork): string;
+export declare function getChainRpcEndpoint(network: AptosNetwork): string;
 export declare class AptosBindOptions {
     address: string;
     network?: AptosNetwork;

package/lib/aptos/network.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AptosBindOptions = exports.getChainRpcEndpoint = exports.getChainName = exports.getChainId = exports.AptosNetwork = void 0;
+const chain_1 = require("../utils/chain");
+var AptosNetwork;
+(function (AptosNetwork) {
+    AptosNetwork[AptosNetwork["MAIN_NET"] = 1] = "MAIN_NET";
+    AptosNetwork[AptosNetwork["TEST_NET"] = 2] = "TEST_NET";
+    // DEV_NET,
+})(AptosNetwork = exports.AptosNetwork || (exports.AptosNetwork = {}));
+function getChainId(network) {
+    switch (network) {
+        case AptosNetwork.TEST_NET:
+            return chain_1.APTOS_TESTNET_ID;
+    }
+    return chain_1.APTOS_MAINNET_ID;
+}
+exports.getChainId = getChainId;
+function getChainName(network) {
+    switch (network) {
+        case AptosNetwork.TEST_NET:
+            return chain_1.CHAIN_MAP[chain_1.APTOS_TESTNET_ID];
+    }
+    return chain_1.CHAIN_MAP[chain_1.APTOS_MAINNET_ID];
+}
+exports.getChainName = getChainName;
+function getChainRpcEndpoint(network) {
+    switch (network) {
+        case AptosNetwork.TEST_NET:
+            return 'https://testnet.aptoslabs.com/';
+    }
+    return 'https://mainnet.aptoslabs.com/v1/';
+}
+exports.getChainRpcEndpoint = getChainRpcEndpoint;
+class AptosBindOptions {
+    address;
+    network = AptosNetwork.TEST_NET;
+    startVersion;
+}
+exports.AptosBindOptions = AptosBindOptions;
+//# sourceMappingURL=network.js.map

package/lib/aptos/network.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"network.js","sourceRoot":"","sources":["../../src/aptos/network.ts"],"names":[],"mappings":";;;AACA,0CAA8E;AAE9E,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,uDAAY,CAAA;IACZ,uDAAY,CAAA;IACZ,WAAW;AACb,CAAC,EAJW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAIvB;AAED,SAAgB,UAAU,CAAC,OAAqB;IAC9C,QAAQ,OAAO,EAAE;QACf,KAAK,YAAY,CAAC,QAAQ;YACxB,OAAO,wBAAgB,CAAA;KAC1B;IACD,OAAO,wBAAgB,CAAA;AACzB,CAAC;AAND,gCAMC;AAED,SAAgB,YAAY,CAAC,OAAqB;IAChD,QAAQ,OAAO,EAAE;QACf,KAAK,YAAY,CAAC,QAAQ;YACxB,OAAO,iBAAS,CAAC,wBAAgB,CAAC,CAAA;KACrC;IACD,OAAO,iBAAS,CAAC,wBAAgB,CAAC,CAAA;AACpC,CAAC;AAND,oCAMC;AAED,SAAgB,mBAAmB,CAAC,OAAqB;IACvD,QAAQ,OAAO,EAAE;QACf,KAAK,YAAY,CAAC,QAAQ;YACxB,OAAO,gCAAgC,CAAA;KAC1C;IACD,OAAO,mCAAmC,CAAA;AAC5C,CAAC;AAND,kDAMC;AAED,MAAa,gBAAgB;IAC3B,OAAO,CAAQ;IACf,OAAO,GAAkB,YAAY,CAAC,QAAQ,CAAA;IAC9C,YAAY,CAAgB;CAE7B;AALD,4CAKC","sourcesContent":["import Long from 'long'\nimport { APTOS_MAINNET_ID, APTOS_TESTNET_ID, CHAIN_MAP } from '../utils/chain'\n\nexport enum AptosNetwork {\n  MAIN_NET = 1,\n  TEST_NET = 2,\n  // DEV_NET,\n}\n\nexport function getChainId(network: AptosNetwork): string {\n  switch (network) {\n    case AptosNetwork.TEST_NET:\n      return APTOS_TESTNET_ID\n  }\n  return APTOS_MAINNET_ID\n}\n\nexport function getChainName(network: AptosNetwork): string {\n  switch (network) {\n    case AptosNetwork.TEST_NET:\n      return CHAIN_MAP[APTOS_TESTNET_ID]\n  }\n  return CHAIN_MAP[APTOS_MAINNET_ID]\n}\n\nexport function getChainRpcEndpoint(network: AptosNetwork): string {\n  switch (network) {\n    case AptosNetwork.TEST_NET:\n      return 'https://testnet.aptoslabs.com/'\n  }\n  return 'https://mainnet.aptoslabs.com/v1/'\n}\n\nexport class AptosBindOptions {\n  address: string\n  network?: AptosNetwork = AptosNetwork.TEST_NET\n  startVersion?: Long | number\n  // endBlock?: Long | number\n}\n"]}

package/lib/aptos/runtime.d.ts

@@ -1,2 +1,2 @@
-import { MoveStruct } from 'aptos/src/generated/models/MoveStruct';
+import { MoveStruct } from 'aptos-sdk/src/generated';
 export declare function decode<T>(struct: MoveStruct, args: any[]): T | undefined;

package/lib/aptos/runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/aptos/runtime.ts"],"names":[],"mappings":";;;AAEA,SAAgB,MAAM,CAAI,MAAkB,EAAE,IAAW;IACvD,IAAI,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;QACvC,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QAC3D,OAAO,SAAS,CAAA;KACjB;IACD,MAAM,GAAG,GAAQ,EAAE,CAAA;IACnB,KAAK,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE;QAChD,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;KAC1B;IACD,OAAO,GAAQ,CAAA;AACjB,CAAC;AAVD,wBAUC","sourcesContent":["import { MoveStruct } from 'aptos/src/generated/models/MoveStruct'\n\nexport function decode<T>(struct: MoveStruct, args: any[]): T | undefined {\n  if (args.length != struct.fields.length) {\n    console.log('type mismatch actually data for', struct.name)\n    return undefined\n  }\n  const res: any = {}\n  for (const [i, field] of struct.fields.entries()) {\n    res[field.name] = args[i]\n  }\n  return res as T\n}\n"]}
+{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/aptos/runtime.ts"],"names":[],"mappings":";;;AAEA,SAAgB,MAAM,CAAI,MAAkB,EAAE,IAAW;IACvD,IAAI,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;QACvC,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QAC3D,OAAO,SAAS,CAAA;KACjB;IACD,MAAM,GAAG,GAAQ,EAAE,CAAA;IACnB,KAAK,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE;QAChD,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;KAC1B;IACD,OAAO,GAAQ,CAAA;AACjB,CAAC;AAVD,wBAUC","sourcesContent":["import { MoveStruct } from 'aptos-sdk/src/generated'\n\nexport function decode<T>(struct: MoveStruct, args: any[]): T | undefined {\n  if (args.length != struct.fields.length) {\n    console.log('type mismatch actually data for', struct.name)\n    return undefined\n  }\n  const res: any = {}\n  for (const [i, field] of struct.fields.entries()) {\n    res[field.name] = args[i]\n  }\n  return res as T\n}\n"]}

package/lib/aptos/types.d.ts

@@ -1,4 +1,4 @@
-import { Event, MoveFunction, MoveModule, MoveStruct, TransactionPayload_EntryFunctionPayload } from 'aptos/src/generated';
+import { Event, MoveFunction, MoveModule, MoveStruct, TransactionPayload_EntryFunctionPayload } from 'aptos-sdk/src/generated';
 export declare type EventInstance = Event & {
     version: string;
 };

package/lib/aptos/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/aptos/types.ts"],"names":[],"mappings":";;;AAOA,mCAA2D;AAC3D,sDAAwD;AAoBxD,MAAa,cAAc;IACzB,eAAe;IAEf,yCAAyC;IACzC,KAAK,CAAQ;IACb,mBAAmB;IACnB,kBAAkB;IAElB,QAAQ,CAAkB;IAE1B,YAAY,MAAc,EAAE,UAA6B;QACvD,IAAI,CAAC,KAAK,GAAG,MAAM,CAAA;QACnB,IAAI,CAAC,QAAQ,GAAG,UAAU,IAAI,EAAE,CAAA;IAClC,CAAC;IAED,YAAY;QACV,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5B,OAAO,IAAI,CAAC,KAAK,GAAG,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAA;SACtF;QACD,OAAO,IAAI,CAAC,KAAK,CAAA;IACnB,CAAC;IAED,yCAAyC;IACzC,aAAa,CAAC,GAAgC;QAC5C,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACnC,IAAI,OAAO,EAAE;YACX,OAAO,OAAO,CAAA;SACf;QACD,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YAChD,OAAO,IAAI,CAAA;SACZ;QAED,MAAM,QAAQ,GAAqB,EAAE,CAAA;QACrC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC/B,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YAClC,IAAI,OAAO,EAAE;gBACX,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;aACvB;iBAAM;gBACL,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;aACtC;SACF;QACD,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;IACjD,CAAC;IAED,+DAA+D;IAC/D,aAAa;QACX,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YAC9B,OAAO,EAAE,CAAA;SACV;QACD,QAAQ,IAAI,CAAC,KAAK,EAAE;YAClB,KAAK,QAAQ,CAAC;YACd,KAAK,SAAS,CAAC;YACf,KAAK,qBAAqB,CAAC;YAC3B,KAAK,MAAM,CAAC;YACZ,KAAK,IAAI,CAAC;YACV,KAAK,KAAK,CAAC;YACX,KAAK,KAAK,CAAC;YACX,KAAK,KAAK,CAAC;YACX,KAAK,MAAM;gBACT,OAAO,EAAE,CAAA;SACZ;QAED,mCAAmC;QACnC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAQ,CAAC,IAAI,CAAC,CAAC,EAAE;YACtC,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBAC9B,OAAO,EAAE,CAAA;aACV;SACF;QAED,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAA;QAC/B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjC,KAAK,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;SACnD;QAED,IAAI,IAAI,CAAC,KAAK,KAAK,kBAAU,EAAE;YAC7B,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;SACtB;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAC1B,CAAC;CACF;AAhFD,wCAgFC;AAED,MAAa,YAAY;IACvB,aAAa,GAAG,IAAI,GAAG,EAAsB,CAAA;IAC7C,WAAW,GAAG,IAAI,GAAG,EAAsB,CAAA;IAC3C,WAAW,GAAG,IAAI,GAAG,EAAwB,CAAA;IAE7C,QAAQ,CAAC,OAAe,EAAE,IAAY;QACpC,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC,CAAA;IACtD,CAAC;IAED,IAAI,CAAC,MAAkB;QACrB,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE;YAC9C,OAAM;SACP;QACD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAA,mBAAW,EAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAA;QAEnD,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;YACnC,oBAAoB;YACpB,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,gBAAQ,CAAC,CAAA;YACrE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;SAClC;QAED,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,iBAAiB,EAAE;YAC3C,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,SAAQ;aACT;YACD,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,gBAAQ,CAAC,CAAA;YACnE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;SAChC;IACH,CAAC;IAED,aAAa,CAAC,IAAY;QACxB,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACzC,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAAA;SAC9C;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAED,eAAe,CAAC,IAAY;QAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,IAAI,CAAC,CAAA;SAClD;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,CAAC,IAAS,EAAE,IAAoB;QACpC,sBAAsB;QACtB,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YAC9B,OAAO,IAAI,CAAA;SACZ;QACD,QAAQ,IAAI,CAAC,KAAK,EAAE;YAClB,KAAK,QAAQ,CAAC,CAAC,kBAAkB;YACjC,KAAK,SAAS,CAAC;YACf,KAAK,qBAAqB,CAAC;YAC3B,KAAK,MAAM,CAAC;YACZ,KAAK,IAAI,CAAC;YACV,KAAK,KAAK,CAAC;YACX,KAAK,KAAK;gBACR,OAAO,IAAI,CAAA;YACb,KAAK,KAAK,CAAC;YACX,KAAK,MAAM;gBACT,OAAO,MAAM,CAAC,IAAI,CAAC,CAAA;SACtB;QAED,iBAAiB;QACjB,IAAI,IAAI,CAAC,KAAK,KAAK,kBAAU,EAAE;YAC7B,2BAA2B;YAC3B,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,EAAE;gBACnC,OAAO,IAAI,CAAA;aACZ;YAED,MAAM,GAAG,GAAG,EAAE,CAAA;YACd,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE;gBACxB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;aAC/C;YACD,OAAO,GAAG,CAAA;SACX;QAED,uBAAuB;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAE7C,MAAM,OAAO,GAAG,IAAI,GAAG,EAA0B,CAAA;QACjD,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE;YACpD,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,EAAE,OAAO,CAAC,CAAA;SAChC;QAED,MAAM,SAAS,GAAQ,EAAE,CAAA;QAEzB,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE;YACjC,IAAI,SAAS,GAAG,IAAA,uBAAa,EAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YACzC,SAAS,GAAG,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;YAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,CAAA;YACtD,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;SAC9B;QACD,OAAO,SAAS,CAAA;IAClB,CAAC;CAGF;AAnGD,oCAmGC;AAEY,QAAA,oBAAoB,GAAG,IAAI,YAAY,EAAE,CAAA","sourcesContent":["import {\n  Event,\n  MoveFunction,\n  MoveModule,\n  MoveStruct,\n  TransactionPayload_EntryFunctionPayload,\n} from 'aptos/src/generated'\nimport { moduleQname, SPLITTER, VECTOR_STR } from './utils'\nimport { parseMoveType } from '../aptos-codegen/typegen'\n\nexport type EventInstance = Event & {\n  version: string\n}\n\nexport type TypedEventInstance<T> = EventInstance & {\n  // Typed data converted from ABI\n  // undefined if there is converting error, usually because the ABI/data\n  // mismatch\n  data_typed: T\n\n  type_arguments: string[]\n}\n\n// Don't use intermedidate type to make IDE happier\nexport type TypedEntryFunctionPayload<T extends Array<any>> = TransactionPayload_EntryFunctionPayload & {\n  arguments_typed: T\n}\n\nexport class TypeDescriptor {\n  // type: string\n\n  // qualified name without type parameters\n  qname: string\n  // account?: string\n  // module?: string\n\n  typeArgs: TypeDescriptor[]\n\n  constructor(symbol: string, typeParams?: TypeDescriptor[]) {\n    this.qname = symbol\n    this.typeArgs = typeParams || []\n  }\n\n  getSignature(): string {\n    if (this.typeArgs.length > 0) {\n      return this.qname + '<' + this.typeArgs.map((t) => t.getSignature()).join(', ') + '>'\n    }\n    return this.qname\n  }\n\n  // Replace T0, T1 with more concrete type\n  applyTypeArgs(ctx: Map<string, TypeDescriptor>): TypeDescriptor {\n    const replace = ctx.get(this.qname)\n    if (replace) {\n      return replace\n    }\n    if (ctx.size === 0 || this.typeArgs.length === 0) {\n      return this\n    }\n\n    const typeArgs: TypeDescriptor[] = []\n    for (const arg of this.typeArgs) {\n      const replace = ctx.get(arg.qname)\n      if (replace) {\n        typeArgs.push(replace)\n      } else {\n        typeArgs.push(arg.applyTypeArgs(ctx))\n      }\n    }\n    return new TypeDescriptor(this.qname, typeArgs)\n  }\n\n  // all depended types including itself, not include system type\n  dependedTypes(): string[] {\n    if (this.qname.startsWith('&')) {\n      return []\n    }\n    switch (this.qname) {\n      case 'signer':\n      case 'address':\n      case '0x1::string::String':\n      case 'bool':\n      case 'u8':\n      case 'u16':\n      case 'u32':\n      case 'u64':\n      case 'u128':\n        return []\n    }\n\n    // Type parameters are not depended\n    if (this.qname.indexOf(SPLITTER) == -1) {\n      if (this.qname.startsWith('T')) {\n        return []\n      }\n    }\n\n    const types = new Set<string>()\n    for (const param of this.typeArgs) {\n      param.dependedTypes().forEach((t) => types.add(t))\n    }\n\n    if (this.qname !== VECTOR_STR) {\n      types.add(this.qname)\n    }\n\n    return Array.from(types)\n  }\n}\n\nexport class TypeRegistry {\n  moduleMapping = new Map<string, MoveModule>()\n  typeMapping = new Map<string, MoveStruct>()\n  funcMapping = new Map<string, MoveFunction>()\n\n  contains(account: string, name: string) {\n    return this.moduleMapping.has(account + '::' + name)\n  }\n\n  load(module: MoveModule) {\n    if (this.contains(module.address, module.name)) {\n      return\n    }\n    this.moduleMapping.set(moduleQname(module), module)\n\n    for (const struct of module.structs) {\n      // TODO move to util\n      const key = [module.address, module.name, struct.name].join(SPLITTER)\n      this.typeMapping.set(key, struct)\n    }\n\n    for (const func of module.exposed_functions) {\n      if (!func.is_entry) {\n        continue\n      }\n      const key = [module.address, module.name, func.name].join(SPLITTER)\n      this.funcMapping.set(key, func)\n    }\n  }\n\n  getMoveStruct(type: string): MoveStruct {\n    const struct = this.typeMapping.get(type)\n    if (!struct) {\n      throw new Error('Failed to load type' + type)\n    }\n    return struct\n  }\n\n  getMoveFunction(type: string): MoveFunction {\n    const func = this.funcMapping.get(type)\n    if (!func) {\n      throw new Error('Failed to load function' + type)\n    }\n    return func\n  }\n\n  decode(data: any, type: TypeDescriptor): any {\n    // process simple type\n    if (type.qname.startsWith('&')) {\n      return data\n    }\n    switch (type.qname) {\n      case 'signer': // TODO check this\n      case 'address':\n      case '0x1::string::String':\n      case 'bool':\n      case 'u8':\n      case 'u16':\n      case 'u32':\n        return data\n      case 'u64':\n      case 'u128':\n        return BigInt(data)\n    }\n\n    // process vector\n    if (type.qname === VECTOR_STR) {\n      // vector<u8> as hex string\n      if (type.typeArgs[0].qname === 'u8') {\n        return data\n      }\n\n      const res = []\n      for (const entry of data) {\n        res.push(this.decode(entry, type.typeArgs[0]))\n      }\n      return res\n    }\n\n    // Process complex type\n    const struct = this.getMoveStruct(type.qname)\n\n    const typeCtx = new Map<string, TypeDescriptor>()\n    for (const [idx, typeArg] of type.typeArgs.entries()) {\n      typeCtx.set('T' + idx, typeArg)\n    }\n\n    const typedData: any = {}\n\n    for (const field of struct.fields) {\n      let filedType = parseMoveType(field.type)\n      filedType = filedType.applyTypeArgs(typeCtx)\n      const value = this.decode(data[field.name], filedType)\n      typedData[field.name] = value\n    }\n    return typedData\n  }\n\n  // private decodeInternal(data: any, type: TypeDescriptor, typeArgs: )\n}\n\nexport const GLOBAL_TYPE_REGISTRY = new TypeRegistry()\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/aptos/types.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Event,\n  MoveFunction,\n  MoveModule,\n  MoveStruct,\n  TransactionPayload_EntryFunctionPayload,\n} from 'aptos-sdk/src/generated'\nimport { moduleQname, SPLITTER, VECTOR_STR } from './utils'\nimport { parseMoveType } from '../aptos-codegen/typegen'\n\nexport type EventInstance = Event & {\n  version: string\n}\n\nexport type TypedEventInstance<T> = EventInstance & {\n  // Typed data converted from ABI\n  // undefined if there is converting error, usually because the ABI/data\n  // mismatch\n  data_typed: T\n\n  type_arguments: string[]\n}\n\n// Don't use intermedidate type to make IDE happier\nexport type TypedEntryFunctionPayload<T extends Array<any>> = TransactionPayload_EntryFunctionPayload & {\n  arguments_typed: T\n}\n\nexport class TypeDescriptor {\n  // type: string\n\n  // qualified name without type parameters\n  qname: string\n  // account?: string\n  // module?: string\n\n  typeArgs: TypeDescriptor[]\n\n  constructor(symbol: string, typeParams?: TypeDescriptor[]) {\n    this.qname = symbol\n    this.typeArgs = typeParams || []\n  }\n\n  getSignature(): string {\n    if (this.typeArgs.length > 0) {\n      return this.qname + '<' + this.typeArgs.map((t) => t.getSignature()).join(', ') + '>'\n    }\n    return this.qname\n  }\n\n  // Replace T0, T1 with more concrete type\n  applyTypeArgs(ctx: Map<string, TypeDescriptor>): TypeDescriptor {\n    const replace = ctx.get(this.qname)\n    if (replace) {\n      return replace\n    }\n    if (ctx.size === 0 || this.typeArgs.length === 0) {\n      return this\n    }\n\n    const typeArgs: TypeDescriptor[] = []\n    for (const arg of this.typeArgs) {\n      const replace = ctx.get(arg.qname)\n      if (replace) {\n        typeArgs.push(replace)\n      } else {\n        typeArgs.push(arg.applyTypeArgs(ctx))\n      }\n    }\n    return new TypeDescriptor(this.qname, typeArgs)\n  }\n\n  // all depended types including itself, not include system type\n  dependedTypes(): string[] {\n    if (this.qname.startsWith('&')) {\n      return []\n    }\n    switch (this.qname) {\n      case 'signer':\n      case 'address':\n      case '0x1::string::String':\n      case 'bool':\n      case 'u8':\n      case 'u16':\n      case 'u32':\n      case 'u64':\n      case 'u128':\n        return []\n    }\n\n    // Type parameters are not depended\n    if (this.qname.indexOf(SPLITTER) == -1) {\n      if (this.qname.startsWith('T')) {\n        return []\n      }\n    }\n\n    const types = new Set<string>()\n    for (const param of this.typeArgs) {\n      param.dependedTypes().forEach((t) => types.add(t))\n    }\n\n    if (this.qname !== VECTOR_STR) {\n      types.add(this.qname)\n    }\n\n    return Array.from(types)\n  }\n}\n\nexport class TypeRegistry {\n  moduleMapping = new Map<string, MoveModule>()\n  typeMapping = new Map<string, MoveStruct>()\n  funcMapping = new Map<string, MoveFunction>()\n\n  contains(account: string, name: string) {\n    return this.moduleMapping.has(account + '::' + name)\n  }\n\n  load(module: MoveModule) {\n    if (this.contains(module.address, module.name)) {\n      return\n    }\n    this.moduleMapping.set(moduleQname(module), module)\n\n    for (const struct of module.structs) {\n      // TODO move to util\n      const key = [module.address, module.name, struct.name].join(SPLITTER)\n      this.typeMapping.set(key, struct)\n    }\n\n    for (const func of module.exposed_functions) {\n      if (!func.is_entry) {\n        continue\n      }\n      const key = [module.address, module.name, func.name].join(SPLITTER)\n      this.funcMapping.set(key, func)\n    }\n  }\n\n  getMoveStruct(type: string): MoveStruct {\n    const struct = this.typeMapping.get(type)\n    if (!struct) {\n      throw new Error('Failed to load type' + type)\n    }\n    return struct\n  }\n\n  getMoveFunction(type: string): MoveFunction {\n    const func = this.funcMapping.get(type)\n    if (!func) {\n      throw new Error('Failed to load function' + type)\n    }\n    return func\n  }\n\n  decode(data: any, type: TypeDescriptor): any {\n    // process simple type\n    if (type.qname.startsWith('&')) {\n      return data\n    }\n    switch (type.qname) {\n      case 'signer': // TODO check this\n      case 'address':\n      case '0x1::string::String':\n      case 'bool':\n      case 'u8':\n      case 'u16':\n      case 'u32':\n        return data\n      case 'u64':\n      case 'u128':\n        return BigInt(data)\n    }\n\n    // process vector\n    if (type.qname === VECTOR_STR) {\n      // vector<u8> as hex string\n      if (type.typeArgs[0].qname === 'u8') {\n        return data\n      }\n\n      const res = []\n      for (const entry of data) {\n        res.push(this.decode(entry, type.typeArgs[0]))\n      }\n      return res\n    }\n\n    // Process complex type\n    const struct = this.getMoveStruct(type.qname)\n\n    const typeCtx = new Map<string, TypeDescriptor>()\n    for (const [idx, typeArg] of type.typeArgs.entries()) {\n      typeCtx.set('T' + idx, typeArg)\n    }\n\n    const typedData: any = {}\n\n    for (const field of struct.fields) {\n      let filedType = parseMoveType(field.type)\n      filedType = filedType.applyTypeArgs(typeCtx)\n      const value = this.decode(data[field.name], filedType)\n      typedData[field.name] = value\n    }\n    return typedData\n  }\n\n  // private decodeInternal(data: any, type: TypeDescriptor, typeArgs: )\n}\n\nexport const GLOBAL_TYPE_REGISTRY = new TypeRegistry()\n"]}

package/lib/aptos/utils.d.ts

@@ -1,4 +1,4 @@
-import { MoveModule } from 'aptos/src/generated';
+import { MoveModule } from 'aptos-sdk/src/generated';
 export declare const SPLITTER = "::";
 export declare const VECTOR_STR = "vector";
 export declare function isFrameworkAccount(account: string): boolean;

package/lib/aptos/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/aptos/utils.ts"],"names":[],"mappings":";;;AAEa,QAAA,QAAQ,GAAG,IAAI,CAAA;AAEf,QAAA,UAAU,GAAG,QAAQ,CAAA;AAElC,SAAgB,kBAAkB,CAAC,OAAe;IAChD,OAAO,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,KAAK,CAAA;AACpE,CAAC;AAFD,gDAEC;AAED,SAAgB,WAAW,CAAC,MAAkB;IAC5C,OAAO,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,GAAG,gBAAQ,GAAG,MAAM,CAAC,IAAI,CAAA;AAC9D,CAAC;AAFD,kCAEC;AAED,SAAgB,kBAAkB,CAAC,IAAY;IAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC9C,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AAC7B,CAAC;AAHD,gDAGC","sourcesContent":["import { MoveModule } from 'aptos/src/generated'\n\nexport const SPLITTER = '::'\n\nexport const VECTOR_STR = 'vector'\n\nexport function isFrameworkAccount(account: string) {\n  return account === '0x1' || account === '0x2' || account === '0x3'\n}\n\nexport function moduleQname(module: MoveModule): string {\n  return module.address.toLowerCase() + SPLITTER + module.name\n}\n\nexport function moduleQnameForType(type: string): [string, string] {\n  const parts = type.split(SPLITTER).slice(0, 2)\n  return [parts[0], parts[1]]\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/aptos/utils.ts"],"names":[],"mappings":";;;AAEa,QAAA,QAAQ,GAAG,IAAI,CAAA;AAEf,QAAA,UAAU,GAAG,QAAQ,CAAA;AAElC,SAAgB,kBAAkB,CAAC,OAAe;IAChD,OAAO,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,KAAK,CAAA;AACpE,CAAC;AAFD,gDAEC;AAED,SAAgB,WAAW,CAAC,MAAkB;IAC5C,OAAO,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,GAAG,gBAAQ,GAAG,MAAM,CAAC,IAAI,CAAA;AAC9D,CAAC;AAFD,kCAEC;AAED,SAAgB,kBAAkB,CAAC,IAAY;IAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC9C,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AAC7B,CAAC;AAHD,gDAGC","sourcesContent":["import { MoveModule } from 'aptos-sdk/src/generated'\n\nexport const SPLITTER = '::'\n\nexport const VECTOR_STR = 'vector'\n\nexport function isFrameworkAccount(account: string) {\n  return account === '0x1' || account === '0x2' || account === '0x3'\n}\n\nexport function moduleQname(module: MoveModule): string {\n  return module.address.toLowerCase() + SPLITTER + module.name\n}\n\nexport function moduleQnameForType(type: string): [string, string] {\n  const parts = type.split(SPLITTER).slice(0, 2)\n  return [parts[0], parts[1]]\n}\n"]}

package/lib/aptos-codegen/codegen.d.ts

@@ -1,15 +1,22 @@
-import { MoveModuleBytecode } from 'aptos/src/generated';
+import { MoveModuleBytecode } from 'aptos-sdk/src/generated';
 import { AccountRegister } from './typegen';
-export declare function generate(srcDir: string, outputDir: string): void;
+import { AptosNetwork } from '../aptos/network';
+export declare function generate(srcDir: string, outputDir: string): Promise<void>;
+export declare function generateForNetwork(srcDir: string, outputDir: string, network: AptosNetwork): Promise<void>;
+interface OutputFile {
+    fileName: string;
+    fileContent: string;
+}
 interface Config {
-    srcFile: string;
+    fileName: string;
     outputDir: string;
+    network: AptosNetwork;
 }
 export declare class AccountCodegen {
     modules: MoveModuleBytecode[];
     config: Config;
     loader: AccountRegister;
-    constructor(loader: AccountRegister, config: Config);
-    generate(): void;
+    constructor(loader: AccountRegister, modules: MoveModuleBytecode[], config: Config);
+    generate(): OutputFile[];
 }
 export {};

package/lib/aptos-codegen/codegen.js

@@ -3,67 +3,101 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AccountCodegen = exports.generate = void 0;
+exports.AccountCodegen = exports.generateForNetwork = exports.generate = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const prettier_1 = __importDefault(require("prettier"));
 const typegen_1 = require("./typegen");
 const utils_1 = require("../aptos/utils");
-function generate(srcDir, outputDir) {
+const chalk_1 = __importDefault(require("chalk"));
+const network_1 = require("../aptos/network");
+const aptos_sdk_1 = require("aptos-sdk");
+async function generate(srcDir, outputDir) {
+    await generateForNetwork(srcDir, outputDir, network_1.AptosNetwork.MAIN_NET);
+    await generateForNetwork(path_1.default.join(srcDir, 'testnet'), path_1.default.join(outputDir, 'testnet'), network_1.AptosNetwork.TEST_NET);
+}
+exports.generate = generate;
+async function generateForNetwork(srcDir, outputDir, network) {
+    if (!fs_1.default.existsSync(srcDir)) {
+        return;
+    }
+    if (network === network_1.AptosNetwork.TEST_NET) {
+        console.log('Found testnet directory, generate code for testnet modules');
+    }
     const files = fs_1.default.readdirSync(srcDir);
     outputDir = path_1.default.resolve(outputDir);
+    const outputs = [];
     fs_1.default.mkdirSync(outputDir, { recursive: true });
     const loader = new typegen_1.AccountRegister();
-    // The first path, identify import relation and module name (filename) of those imports
+    // when generating user code, don't need to generate framework account
+    loader.accountImports.set('0x1', new typegen_1.AccountModulesImportInfo('0x1', '0x1'));
+    loader.accountImports.set('0x2', new typegen_1.AccountModulesImportInfo('0x2', '0x2'));
+    loader.accountImports.set('0x3', new typegen_1.AccountModulesImportInfo('0x3', '0x3'));
+    const client = new aptos_sdk_1.AptosClient((0, network_1.getChainRpcEndpoint)(network));
     for (const file of files) {
         if (!file.endsWith('.json')) {
             continue;
         }
-        // Reading file is duplicated, but since they are small files probably file
-        // TODO add file manager class
-        const json = fs_1.default.readFileSync(path_1.default.join(srcDir, file), 'utf-8');
-        const modules = JSON.parse(json);
+        const fullPath = path_1.default.resolve(srcDir, file);
+        const modules = JSON.parse(fs_1.default.readFileSync(fullPath, 'utf-8'));
         for (const module of modules) {
             if (module.abi) {
                 loader.register(module.abi, path_1.default.basename(file, '.json'));
             }
         }
-    }
-    for (const file of files) {
-        if (!file.endsWith('.json')) {
-            continue;
-        }
-        const codeGen = new AccountCodegen(loader, {
-            srcFile: path_1.default.join(srcDir, file),
+        const codeGen = new AccountCodegen(loader, modules, {
+            fileName: path_1.default.basename(file, '.json'),
             outputDir: outputDir,
+            network,
         });
-        codeGen.generate();
+        outputs.push(...codeGen.generate());
     }
-    // when generating user code, don't need to generate framework account
-    loader.pendingAccounts.delete('0x1');
-    loader.pendingAccounts.delete('0x2');
-    loader.pendingAccounts.delete('0x3');
-    if (loader.pendingAccounts.size > 0) {
-        // TODO automatic download dependencies
-        console.error('Missing ABIs from the following accounts', loader.pendingAccounts);
+    while (loader.pendingAccounts.size > 0) {
+        for (const account of loader.pendingAccounts) {
+            console.log(`download depended module for account ${account} at ${(0, network_1.getChainName)(network)}`);
+            try {
+                const modules = await client.getAccountModules(account);
+                fs_1.default.writeFileSync(path_1.default.resolve(srcDir, account + '.json'), JSON.stringify(modules, null, '\t'));
+                for (const module of modules) {
+                    if (module.abi) {
+                        loader.register(module.abi, account);
+                    }
+                }
+                const codeGen = new AccountCodegen(loader, modules, {
+                    fileName: account,
+                    outputDir: outputDir,
+                    network,
+                });
+                outputs.push(...codeGen.generate());
+            }
+            catch (e) {
+                console.error(chalk_1.default.red('Error downloading account module, check if you choose the right network，or download account modules manually into your director'));
+                console.error(e);
+                process.exit(1);
+            }
+        }
+    }
+    for (const output of outputs) {
+        const content = prettier_1.default.format(output.fileContent, { parser: 'typescript' });
+        fs_1.default.writeFileSync(path_1.default.join(outputDir, output.fileName), content);
     }
 }
-exports.generate = generate;
+exports.generateForNetwork = generateForNetwork;
 class AccountCodegen {
     modules;
     config;
     loader;
-    constructor(loader, config) {
-        const json = fs_1.default.readFileSync(config.srcFile, 'utf-8');
-        this.modules = JSON.parse(json);
+    constructor(loader, modules, config) {
+        // const json = fs.readFileSync(config.srcFile, 'utf-8')
+        this.modules = modules;
         this.config = config;
         this.loader = loader;
     }
     generate() {
         if (!this.modules) {
-            return;
+            return [];
         }
-        const baseName = path_1.default.basename(this.config.srcFile, '.json');
+        // const baseName = path.basename(this.config.fileName, '.json')
         let address;
         for (const module of this.modules) {
             if (module.abi && module.abi.address) {
@@ -71,11 +105,11 @@ class AccountCodegen {
             }
         }
         if (!address) {
-            return;
+            return [];
         }
         const imports = `
     import { aptos } from "@sentio/sdk"
-    import { Address, MoveModule } from "aptos/src/generated"
+    import { Address, MoveModule } from "aptos-sdk/src/generated"
     `;
         const dependedAccounts = [];
         const moduleImports = [];
@@ -99,7 +133,7 @@ class AccountCodegen {
                 items.forEach((m) => dependedAccounts.push(m));
             }
         }
-        let source = `
+        const source = `
     /* Autogenerated file. Do not edit manually. */
     /* tslint:disable */
     /* eslint-disable */
@@ -110,7 +144,7 @@ class AccountCodegen {
     
     ${moduleImports.join('\n')}
     
-    ${this.modules.map((m) => generateModule(m, dependedAccounts)).join('\n')}
+    ${this.modules.map((m) => generateModule(m, this.config.network)).join('\n')}
     
     function loadAllTypes(registry: aptos.TypeRegistry) {
       ${dependedAccounts.map((m) => `${m}.loadTypes(registry)`).join('\n')}
@@ -122,12 +156,23 @@ class AccountCodegen {
             .join('\n')}
     }
     `; // source
-        source = prettier_1.default.format(source, { parser: 'typescript' });
-        fs_1.default.writeFileSync(path_1.default.join(this.config.outputDir, baseName + '.ts'), source);
+        return [
+            {
+                fileName: this.config.fileName + '.ts',
+                fileContent: source,
+            },
+        ];
     }
 }
 exports.AccountCodegen = AccountCodegen;
-function generateModule(moduleByteCode, dependedModules) {
+function generateNetworkOption(network) {
+    switch (network) {
+        case network_1.AptosNetwork.TEST_NET:
+            return 'TEST_NET';
+    }
+    return 'MAIN_NET';
+}
+function generateModule(moduleByteCode, network) {
     if (!moduleByteCode.abi) {
         return '';
     }
@@ -145,7 +190,7 @@ function generateModule(moduleByteCode, dependedModules) {
     }
     static DEFAULT_OPTIONS: aptos.AptosBindOptions = {
       address: "${module.address}",
-      network: aptos.AptosNetwork.TEST_NET       
+      network: aptos.AptosNetwork.${generateNetworkOption(network)}       
     }
 
     static bind(options: Partial<aptos.AptosBindOptions> = {}): ${module.name} {