@sentio/sdk 2.0.0-rc.21 → 2.0.0-rc.23

package/lib/eth/context.d.ts

@@ -36,8 +36,9 @@ export declare class ContractView<TContract extends BaseContract> {
 }
 export declare class BoundContractView<TContract extends BaseContract, TContractView extends ContractView<TContract>> {
     protected view: TContractView;
+    readonly address: string;
     context: ContractContext<TContract, BoundContractView<TContract, TContractView>>;
-    constructor(view: TContractView);
+    constructor(address: string, view: TContractView);
     get rawContract(): TContract;
     get provider(): import("ethers").Provider | null | undefined;
     get filters(): Record<string, import("ethers").ContractEvent<any[]>>;

package/lib/eth/context.js

@@ -89,10 +89,7 @@ export class ContractContext extends EthContext {
     contract;
     contractName;
     constructor(contractName, view, chainId, timestamp, block, log, trace, transaction, transactionReceipt) {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        const address = view.rawContract.getAddress();
-        super(chainId, address, timestamp, block, log, trace, transaction, transactionReceipt);
+        super(chainId, view.address, timestamp, block, log, trace, transaction, transactionReceipt);
         view.context = this;
         this.contractName = contractName;
         this.contract = view;
@@ -115,9 +112,11 @@ export class ContractView {
 }
 export class BoundContractView {
     view;
+    address;
     // context will be set right after context creation (in context's constructor)
     context;
-    constructor(view) {
+    constructor(address, view) {
+        this.address = address;
         this.view = view;
     }
     get rawContract() {

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, Block } from 'ethers'\nimport { LogParams } from 'ethers/providers'\n\nimport { RecordMetaData } from '@sentio/protos'\nimport { Trace } from './trace.js'\nimport { Labels, normalizeLabels } from '../core/metadata.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?: Block\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?: Block,\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?: Block,\n    log?: LogParams,\n    trace?: Trace,\n    transaction?: Transaction,\n    transactionReceipt?: TransactionReceipt\n  ) {\n    // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n    // @ts-ignore\n    const address = view.rawContract.getAddress() as string\n    super(chainId, 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    return this.contract.runner?.provider\n  }\n}\n\nexport class BoundContractView<TContract extends BaseContract, TContractView extends ContractView<TContract>> {\n  protected view: TContractView\n  // context will be set right after context creation (in context's constructor)\n  context: ContractContext<TContract, BoundContractView<TContract, TContractView>>\n\n  constructor(view: TContractView) {\n    this.view = view\n  }\n\n  get rawContract() {\n    return this.view.rawContract\n  }\n\n  get provider() {\n    return this.view.provider\n  }\n\n  get filters() {\n    return this.view.rawContract.filters\n  }\n}\n\nexport class SuiContext extends BaseContext {\n  address: string\n  moduleName: string\n  blockNumber: bigint\n\n  constructor(address: string, slot: bigint) {\n    super()\n    this.address = address\n    this.blockNumber = slot\n  }\n\n  getMetaData(name: string, labels: Labels): RecordMetaData {\n    return {\n      address: this.address,\n      contractName: this.moduleName,\n      blockNumber: this.blockNumber,\n      transactionIndex: 0,\n      transactionHash: '', // TODO\n      logIndex: 0,\n      chainId: CHAIN_IDS.SUI_DEVNET, // TODO set in context\n      name: name,\n      labels: normalizeLabels(labels),\n    }\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, Block } from 'ethers'\nimport { LogParams } from 'ethers/providers'\n\nimport { RecordMetaData } from '@sentio/protos'\nimport { Trace } from './trace.js'\nimport { Labels, normalizeLabels } from '../core/metadata.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?: Block\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?: Block,\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?: Block,\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    return this.contract.runner?.provider\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\nexport class SuiContext extends BaseContext {\n  address: string\n  moduleName: string\n  blockNumber: bigint\n\n  constructor(address: string, slot: bigint) {\n    super()\n    this.address = address\n    this.blockNumber = slot\n  }\n\n  getMetaData(name: string, labels: Labels): RecordMetaData {\n    return {\n      address: this.address,\n      contractName: this.moduleName,\n      blockNumber: this.blockNumber,\n      transactionIndex: 0,\n      transactionHash: '', // TODO\n      logIndex: 0,\n      chainId: CHAIN_IDS.SUI_DEVNET, // TODO set in context\n      name: name,\n      labels: normalizeLabels(labels),\n    }\n  }\n}\n"]}

package/lib/eth/generic-processor.js

@@ -11,7 +11,7 @@ export class GenericProcessor extends BaseProcessor {
     }
     CreateBoundContractView() {
         const contract = new BaseContract(this.config.address, this.eventABI, getProvider(this.config.network));
-        return new BoundContractView(new ContractView(contract));
+        return new BoundContractView(this.config.address, new ContractView(contract));
     }
     static bind(eventABI, options) {
         if (!Array.isArray(eventABI)) {

package/lib/eth/generic-processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"generic-processor.js","sourceRoot":"","sources":["../../src/eth/generic-processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAE9D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAEzC,MAAM,OAAO,gBAAiB,SAAQ,aAGrC;IACC,QAAQ,CAAU;IAClB,YAAY,QAAkB,EAAE,OAAoB;QAClD,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;IAES,uBAAuB;QAC/B,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAA;QACvG,OAAO,IAAI,iBAAiB,CAAC,IAAI,YAAY,CAAe,QAAQ,CAAC,CAAC,CAAA;IACxE,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,QAA2B,EAAE,OAAoB;QAClE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC5B,QAAQ,GAAG,CAAC,QAAQ,CAAC,CAAA;SACtB;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACjB,OAAO,CAAC,IAAI,GAAG,SAAS,CAAA;SACzB;QACD,MAAM,SAAS,GAAG,IAAI,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QACzD,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QAChC,OAAO,SAAS,CAAA;IAClB,CAAC;CACF","sourcesContent":["import { BaseContract } from 'ethers'\nimport { BoundContractView, ContractView } from './context.js'\nimport { BindOptions } from './bind-options.js'\nimport { BaseProcessor } from './base-processor.js'\nimport { getProvider } from './provider.js'\nimport { addProcessor } from './binds.js'\n\nexport class GenericProcessor extends BaseProcessor<\n  BaseContract,\n  BoundContractView<BaseContract, ContractView<BaseContract>>\n> {\n  eventABI: string[]\n  constructor(eventABI: string[], options: BindOptions) {\n    super(options)\n    this.eventABI = eventABI\n  }\n\n  protected CreateBoundContractView(): BoundContractView<BaseContract, ContractView<BaseContract>> {\n    const contract = new BaseContract(this.config.address, this.eventABI, getProvider(this.config.network))\n    return new BoundContractView(new ContractView<BaseContract>(contract))\n  }\n\n  public static bind(eventABI: string[] | string, options: BindOptions): GenericProcessor {\n    if (!Array.isArray(eventABI)) {\n      eventABI = [eventABI]\n    }\n    if (!options.name) {\n      options.name = 'Generic'\n    }\n    const processor = new GenericProcessor(eventABI, options)\n    addProcessor(options, processor)\n    return processor\n  }\n}\n"]}
+{"version":3,"file":"generic-processor.js","sourceRoot":"","sources":["../../src/eth/generic-processor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAE9D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAEzC,MAAM,OAAO,gBAAiB,SAAQ,aAGrC;IACC,QAAQ,CAAU;IAClB,YAAY,QAAkB,EAAE,OAAoB;QAClD,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;IAES,uBAAuB;QAC/B,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAA;QACvG,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,YAAY,CAAe,QAAQ,CAAC,CAAC,CAAA;IAC7F,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,QAA2B,EAAE,OAAoB;QAClE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC5B,QAAQ,GAAG,CAAC,QAAQ,CAAC,CAAA;SACtB;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACjB,OAAO,CAAC,IAAI,GAAG,SAAS,CAAA;SACzB;QACD,MAAM,SAAS,GAAG,IAAI,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QACzD,YAAY,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QAChC,OAAO,SAAS,CAAA;IAClB,CAAC;CACF","sourcesContent":["import { BaseContract } from 'ethers'\nimport { BoundContractView, ContractView } from './context.js'\nimport { BindOptions } from './bind-options.js'\nimport { BaseProcessor } from './base-processor.js'\nimport { getProvider } from './provider.js'\nimport { addProcessor } from './binds.js'\n\nexport class GenericProcessor extends BaseProcessor<\n  BaseContract,\n  BoundContractView<BaseContract, ContractView<BaseContract>>\n> {\n  eventABI: string[]\n  constructor(eventABI: string[], options: BindOptions) {\n    super(options)\n    this.eventABI = eventABI\n  }\n\n  protected CreateBoundContractView(): BoundContractView<BaseContract, ContractView<BaseContract>> {\n    const contract = new BaseContract(this.config.address, this.eventABI, getProvider(this.config.network))\n    return new BoundContractView(this.config.address, new ContractView<BaseContract>(contract))\n  }\n\n  public static bind(eventABI: string[] | string, options: BindOptions): GenericProcessor {\n    if (!Array.isArray(eventABI)) {\n      eventABI = [eventABI]\n    }\n    if (!options.name) {\n      options.name = 'Generic'\n    }\n    const processor = new GenericProcessor(eventABI, options)\n    addProcessor(options, processor)\n    return processor\n  }\n}\n"]}

package/lib/solana/{run-codegen.js → codegen/run.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { codegen } from './codegen/codegen.js';
+import { codegen } from './codegen.js';
 if (process.argv.length > 3) {
     const abisDir = process.argv[2];
     const targetDir = process.argv[3];
@@ -9,4 +9,4 @@ else {
     console.error('Not enough argument');
     process.exit(1);
 }
-//# sourceMappingURL=run-codegen.js.map
+//# sourceMappingURL=run.js.map

package/lib/solana/codegen/run.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/solana/codegen/run.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAEtC,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;IAC3B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAC/B,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;CAC5B;KAAM;IACL,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACpC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;CAChB","sourcesContent":["#!/usr/bin/env node\n\nimport { codegen } from './codegen.js'\n\nif (process.argv.length > 3) {\n  const abisDir = process.argv[2]\n  const targetDir = process.argv[3]\n  codegen(abisDir, targetDir)\n} else {\n  console.error('Not enough argument')\n  process.exit(1)\n}\n"]}

package/package.json

@@ -1,33 +1,33 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "2.0.0-rc.21",
+  "version": "2.0.0-rc.23",
   "type": "module",
   "scripts": {
     "compile": "tsc -p . && cp src/utils/*.csv lib/utils && cp src/tsup.config.ts lib",
     "build": "yarn gen:eth && yarn gen:aptos && yarn gen:solana && yarn compile",
     "build_all": "yarn lerna run --scope=@sentio/sdk build --include-dependencies",
     "test": "NODE_OPTIONS=--experimental-vm-modules yarn jest",
-    "gen:eth": "ts-node-esm ./src/eth/run-codegen.ts src/eth/abis src/eth/builtin && yarn gen:eth_test",
-    "gen:eth_test": "ts-node-esm ./src/eth/run-codegen.ts src/tests/abis/eth ./src/tests/types/eth",
-    "gen:aptos": "ts-node-esm  ./src/aptos/run-codegen.ts src/aptos/abis src/aptos/builtin && yarn gen:aptos_test",
-    "gen:aptos_test": "ts-node-esm  ./src/aptos/run-codegen.ts src/aptos/tests/abis src/aptos/tests/types",
-    "gen:solana": "ts-node-esm ./src/solana/run-codegen.ts src/solana/tests/abis src/solana/tests/types"
+    "gen:eth": "ts-node-esm src/eth/codegen/run.ts src/eth/abis src/eth/builtin && yarn gen:eth_test",
+    "gen:eth_test": "ts-node-esm src/eth/codegen/run.ts src/tests/abis/eth ./src/tests/types/eth",
+    "gen:aptos": "ts-node-esm  src/aptos/codegen/run.ts src/aptos/abis src/aptos/builtin && yarn gen:aptos_test",
+    "gen:aptos_test": "ts-node-esm  src/aptos/codegen/run.ts src/aptos/tests/abis src/aptos/tests/types",
+    "gen:solana": "ts-node-esm src/solana/codegen/run.ts src/solana/tests/abis src/solana/tests/types"
   },
   "dependencies": {
     "@project-serum/anchor": "^0.26.0",
     "@sentio/bigdecimal": "^9.1.1-patch.3",
     "@sentio/ethers-v6": "^1.0.24",
-    "@sentio/protos": "^2.0.0-rc.21",
-    "@sentio/runtime": "^2.0.0-rc.21",
-    "@sentio/sdk": "^2.0.0-rc.21",
+    "@sentio/protos": "^2.0.0-rc.23",
+    "@sentio/runtime": "^2.0.0-rc.23",
+    "@sentio/sdk": "^2.0.0-rc.23",
     "@solana/web3.js": "^1.47.3",
     "@types/prettier": "^2.7.2",
     "aptos-sdk": "npm:@sentio/aptos@^1.6.0",
     "bs58": "^5.0.0",
     "chalk": "^5.2.0",
     "csv-parse": "^5.3.0",
-    "ethers": "npm:@sentio/ethers@^6.0.0-patch.3",
+    "ethers": "npm:@sentio/ethers@^6.0.2",
     "lodash-es": "^4.17.21",
     "mkdirp": "^2.1.3",
     "p-queue": "^7.3.0",
@@ -71,5 +71,5 @@
   "typedoc": {
     "entryPoint": "./src/index.ts"
   },
-  "gitHead": "b42181478b4662da271cbf72cbcd4cdcfbee2002"
+  "gitHead": "253f64172b8c3871867c769303569083e11799a9"
 }

package/src/aptos/codegen/codegen.ts

@@ -217,7 +217,11 @@ export class AccountCodegen {
 
       ${this.modules
         .map((m) => {
-          return `_r.load(${normalizeToJSName(m.abi!.name)}.ABI)`
+          if (m.abi) {
+            return `_r.load(${normalizeToJSName(m.abi.name)}.ABI)`
+          }
+          console.error('Find Module with empty ABI')
+          return ''
         })
         .join('\n')}
     }

package/src/aptos/{run-codegen.ts → codegen/run.ts}

@@ -1,6 +1,6 @@
 // #!/usr/bin/env node
 
-import { codegen } from './codegen/codegen.js'
+import { codegen } from './codegen.js'
 
 if (process.argv.length > 3) {
   const abisDir = process.argv[2]

package/src/aptos/codegen/tsconfig.json

@@ -3,6 +3,6 @@
     "rootDir": "..",
     "outDir": "../../../lib/aptos"
   },
-  "extends": "@sentio/sdk/tsconfig.json",
+  "extends": "../../../tsconfig.json",
   "include": ["./"]
 }

package/src/eth/builtin/internal/eacaggregatorproxy_processor.ts

@@ -985,7 +985,7 @@ export class EACAggregatorProxyProcessor extends BaseProcessor<
       this.config.address,
       this.config.network
     );
-    return new EACAggregatorProxyBoundContractView(view);
+    return new EACAggregatorProxyBoundContractView(this.config.address, view);
   }
 
   public static bind(options: BindOptions): EACAggregatorProxyProcessor {

package/src/eth/builtin/internal/erc1155_processor.ts

@@ -423,7 +423,7 @@ export class ERC1155Processor extends BaseProcessor<
 
   protected CreateBoundContractView(): ERC1155BoundContractView {
     const view = getERC1155Contract(this.config.address, this.config.network);
-    return new ERC1155BoundContractView(view);
+    return new ERC1155BoundContractView(this.config.address, view);
   }
 
   public static bind(options: BindOptions): ERC1155Processor {

package/src/eth/builtin/internal/erc20_processor.ts

@@ -543,7 +543,7 @@ export class ERC20Processor extends BaseProcessor<
 
   protected CreateBoundContractView(): ERC20BoundContractView {
     const view = getERC20Contract(this.config.address, this.config.network);
-    return new ERC20BoundContractView(view);
+    return new ERC20BoundContractView(this.config.address, view);
   }
 
   public static bind(options: BindOptions): ERC20Processor {

package/src/eth/builtin/internal/erc20bytes_processor.ts

@@ -354,7 +354,7 @@ export class ERC20BytesProcessor extends BaseProcessor<
       this.config.address,
       this.config.network
     );
-    return new ERC20BytesBoundContractView(view);
+    return new ERC20BytesBoundContractView(this.config.address, view);
   }
 
   public static bind(options: BindOptions): ERC20BytesProcessor {

package/src/eth/builtin/internal/erc721_processor.ts

@@ -560,7 +560,7 @@ export class ERC721Processor extends BaseProcessor<
 
   protected CreateBoundContractView(): ERC721BoundContractView {
     const view = getERC721Contract(this.config.address, this.config.network);
-    return new ERC721BoundContractView(view);
+    return new ERC721BoundContractView(this.config.address, view);
   }
 
   public static bind(options: BindOptions): ERC721Processor {

package/src/eth/builtin/internal/weth9_processor.ts

@@ -403,7 +403,7 @@ export class WETH9Processor extends BaseProcessor<
 
   protected CreateBoundContractView(): WETH9BoundContractView {
     const view = getWETH9Contract(this.config.address, this.config.network);
-    return new WETH9BoundContractView(view);
+    return new WETH9BoundContractView(this.config.address, view);
   }
 
   public static bind(options: BindOptions): WETH9Processor {

package/src/eth/codegen/file.ts

@@ -63,7 +63,7 @@ export function codeGenSentioFile(contract: Contract): string {
   
   protected CreateBoundContractView(): ${contract.name}BoundContractView {
     const view = get${contract.name}Contract(this.config.address, this.config.network)
-    return new ${contract.name}BoundContractView(view)
+    return new ${contract.name}BoundContractView(this.config.address, view)
   }
 
   public static bind(options: BindOptions): ${contract.name}Processor {

package/src/eth/{run-codegen.ts → codegen/run.ts}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { codegen } from './codegen/index.js'
+import { codegen } from './index.js'
 
 if (process.argv.length > 3) {
   const abisDir = process.argv[2]

package/src/eth/codegen/tsconfig.json

@@ -3,6 +3,6 @@
     "rootDir": "..",
     "outDir": "../../../lib"
   },
-  "extends": "@sentio/sdk/tsconfig.json",
+  "extends": "../../../tsconfig.json",
   "include": ["./"]
 }

package/src/eth/context.ts

@@ -122,10 +122,7 @@ export class ContractContext<
     transaction?: Transaction,
     transactionReceipt?: TransactionReceipt
   ) {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    const address = view.rawContract.getAddress() as string
-    super(chainId, address, timestamp, block, log, trace, transaction, transactionReceipt)
+    super(chainId, view.address, timestamp, block, log, trace, transaction, transactionReceipt)
     view.context = this
     this.contractName = contractName
     this.contract = view
@@ -154,10 +151,12 @@ export class ContractView<TContract extends BaseContract> {
 
 export class BoundContractView<TContract extends BaseContract, TContractView extends ContractView<TContract>> {
   protected view: TContractView
+  readonly address: string
   // context will be set right after context creation (in context's constructor)
   context: ContractContext<TContract, BoundContractView<TContract, TContractView>>
 
-  constructor(view: TContractView) {
+  constructor(address: string, view: TContractView) {
+    this.address = address
     this.view = view
   }
 

package/src/eth/generic-processor.ts

@@ -17,7 +17,7 @@ export class GenericProcessor extends BaseProcessor<
 
   protected CreateBoundContractView(): BoundContractView<BaseContract, ContractView<BaseContract>> {
     const contract = new BaseContract(this.config.address, this.eventABI, getProvider(this.config.network))
-    return new BoundContractView(new ContractView<BaseContract>(contract))
+    return new BoundContractView(this.config.address, new ContractView<BaseContract>(contract))
   }
 
   public static bind(eventABI: string[] | string, options: BindOptions): GenericProcessor {

package/src/solana/{run-codegen.ts → codegen/run.ts}

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
-import path from 'path'
-import { codegen } from './codegen/codegen.js'
+import { codegen } from './codegen.js'
 
 if (process.argv.length > 3) {
   const abisDir = process.argv[2]

package/src/solana/codegen/tsconfig.json

@@ -3,6 +3,6 @@
     "rootDir": "..",
     "outDir": "../../../lib"
   },
-  "extends": "@sentio/sdk/tsconfig.json",
+  "extends": "../../../tsconfig.json",
   "include": ["./"]
 }

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

@@ -1 +0,0 @@
-{"version":3,"file":"run-codegen.js","sourceRoot":"","sources":["../../src/aptos/run-codegen.ts"],"names":[],"mappings":"AAAA,sBAAsB;AAEtB,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAE9C,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;IAC3B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAC/B,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAEjC,MAAM,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;CAClC;KAAM;IACL,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACpC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;CAChB","sourcesContent":["// #!/usr/bin/env node\n\nimport { codegen } from './codegen/codegen.js'\n\nif (process.argv.length > 3) {\n  const abisDir = process.argv[2]\n  const targetDir = process.argv[3]\n\n  await codegen(abisDir, targetDir)\n} else {\n  console.error('Not enough argument')\n  process.exit(1)\n}\n"]}

package/lib/eth/run-codegen.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"run-codegen.js","sourceRoot":"","sources":["../../src/eth/run-codegen.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAE5C,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;IAC3B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAC/B,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjC,MAAM,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;CAClC;KAAM;IACL,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACpC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;CAChB","sourcesContent":["#!/usr/bin/env node\n\nimport { codegen } from './codegen/index.js'\n\nif (process.argv.length > 3) {\n  const abisDir = process.argv[2]\n  const targetDir = process.argv[3]\n  await codegen(abisDir, targetDir)\n} else {\n  console.error('Not enough argument')\n  process.exit(1)\n}\n"]}

package/lib/solana/run-codegen.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"run-codegen.js","sourceRoot":"","sources":["../../src/solana/run-codegen.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAE9C,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;IAC3B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAC/B,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;CAC5B;KAAM;IACL,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;IACpC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;CAChB","sourcesContent":["#!/usr/bin/env node\n\nimport path from 'path'\nimport { codegen } from './codegen/codegen.js'\n\nif (process.argv.length > 3) {\n  const abisDir = process.argv[2]\n  const targetDir = process.argv[3]\n  codegen(abisDir, targetDir)\n} else {\n  console.error('Not enough argument')\n  process.exit(1)\n}\n"]}