@sentio/sdk 2.14.5-rc.1 → 2.15.0-rc.2

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/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

package/src/solana/solana-processor.ts

@@ -3,8 +3,8 @@ import { SolanaContext } from './solana-context.js'
 import { Instruction } from '@project-serum/anchor'
 import { SolanaBindOptions } from './solana-options.js'
 import { ListStateStorage } from '@sentio/runtime'
-import { CHAIN_IDS } from '@sentio/sdk'
 import { Labels } from '../core/index.js'
+import { SolanaChainId } from '../core/chain.js'
 
 type IndexConfigure = {
   startSlot: bigint
@@ -27,7 +27,7 @@ export class SolanaBaseProcessor {
   endpoint: string
   contractName: string
   baseLabels?: Labels
-  network: string
+  network: SolanaChainId
   processInnerInstruction: boolean
   config: IndexConfigure = { startSlot: 0n }
   instructionCoder: InstructionCoder
@@ -45,7 +45,7 @@ export class SolanaBaseProcessor {
     this.address = options.address
     this.contractName = options.name || ''
     this.processInnerInstruction = options.processInnerInstruction || false
-    this.network = options.network || CHAIN_IDS.SOLANA_MAINNET
+    this.network = options.network || SolanaChainId.SOLANA_MAINNET
     if (options.instructionCoder) {
       this.instructionCoder = options.instructionCoder
     }

package/src/sui/context.ts

@@ -1,6 +1,6 @@
 import { RecordMetaData } from '@sentio/protos'
 import { type Labels, BaseContext, normalizeLabels } from '../index.js'
-import { SuiNetwork, getChainId } from './network.js'
+import { SuiNetwork } from './network.js'
 import { SuiTransactionBlockResponse, JsonRpcProvider, Connection } from '@mysten/sui.js'
 import { MoveCoder, defaultMoveCoder } from './move-coder.js'
 import { Endpoints } from '@sentio/runtime'
@@ -39,8 +39,8 @@ export class SuiContext extends BaseContext {
     }
   }
 
-  getChainId(): string {
-    return getChainId(this.network)
+  getChainId() {
+    return this.network as any
   }
 
   getMetaDataInternal(name: string, labels: Labels): RecordMetaData {
@@ -58,7 +58,7 @@ export class SuiContext extends BaseContext {
   }
 
   get client(): JsonRpcProvider {
-    const chainServer = Endpoints.INSTANCE.chainServer.get(getChainId(this.network))
+    const chainServer = Endpoints.INSTANCE.chainServer.get(this.network)
     if (!chainServer) {
       throw new ServerError(Status.INTERNAL, 'RPC endpoint not provided')
     }
@@ -82,8 +82,8 @@ export class SuiObjectsContext extends BaseContext {
     this.coder = defaultMoveCoder(network)
   }
 
-  getChainId(): string {
-    return getChainId(this.network)
+  getChainId() {
+    return this.network as any
   }
 
   getMetaDataInternal(name: string, labels: Labels): RecordMetaData {
@@ -101,7 +101,7 @@ export class SuiObjectsContext extends BaseContext {
   }
 
   get client(): JsonRpcProvider {
-    const chainServer = Endpoints.INSTANCE.chainServer.get(getChainId(this.network))
+    const chainServer = Endpoints.INSTANCE.chainServer.get(this.network)
     if (!chainServer) {
       throw new ServerError(Status.INTERNAL, 'RPC endpoint not provided')
     }

package/src/sui/network.ts

@@ -1,23 +1,10 @@
-import { CHAIN_IDS, getChainName } from '../core/chain.js'
+import { SuiChainId } from '../core/chain.js'
 
-export enum SuiNetwork {
-  MAIN_NET = 1,
-  TEST_NET = 2,
-  DEV_NET = 3,
-}
-
-export function getChainId(network: SuiNetwork): string {
-  switch (network) {
-    case SuiNetwork.TEST_NET:
-      return CHAIN_IDS.SUI_TESTNET
-    case SuiNetwork.DEV_NET:
-      return CHAIN_IDS.SUI_DEVNET
-  }
-  return CHAIN_IDS.SUI_MAINNET
-}
-
-export function getSuiChainName(network: SuiNetwork): string {
-  return getChainName(getChainId(network))
+export type SuiNetwork = SuiChainId
+export const SuiNetwork = <const>{
+  MAIN_NET: SuiChainId.SUI_MAINNET,
+  TEST_NET: SuiChainId.SUI_TESTNET,
+  DEV_NET: SuiChainId.SUI_DEVNET,
 }
 
 export class SuiBindOptions {

package/src/sui/sui-plugin.ts

@@ -16,7 +16,6 @@ import {
 import { ServerError, Status } from 'nice-grpc'
 
 import { SuiAccountProcessorState, SuiProcessorState } from './sui-processor.js'
-import { getChainId } from './network.js'
 import { validateAndNormalizeAddress } from './utils.js'
 
 interface Handlers {
@@ -45,7 +44,7 @@ export class SuiPlugin extends Plugin {
         processorType: USER_PROCESSOR,
         contract: {
           name: suiProcessor.moduleName,
-          chainId: getChainId(suiProcessor.config.network),
+          chainId: suiProcessor.config.network,
           address: validateAndNormalizeAddress(suiProcessor.config.address),
           abi: '',
         },

package/src/sui/sui-processor.ts

@@ -8,7 +8,7 @@ import {
   ProcessResult,
 } from '@sentio/protos'
 import { ListStateStorage, mergeProcessResults } from '@sentio/runtime'
-import { getChainId, SuiNetwork } from './network.js'
+import { SuiNetwork } from './network.js'
 import { ServerError, Status } from 'nice-grpc'
 import { SuiContext, SuiObjectsContext } from './context.js'
 import {
@@ -71,7 +71,7 @@ export class SuiBaseProcessor {
   }
 
   getChainId(): string {
-    return getChainId(this.config.network)
+    return this.config.network
   }
 
   public onMoveEvent(
@@ -236,7 +236,7 @@ abstract class SuiBaseObjectsProcessor<HandlerType> {
   }
 
   getChainId(): string {
-    return getChainId(this.config.network)
+    return this.config.network
   }
 
   // protected abstract transformObjects(objects: SuiMoveObject[]): SuiMoveObject[]

package/src/testing/aptos-facet.ts

@@ -1,6 +1,5 @@
 import { Transaction_UserTransaction, TransactionPayload_EntryFunctionPayload } from '../aptos/index.js'
 import { DataBinding, HandlerType } from '@sentio/protos'
-import { getChainId } from '../aptos/network.js'
 import { TestProcessorServer } from './test-processor-server.js'
 import { AptosNetwork } from '@sentio/sdk/aptos'
 import { parseMoveType } from '../move/types.js'
@@ -35,7 +34,7 @@ export class AptosFacet {
   ): DataBinding | undefined {
     const payload = transaction.payload as TransactionPayload_EntryFunctionPayload
     for (const config of this.server.contractConfigs) {
-      if (config.contract?.chainId !== getChainId(network)) {
+      if (config.contract?.chainId !== network) {
         continue
       }
       for (const callConfig of config.moveCallConfigs) {
@@ -71,7 +70,7 @@ export class AptosFacet {
   ): DataBinding | undefined {
     // const allEvents = new Set(transaction.events.map(e => e.type))
     for (const config of this.server.contractConfigs) {
-      if (config.contract?.chainId !== getChainId(network)) {
+      if (config.contract?.chainId !== network) {
         continue
       }
       for (const eventConfig of config.moveEventConfigs) {

package/src/testing/eth-facet.ts

@@ -1,9 +1,9 @@
 import { TestProcessorServer } from './test-processor-server.js'
 import { DataBinding, HandlerType, ProcessBindingResponse } from '@sentio/protos'
 import { Trace } from '../eth/eth.js'
-import { BlockParams, LogParams, Networkish } from 'ethers/providers'
+import { BlockParams, LogParams } from 'ethers/providers'
 import { Block } from 'ethers'
-import { getNetworkFromCtxOrNetworkish } from '../eth/provider.js'
+import { ChainId, EthChainId } from '../core/chain.js'
 
 export class EthFacet {
   server: TestProcessorServer
@@ -12,11 +12,11 @@ export class EthFacet {
     this.server = server
   }
 
-  testTrace(trace: Trace, network: Networkish = 1): Promise<ProcessBindingResponse> {
+  testTrace(trace: Trace, network: EthChainId = EthChainId.ETHEREUM): Promise<ProcessBindingResponse> {
     return this.testTraces([trace], network)
   }
 
-  testTraces(traces: Trace[], network: Networkish = 1): Promise<ProcessBindingResponse> {
+  testTraces(traces: Trace[], network: EthChainId = EthChainId.ETHEREUM): Promise<ProcessBindingResponse> {
     const bindings = []
     for (const trace of traces) {
       const binding = this.buildTraceBinding(trace, network)
@@ -30,14 +30,14 @@ export class EthFacet {
     })
   }
 
-  buildTraceBinding(trace: Trace, network: Networkish = 1): DataBinding | undefined {
+  buildTraceBinding(trace: Trace, network: ChainId = EthChainId.ETHEREUM): DataBinding | undefined {
     if (trace.type !== 'call' || !trace.action.input) {
       throw Error('Invalid test trace: ' + JSON.stringify(trace))
     }
     const signature = trace.action.input.slice(0, 10)
 
     for (const contract of this.server.contractConfigs) {
-      if (contract.contract?.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {
+      if (contract.contract?.chainId !== network) {
         continue
       }
       if (trace.action.to?.toLowerCase() !== contract.contract?.address.toLowerCase()) {
@@ -61,11 +61,11 @@ export class EthFacet {
     return undefined
   }
 
-  testLog(log: LogParams, network: Networkish = 1): Promise<ProcessBindingResponse> {
+  testLog(log: LogParams, network: EthChainId = EthChainId.ETHEREUM): Promise<ProcessBindingResponse> {
     return this.testLogs([log], network)
   }
 
-  testLogs(logs: LogParams[], network: Networkish = 1): Promise<ProcessBindingResponse> {
+  testLogs(logs: LogParams[], network: EthChainId = EthChainId.ETHEREUM): Promise<ProcessBindingResponse> {
     const bindings = []
     for (const log of logs) {
       const binding = this.buildLogBinding(log, network)
@@ -79,9 +79,9 @@ export class EthFacet {
     })
   }
 
-  buildLogBinding(log: LogParams, network: Networkish = 1): DataBinding | undefined {
+  buildLogBinding(log: LogParams, network: EthChainId = EthChainId.ETHEREUM): DataBinding | undefined {
     for (const contract of this.server.contractConfigs) {
-      if (contract.contract?.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {
+      if (contract.contract?.chainId !== network) {
         continue
       }
       if (log.address.toLowerCase() !== contract.contract?.address.toLowerCase()) {
@@ -122,11 +122,19 @@ export class EthFacet {
     }
     return undefined
   }
-  testAccountLog(address: string, log: LogParams, network: Networkish = 1): Promise<ProcessBindingResponse> {
+  testAccountLog(
+    address: string,
+    log: LogParams,
+    network: EthChainId = EthChainId.ETHEREUM
+  ): Promise<ProcessBindingResponse> {
     return this.testAccountLogs(address, [log], network)
   }
 
-  testAccountLogs(address: string, logs: LogParams[], network: Networkish = 1): Promise<ProcessBindingResponse> {
+  testAccountLogs(
+    address: string,
+    logs: LogParams[],
+    network: EthChainId = EthChainId.ETHEREUM
+  ): Promise<ProcessBindingResponse> {
     const bindings = []
     for (const log of logs) {
       const binding = this.buildAccountLogBinding(address, log, network)
@@ -140,9 +148,13 @@ export class EthFacet {
     })
   }
 
-  buildAccountLogBinding(address: string, log: LogParams, network: Networkish = 1): DataBinding | undefined {
+  buildAccountLogBinding(
+    address: string,
+    log: LogParams,
+    network: EthChainId = EthChainId.ETHEREUM
+  ): DataBinding | undefined {
     for (const account of this.server.accountConfigs) {
-      if (account.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {
+      if (account.chainId !== network) {
         continue
       }
       if (address.toLowerCase() !== account.address.toLowerCase()) {
@@ -186,12 +198,12 @@ export class EthFacet {
 
   testBlock(
     block: Partial<BlockParams> & { number: number },
-    network: Networkish = 1
+    network: EthChainId = EthChainId.ETHEREUM
   ): Promise<ProcessBindingResponse> {
     return this.testBlocks([block], network)
   }
 
-  testBlocks(blocks: Partial<BlockParams> & { number: number }[], network: Networkish = 1) {
+  testBlocks(blocks: Partial<BlockParams> & { number: number }[], network: EthChainId = EthChainId.ETHEREUM) {
     const bindings = []
     for (const block of blocks) {
       const binding = this.buildBlockBinding(block, network)
@@ -205,7 +217,10 @@ export class EthFacet {
     })
   }
 
-  buildBlockBinding(block: Partial<Block> & { number: number }, network: Networkish = 1): DataBinding {
+  buildBlockBinding(
+    block: Partial<Block> & { number: number },
+    network: EthChainId = EthChainId.ETHEREUM
+  ): DataBinding {
     const binding: DataBinding = {
       data: {
         ethBlock: { block },
@@ -214,7 +229,7 @@ export class EthFacet {
       handlerIds: [],
     }
     for (const contract of this.server.contractConfigs) {
-      if (contract.contract?.chainId !== getNetworkFromCtxOrNetworkish(network).chainId.toString()) {
+      if (contract.contract?.chainId !== network) {
         continue
       }
       const longBlockNumber = block.number

package/src/testing/sui-facet.ts

@@ -1,6 +1,5 @@
 import { SuiTransactionBlockResponse, MoveCallSuiTransaction } from '@mysten/sui.js'
 import { DataBinding, HandlerType } from '@sentio/protos'
-import { getChainId } from '../sui/network.js'
 import { TestProcessorServer } from './test-processor-server.js'
 import { parseMoveType } from '../move/types.js'
 import { SuiNetwork } from '../sui/index.js'
@@ -43,7 +42,7 @@ export class SuiFacet {
       const functionType = [call.package, call.module, call.function].join(SPLITTER)
 
       for (const config of this.server.contractConfigs) {
-        if (config.contract?.chainId !== getChainId(network)) {
+        if (config.contract?.chainId !== network) {
           continue
         }
         for (const callConfig of config.moveCallConfigs) {
@@ -83,7 +82,7 @@ export class SuiFacet {
     // const allEvents = new Set(transaction.events.map(e => e.type))
 
     for (const config of this.server.contractConfigs) {
-      if (config.contract?.chainId !== getChainId(network)) {
+      if (config.contract?.chainId !== network) {
         continue
       }
       for (const eventConfig of config.moveEventConfigs) {

package/src/utils/dex-price.ts

@@ -4,6 +4,7 @@ import { parse } from 'csv-parse/sync'
 import { BlockTag } from 'ethers/providers'
 import url from 'url'
 import { scaleDown } from '../core/big-decimal.js'
+import { EthChainId } from '../core/chain.js'
 
 type OralceRecord = {
   Pair: string
@@ -31,9 +32,9 @@ class DexPrice {
   BTC_ORACLE_MAP = new Map<string, string>()
   ASSETS_INFOS = new Map<string, number>()
 
-  readonly chainId: number
+  readonly chainId: EthChainId
 
-  constructor(csvFileName: string, chainId: number) {
+  constructor(csvFileName: string, chainId: EthChainId) {
     this.chainId = chainId
     const csvFilePath = url.fileURLToPath(new URL('./' + csvFileName, import.meta.url))
     const fileContent = fs.readFileSync(csvFilePath, { encoding: 'utf-8' })
@@ -131,5 +132,5 @@ class DexPrice {
   }
 }
 
-export const EthereumDexPrice = new DexPrice('chainlink-oracles.csv', 1)
-export const GoerliDexPrice = new DexPrice('chainlink-oracles-goerli.csv', 5)
+export const EthereumDexPrice = new DexPrice('chainlink-oracles.csv', EthChainId.ETHEREUM)
+export const GoerliDexPrice = new DexPrice('chainlink-oracles-goerli.csv', EthChainId.GOERLI)

package/src/utils/price.ts

@@ -3,6 +3,7 @@ import { createChannel, createClientFactory, Status } from 'nice-grpc'
 import { prometheusClientMiddleware } from 'nice-grpc-prometheus'
 import { retryMiddleware, RetryOptions } from 'nice-grpc-client-middleware-retry'
 import { Endpoints } from '@sentio/runtime'
+import { ChainId } from '../core/chain.js'
 
 export function getPriceClient(address?: string) {
   if (!address) {
@@ -98,7 +99,7 @@ export async function getPriceByTypeOrSymbolInternal(
  * @param options other behavior options
  */
 export async function getPriceByType(
-  chainId: string,
+  chainId: ChainId,
   coinType: string,
   date: Date,
   options?: PriceOptions