@sentio/sdk 2.14.4 → 2.15.0-rc.1

package/src/eth/builtin/internal/erc20-processor.ts

@@ -2,7 +2,6 @@
 /* tslint:disable */
 /* eslint-disable */
 import { Overrides } from "ethers";
-import { Networkish } from "ethers/providers";
 import {
   addContractByABI,
   getContractByABI,
@@ -17,11 +16,12 @@ import {
   ContractContext,
   ContractView,
   DummyProvider,
+  EthChainId,
   TypedCallTrace,
-  getNetworkFromCtxOrNetworkish,
+  getEthChainId,
+  EthContext,
   EthFetchConfig,
 } from "@sentio/sdk/eth";
-import { BaseContext } from "@sentio/sdk";
 
 import { ERC20, ERC20__factory } from "./index.js";
 import {
@@ -610,10 +610,10 @@ export class ERC20ProcessorTemplate extends BaseProcessorTemplate<
 }
 
 export function getERC20Contract(
-  contextOrNetwork: BaseContext | Networkish,
+  contextOrNetwork: EthContext | EthChainId,
   address: string
 ): ERC20ContractView {
-  const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
+  const network = getEthChainId(contextOrNetwork);
   let contract = getContractByABI(
     "ERC20",
     address,

package/src/eth/builtin/internal/erc20-test-utils.ts

@@ -2,6 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 import { LogParams } from "ethers/providers";
+import { EthChainId } from "@sentio/sdk/eth";
 import {
   ApprovalEventObject,
   OwnershipTransferredEventObject,
@@ -23,7 +24,7 @@ export function mockApprovalLog(
   contractAddress: string,
   event: ApprovalEventObject
 ): LogParams {
-  const contract = getERC20Contract(1, contractAddress);
+  const contract = getERC20Contract(EthChainId.ETHEREUM, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Approval(address,address,uint256)",
     [event.owner, event.spender, event.value]
@@ -41,7 +42,7 @@ export function mockOwnershipTransferredLog(
   contractAddress: string,
   event: OwnershipTransferredEventObject
 ): LogParams {
-  const contract = getERC20Contract(1, contractAddress);
+  const contract = getERC20Contract(EthChainId.ETHEREUM, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "OwnershipTransferred(address,address)",
     [event.previousOwner, event.newOwner]
@@ -59,7 +60,7 @@ export function mockTransferLog(
   contractAddress: string,
   event: TransferEventObject
 ): LogParams {
-  const contract = getERC20Contract(1, contractAddress);
+  const contract = getERC20Contract(EthChainId.ETHEREUM, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Transfer(address,address,uint256)",
     [event.from, event.to, event.value]

package/src/eth/builtin/internal/erc20bytes-processor.ts

@@ -2,7 +2,6 @@
 /* tslint:disable */
 /* eslint-disable */
 import { Overrides } from "ethers";
-import { Networkish } from "ethers/providers";
 import {
   addContractByABI,
   getContractByABI,
@@ -17,11 +16,12 @@ import {
   ContractContext,
   ContractView,
   DummyProvider,
+  EthChainId,
   TypedCallTrace,
-  getNetworkFromCtxOrNetworkish,
+  getEthChainId,
+  EthContext,
   EthFetchConfig,
 } from "@sentio/sdk/eth";
-import { BaseContext } from "@sentio/sdk";
 
 import { ERC20Bytes, ERC20Bytes__factory } from "./index.js";
 import {
@@ -412,10 +412,10 @@ export class ERC20BytesProcessorTemplate extends BaseProcessorTemplate<
 }
 
 export function getERC20BytesContract(
-  contextOrNetwork: BaseContext | Networkish,
+  contextOrNetwork: EthContext | EthChainId,
   address: string
 ): ERC20BytesContractView {
-  const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
+  const network = getEthChainId(contextOrNetwork);
   let contract = getContractByABI(
     "ERC20Bytes",
     address,

package/src/eth/builtin/internal/erc20bytes-test-utils.ts

@@ -2,6 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 import { LogParams } from "ethers/providers";
+import { EthChainId } from "@sentio/sdk/eth";
 import { ApprovalEventObject, TransferEventObject } from "./ERC20Bytes.js";
 import { getERC20BytesContract } from "./erc20bytes-processor.js";
 const mockField = {
@@ -19,7 +20,7 @@ export function mockApprovalLog(
   contractAddress: string,
   event: ApprovalEventObject
 ): LogParams {
-  const contract = getERC20BytesContract(1, contractAddress);
+  const contract = getERC20BytesContract(EthChainId.ETHEREUM, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Approval(address,address,uint256)",
     [event.owner, event.spender, event.value]
@@ -37,7 +38,7 @@ export function mockTransferLog(
   contractAddress: string,
   event: TransferEventObject
 ): LogParams {
-  const contract = getERC20BytesContract(1, contractAddress);
+  const contract = getERC20BytesContract(EthChainId.ETHEREUM, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Transfer(address,address,uint256)",
     [event.from, event.to, event.value]

package/src/eth/builtin/internal/erc721-processor.ts

@@ -2,7 +2,6 @@
 /* tslint:disable */
 /* eslint-disable */
 import { BigNumberish, Overrides, BytesLike } from "ethers";
-import { Networkish } from "ethers/providers";
 import {
   addContractByABI,
   getContractByABI,
@@ -17,11 +16,12 @@ import {
   ContractContext,
   ContractView,
   DummyProvider,
+  EthChainId,
   TypedCallTrace,
-  getNetworkFromCtxOrNetworkish,
+  getEthChainId,
+  EthContext,
   EthFetchConfig,
 } from "@sentio/sdk/eth";
-import { BaseContext } from "@sentio/sdk";
 
 import { ERC721, ERC721__factory } from "./index.js";
 import {
@@ -627,10 +627,10 @@ export class ERC721ProcessorTemplate extends BaseProcessorTemplate<
 }
 
 export function getERC721Contract(
-  contextOrNetwork: BaseContext | Networkish,
+  contextOrNetwork: EthContext | EthChainId,
   address: string
 ): ERC721ContractView {
-  const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
+  const network = getEthChainId(contextOrNetwork);
   let contract = getContractByABI(
     "ERC721",
     address,

package/src/eth/builtin/internal/erc721-test-utils.ts

@@ -2,6 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 import { LogParams } from "ethers/providers";
+import { EthChainId } from "@sentio/sdk/eth";
 import {
   ApprovalEventObject,
   ApprovalForAllEventObject,
@@ -23,7 +24,7 @@ export function mockApprovalLog(
   contractAddress: string,
   event: ApprovalEventObject
 ): LogParams {
-  const contract = getERC721Contract(1, contractAddress);
+  const contract = getERC721Contract(EthChainId.ETHEREUM, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Approval(address,address,uint256)",
     [event.owner, event.approved, event.tokenId]
@@ -41,7 +42,7 @@ export function mockApprovalForAllLog(
   contractAddress: string,
   event: ApprovalForAllEventObject
 ): LogParams {
-  const contract = getERC721Contract(1, contractAddress);
+  const contract = getERC721Contract(EthChainId.ETHEREUM, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "ApprovalForAll(address,address,bool)",
     [event.owner, event.operator, event.approved]
@@ -59,7 +60,7 @@ export function mockTransferLog(
   contractAddress: string,
   event: TransferEventObject
 ): LogParams {
-  const contract = getERC721Contract(1, contractAddress);
+  const contract = getERC721Contract(EthChainId.ETHEREUM, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Transfer(address,address,uint256)",
     [event.from, event.to, event.tokenId]

package/src/eth/builtin/internal/weth9-processor.ts

@@ -2,7 +2,6 @@
 /* tslint:disable */
 /* eslint-disable */
 import { Overrides } from "ethers";
-import { Networkish } from "ethers/providers";
 import {
   addContractByABI,
   getContractByABI,
@@ -17,11 +16,12 @@ import {
   ContractContext,
   ContractView,
   DummyProvider,
+  EthChainId,
   TypedCallTrace,
-  getNetworkFromCtxOrNetworkish,
+  getEthChainId,
+  EthContext,
   EthFetchConfig,
 } from "@sentio/sdk/eth";
-import { BaseContext } from "@sentio/sdk";
 
 import { WETH9, WETH9__factory } from "./index.js";
 import {
@@ -485,10 +485,10 @@ export class WETH9ProcessorTemplate extends BaseProcessorTemplate<
 }
 
 export function getWETH9Contract(
-  contextOrNetwork: BaseContext | Networkish,
+  contextOrNetwork: EthContext | EthChainId,
   address: string
 ): WETH9ContractView {
-  const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
+  const network = getEthChainId(contextOrNetwork);
   let contract = getContractByABI(
     "WETH9",
     address,

package/src/eth/builtin/internal/weth9-test-utils.ts

@@ -2,6 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 import { LogParams } from "ethers/providers";
+import { EthChainId } from "@sentio/sdk/eth";
 import {
   ApprovalEventObject,
   TransferEventObject,
@@ -24,7 +25,7 @@ export function mockApprovalLog(
   contractAddress: string,
   event: ApprovalEventObject
 ): LogParams {
-  const contract = getWETH9Contract(1, contractAddress);
+  const contract = getWETH9Contract(EthChainId.ETHEREUM, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Approval(address,address,uint256)",
     [event.src, event.guy, event.wad]
@@ -42,7 +43,7 @@ export function mockTransferLog(
   contractAddress: string,
   event: TransferEventObject
 ): LogParams {
-  const contract = getWETH9Contract(1, contractAddress);
+  const contract = getWETH9Contract(EthChainId.ETHEREUM, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Transfer(address,address,uint256)",
     [event.src, event.dst, event.wad]
@@ -60,7 +61,7 @@ export function mockDepositLog(
   contractAddress: string,
   event: DepositEventObject
 ): LogParams {
-  const contract = getWETH9Contract(1, contractAddress);
+  const contract = getWETH9Contract(EthChainId.ETHEREUM, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Deposit(address,uint256)",
     [event.dst, event.wad]
@@ -78,7 +79,7 @@ export function mockWithdrawalLog(
   contractAddress: string,
   event: WithdrawalEventObject
 ): LogParams {
-  const contract = getWETH9Contract(1, contractAddress);
+  const contract = getWETH9Contract(EthChainId.ETHEREUM, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Withdrawal(address,uint256)",
     [event.src, event.wad]

package/src/eth/codegen/ethers-sentio.ts

@@ -11,6 +11,7 @@ import {
 import { dirname, join, relative } from 'path'
 import { codeGenIndex, codeGenSentioFile, codeGenTestUtilsFile } from './file.js'
 import { YamlContractConfig } from '../../core/yaml-contract-config.js'
+import { ChainId, EthChainId } from '../../core/chain.js'
 
 export interface SentioEthersConfig extends Config {
   contractsToGenExample: YamlContractConfig[]
@@ -98,17 +99,23 @@ export default class EthersSentio extends Ethers.default {
     const contractsToGenExample = (this.cfg as SentioEthersConfig).contractsToGenExample
     if (contractsToGenExample.length > 0) {
       const processors = this.processedABIs.map((abi) => `${abi.name}Processor`).join(',')
-      let exampleContent = `import { ${processors} } from './types/eth/index.js'`
+      let exampleContent = `
+      import { EthChainId } from '@sentio/sdk/eth' 
+      import { ${processors} } from './types/eth/index.js'`
+
+      const ethChainIdValues = new Map<ChainId, string>()
+      for (const [key, value] of Object.entries(EthChainId)) {
+        ethChainIdValues.set(value, key)
+      }
 
       for (const contract of contractsToGenExample) {
-        const chainId = parseInt(contract.chain)
-        if (isNaN(chainId) || !isFinite(chainId)) {
+        const chainKey = ethChainIdValues.get(contract.chain)
+        if (!chainKey) {
           continue
         }
-
         const content = `
 
-${contract.name}Processor.bind({ address: '${contract.address}', network: ${contract.chain} })
+${contract.name}Processor.bind({ address: '${contract.address}', network: EthChainId.${chainKey} })
   .onAllEvents((evt, ctx) => {
     ctx.meter.Counter('event_count').add(1, { name: evt.name })
     ctx.eventLogger.emit(evt.name, {

package/src/eth/codegen/file.ts

@@ -106,10 +106,10 @@ export class ${contract.name}ProcessorTemplate extends BaseProcessorTemplate<${c
     .join('\n')}
   }
 
-  export function get${contract.name}Contract(contextOrNetwork: BaseContext | Networkish, address: string): ${
+  export function get${contract.name}Contract(contextOrNetwork: EthContext | EthChainId, address: string): ${
     contract.name
   }ContractView {
-    const network = getNetworkFromCtxOrNetworkish(contextOrNetwork) 
+    const network = getEthChainId(contextOrNetwork) 
     let contract = getContractByABI("${contract.name}", address, network) as ${contract.name}ContractView
     if (!contract) {
       const rawContract = ${contract.name}__factory.connect(address, getProvider(network))
@@ -148,7 +148,7 @@ export class ${contract.name}ProcessorTemplate extends BaseProcessorTemplate<${c
   const imports = createImportsForUsedIdentifiers(
     {
       ethers: ['BigNumberish', 'Overrides', 'BytesLike'],
-      'ethers/providers': ['Networkish'],
+      // 'ethers/providers': ['Networkish'],
       '@sentio/sdk/eth': [
         'addContractByABI',
         'getContractByABI',
@@ -164,12 +164,14 @@ export class ${contract.name}ProcessorTemplate extends BaseProcessorTemplate<${c
         'ContractContext',
         'ContractView',
         'DummyProvider',
+        'EthChainId',
         'TypedCallTrace',
-        'getNetworkFromCtxOrNetworkish',
+        'getEthChainId',
         // 'toBlockTag',
+        'EthContext',
         'EthFetchConfig',
       ],
-      '@sentio/sdk': ['BaseContext'],
+      // '@sentio/sdk/eth': ['BaseContext'],
       // '@sentio/protos': ['EthFetchConfig'],
       './common.js': ['PromiseOrValue'],
       './index.js': [`${contract.name}`, `${contract.name}__factory`],
@@ -206,6 +208,7 @@ export function codeGenTestUtilsFile(contract: Contract): string {
 
   const possibleImports = {
     'ethers/providers': ['LogParams'],
+    '@sentio/sdk/eth': ['EthChainId'],
   } as any
   possibleImports[`./${contract.name}.js`] = Object.values(contract.events).flatMap((events) => {
     if (events.length === 1) {
@@ -232,7 +235,7 @@ function generateMockEventLogFunction(event: EventDeclaration, contractName: str
 
   return `
     export function mock${eventName}Log(contractAddress: string, event: ${eventName}EventObject): LogParams {
-      const contract = get${contractName}Contract(1, contractAddress)
+      const contract = get${contractName}Contract(EthChainId.ETHEREUM, contractAddress)
       const encodedLog = contract.rawContract.interface.encodeEventLog(
         '${getFullSignatureForEvent(event)}',
         [${eventArgs.join(', ')}]

package/src/eth/context.ts

@@ -5,9 +5,10 @@ import { RecordMetaData } from '@sentio/protos'
 import { Trace } from './eth.js'
 import { Labels, normalizeLabels } from '../core/index.js'
 import { BaseContext } from '../core/base-context.js'
+import { EthChainId } from '../core/chain.js'
 
 export abstract class EthContext extends BaseContext {
-  chainId: number
+  chainId: EthChainId
   address: string
   private readonly log?: LogParams
   block?: BlockParams
@@ -19,7 +20,7 @@ export abstract class EthContext extends BaseContext {
   timestamp: Date
 
   constructor(
-    chainId: number,
+    chainId: EthChainId,
     address: string,
     timestamp?: Date,
     block?: BlockParams,
@@ -51,8 +52,8 @@ export abstract class EthContext extends BaseContext {
 
   protected abstract getContractName(): string
 
-  getChainId(): string {
-    return this.chainId.toString()
+  getChainId(): EthChainId {
+    return this.chainId
   }
 
   getMetaDataInternal(name: string, labels: Labels): RecordMetaData {
@@ -64,7 +65,7 @@ export abstract class EthContext extends BaseContext {
         transactionIndex: this.log.transactionIndex,
         transactionHash: this.transactionHash || '',
         logIndex: this.log.index,
-        chainId: this.chainId.toString(),
+        chainId: this.chainId,
         name: name,
         labels: normalizeLabels(labels),
       }
@@ -110,7 +111,7 @@ export class AccountContext extends EthContext {
 
 export class GlobalContext extends EthContext {
   constructor(
-    chainId: number,
+    chainId: EthChainId,
     timestamp?: Date,
     block?: BlockParams,
     log?: LogParams,
@@ -135,7 +136,7 @@ export class ContractContext<
   constructor(
     contractName: string,
     view: TContractBoundView,
-    chainId: number,
+    chainId: EthChainId,
     timestamp?: Date,
     block?: BlockParams,
     log?: LogParams,

package/src/eth/eth-plugin.ts

@@ -12,7 +12,6 @@ import {
   LogHandlerConfig,
   ProcessConfigResponse,
   ProcessResult,
-  RecordMetaData,
   StartRequest,
 } from '@sentio/protos'
 
@@ -22,7 +21,8 @@ import { AccountProcessorState } from './account-processor-state.js'
 import { ProcessorTemplateProcessorState, TemplateInstanceState } from './base-processor-template.js'
 import { GlobalProcessorState } from './base-processor.js'
 import { validateAndNormalizeAddress } from './eth.js'
-import { BaseContext, Labels } from '../core/index.js'
+import { EthChainId } from '../core/chain.js'
+import { EthContext } from './context.js'
 
 interface Handlers {
   eventHandlers: ((event: Data_EthLog) => Promise<ProcessResult>)[]
@@ -256,7 +256,7 @@ export class EthPlugin extends Plugin {
         {
           name: instance.contract.name,
           address: validateAndNormalizeAddress(instance.contract.address),
-          network: Number(instance.contract.chainId),
+          network: instance.contract.chainId as EthChainId,
           startBlock: instance.startBlock,
           endBlock: instance.endBlock,
         },
@@ -355,15 +355,12 @@ export class EthPlugin extends Plugin {
 
 PluginManager.INSTANCE.register(new EthPlugin())
 
-class NoopContext extends BaseContext {
+class NoopContext extends EthContext {
   public constructor() {
-    super({})
-  }
-  getChainId(): string {
-    return ''
+    super(EthChainId.ETHEREUM, '')
   }
 
-  getMetaDataInternal(name: string, labels: Labels): RecordMetaData {
-    return RecordMetaData.create()
+  protected getContractName(): string {
+    return ''
   }
 }

package/src/eth/index.ts

@@ -2,7 +2,8 @@ export { BaseProcessor, GlobalProcessor } from './base-processor.js'
 export { GenericProcessor } from './generic-processor.js'
 export { BaseProcessorTemplate } from './base-processor-template.js'
 export { AccountProcessor } from './account-processor.js'
-export { getProvider, DummyProvider, getNetworkFromCtxOrNetworkish } from './provider.js'
+export { getProvider, DummyProvider, getEthChainId } from './provider.js'
+export { EthContext } from './context.js'
 export * from './eth.js'
 export { BindOptions, AccountBindOptions } from './bind-options.js'
 export { getProcessor, addProcessor, getContractByABI, addContractByABI } from './binds.js'
@@ -11,3 +12,5 @@ export { ContractContext, GlobalContext, ContractView, BoundContractView } from
 export { EthPlugin } from './eth-plugin.js'
 
 export { EthFetchConfig } from '@sentio/protos'
+
+export { EthChainId } from '../core/chain.js'

package/src/eth/provider.ts

@@ -1,36 +1,34 @@
-import { Provider, Network, JsonRpcProvider } from 'ethers'
-import { Networkish } from 'ethers/providers'
+import { JsonRpcProvider, Network, Provider } from 'ethers'
 
 import PQueue from 'p-queue'
 import { Endpoints } from '@sentio/runtime'
 import { BaseContext } from '../core/index.js'
+import { EthChainId } from '../core/chain.js'
+import { EthContext } from './context.js'
 
 export const DummyProvider = new JsonRpcProvider('', Network.from(1))
 
 const providers = new Map<string, JsonRpcProvider>()
 
-export function getNetworkFromCtxOrNetworkish(networkish?: BaseContext | Networkish) {
+export function getEthChainId(networkish?: EthContext | EthChainId): EthChainId {
   if (!networkish) {
-    networkish = 1
+    networkish = EthChainId.ETHEREUM
   }
   if (networkish instanceof BaseContext) {
     networkish = networkish.getChainId()
   }
-  if (typeof networkish === 'string') {
-    const id = parseInt(networkish)
-    if (isNaN(id)) {
-      throw Error('Unexpected Network')
-    }
-    networkish = id
-  }
-  return Network.from(networkish)
+  return networkish
 }
 
-export function getProvider(networkish?: Networkish): Provider {
-  const network = getNetworkFromCtxOrNetworkish(networkish)
+export function getProvider(chainId?: EthChainId): Provider {
+  // const network = getNetworkFromCtxOrNetworkish(networkish)
+  if (!chainId) {
+    chainId = EthChainId.ETHEREUM
+  }
+  const network = Network.from(parseInt(chainId))
   // TODO check if other key needed
 
-  const address = Endpoints.INSTANCE.chainServer.get(network.chainId.toString())
+  const address = Endpoints.INSTANCE.chainServer.get(chainId)
   const key = network.chainId.toString() + '-' + address
   let provider = providers.get(key)
 

package/src/move/abstract-codegen.ts

@@ -158,14 +158,21 @@ export abstract class AbstractCodegen<NetworkType, ModuleTypes, StructType> {
     return 'MAIN_NET'
   }
 
-  generateModule(module: InternalMoveModule, network: NetworkType) {
+  generateModule(module: InternalMoveModule, allEventStructs: Map<string, InternalMoveStruct>, network: NetworkType) {
+    const qname = moduleQname(module)
     const functions = this.GENERATE_ON_ENTRY
       ? module.exposedFunctions.map((f) => this.generateOnEntryFunctions(module, f)).filter((s) => s !== '')
       : []
     const clientFunctions = this.GENERATE_CLIENT
       ? module.exposedFunctions.map((f) => this.generateClientFunctions(module, f)).filter((s) => s !== '')
       : []
-    const eventStructs = this.chainAdapter.getEventStructs(module)
+    const eventStructs = new Map<string, InternalMoveStruct>()
+    for (const [type, struct] of allEventStructs.entries()) {
+      if (type.startsWith(qname + SPLITTER)) {
+        eventStructs.set(type, struct)
+      }
+    }
+
     const eventTypes = new Set(eventStructs.keys())
     const events = Array.from(eventStructs.values())
       .map((e) => this.generateOnEvents(module, e))
@@ -554,6 +561,8 @@ export class AccountCodegen<NetworkType, ModuleType, StructType> {
       `
     }
 
+    const eventsMap: Map<string, InternalMoveStruct> = this.moduleGen.chainAdapter.getAllEventStructs(this.modules)
+
     const source = `
     /* Autogenerated file. Do not edit manually. */
     /* tslint:disable */
@@ -565,7 +574,7 @@ export class AccountCodegen<NetworkType, ModuleType, StructType> {
 
     ${moduleImports.join('\n')}
 
-    ${this.modules.map((m) => this.moduleGen.generateModule(m, this.config.network)).join('\n')}
+    ${this.modules.map((m) => this.moduleGen.generateModule(m, eventsMap, this.config.network)).join('\n')}
 
     const MODULES = JSON.parse('${JSON.stringify(this.abi)}')
 

package/src/move/chain-adapter.ts

@@ -6,8 +6,10 @@ export abstract class ChainAdapter<NetworkType, ModuleType, StructType> {
 
   abstract fetchModules(account: string, network: NetworkType): Promise<ModuleType[]>
   abstract toInternalModules(modules: ModuleType[]): InternalMoveModule[]
-  // Get the structs that represent Events
-  abstract getEventStructs(module: InternalMoveModule): Map<string, InternalMoveStruct>
+
+  // Get all structs that represent Events
+  abstract getAllEventStructs(module: InternalMoveModule[]): Map<string, InternalMoveStruct>
+
   // Get the parameters that actually have arguments in runtime
   // Aptos first signer and Sui's last TxContext are no use
   abstract getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[]

package/src/solana/solana-context.ts

@@ -1,20 +1,27 @@
-import { normalizeLabels, Labels, BaseContext, RecordMetaData, CHAIN_IDS } from '@sentio/sdk'
+import { normalizeLabels, Labels, BaseContext, RecordMetaData } from '@sentio/sdk'
+import { SolanaChainId } from '../core/chain.js'
 
 export class SolanaContext extends BaseContext {
-  network: string
+  network: SolanaChainId
   address: string
   programName: string
   blockNumber: bigint
 
-  constructor(programName: string, network: string, address: string, slot: bigint, baseLabels: Labels | undefined) {
+  constructor(
+    programName: string,
+    network: SolanaChainId,
+    address: string,
+    slot: bigint,
+    baseLabels: Labels | undefined
+  ) {
     super(baseLabels)
-    this.network = network || CHAIN_IDS.SOLANA_MAINNET
+    this.network = network || SolanaChainId.SOLANA_MAINNET
     this.programName = programName
     this.address = address
     this.blockNumber = slot
   }
 
-  getChainId(): string {
+  getChainId() {
     return this.network
   }
 

package/src/solana/solana-options.ts

@@ -1,9 +1,10 @@
 import { InstructionCoder } from './solana-processor.js'
 import { Labels } from '../core/index.js'
+import { SolanaChainId } from '../core/chain.js'
 
 export class SolanaBindOptions {
   address: string
-  network?: string
+  network?: SolanaChainId
   name?: string
   startBlock?: bigint | number
   endBlock?: bigint | number