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

package/src/eth/bind-options.ts

@@ -1,11 +1,10 @@
-import { Networkish, Network } from 'ethers/providers'
-import { getNetworkFromCtxOrNetworkish } from './provider.js'
+import { EthChainId } from '../core/chain.js'
 
 export class BindOptions {
   // Contract address
   address: string
   // Optional, if not set, then use eth mainnet
-  network?: Networkish = 1
+  network?: EthChainId = EthChainId.ETHEREUM
   // Optional, override default contract name
   name?: string
   startBlock?: bigint | number
@@ -16,8 +15,7 @@ export class BindOptions {
 export function getOptionsSignature(opts: BindOptions): string {
   const sig = [opts.address]
   if (opts.network) {
-    const n = getNetworkFromCtxOrNetworkish(opts.network)
-    sig.push(n.chainId.toString())
+    sig.push(opts.network)
   }
   if (opts.name) {
     sig.push(opts.name)
@@ -33,7 +31,7 @@ export function getOptionsSignature(opts: BindOptions): string {
 
 export class AccountBindOptions {
   address: string
-  network: Network
+  network: EthChainId
   startBlock?: bigint | number
   baseLabels?: { [key: string]: string }
 }

package/src/eth/binds.ts

@@ -1,11 +1,10 @@
 import { BindOptions, getOptionsSignature } from './bind-options.js'
 import { ContractView } from './context.js'
 import { BaseProcessor } from './base-processor.js'
-import { Networkish } from 'ethers/providers'
 
 import { BaseContract } from 'ethers'
 import { MapStateStorage } from '@sentio/runtime'
-import { getNetworkFromCtxOrNetworkish } from './provider.js'
+import { EthChainId } from '../core/chain.js'
 
 export class ProcessorState extends MapStateStorage<BaseProcessor<any, any>> {
   static INSTANCE = new ProcessorState()
@@ -14,9 +13,8 @@ export class ProcessorState extends MapStateStorage<BaseProcessor<any, any>> {
 // from abiName_address_chainId => contract wrapper
 const contracts = new Map<string, ContractView<BaseContract>>()
 
-function getKey(abiName: string, address: string, network: Networkish) {
-  const chainId = getNetworkFromCtxOrNetworkish(network).chainId.toString()
-  return [abiName, address.toLowerCase(), chainId].join('_')
+function getKey(abiName: string, address: string, network: EthChainId) {
+  return [abiName, address.toLowerCase(), network].join('_')
 }
 
 // Dedup processor that bind multiple times
@@ -31,7 +29,7 @@ export function addProcessor(opts: BindOptions, processor: BaseProcessor<any, an
   ProcessorState.INSTANCE.getOrSetValue(sig, processor)
 }
 
-export function getContractByABI(abiName: string, address: string, network: Networkish) {
+export function getContractByABI(abiName: string, address: string, network: EthChainId) {
   const key = getKey(abiName, address, network)
   return contracts.get(key)
 }
@@ -39,7 +37,7 @@ export function getContractByABI(abiName: string, address: string, network: Netw
 export function addContractByABI(
   abiName: string,
   address: string,
-  network: Networkish,
+  network: EthChainId,
   contract: ContractView<BaseContract>
 ) {
   const key = getKey(abiName, address, network)

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

@@ -2,7 +2,6 @@
 /* tslint:disable */
 /* eslint-disable */
 import { BigNumberish, 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 { EACAggregatorProxy, EACAggregatorProxy__factory } from "./index.js";
 import {
@@ -1067,10 +1067,10 @@ export class EACAggregatorProxyProcessorTemplate extends BaseProcessorTemplate<
 }
 
 export function getEACAggregatorProxyContract(
-  contextOrNetwork: BaseContext | Networkish,
+  contextOrNetwork: EthContext | EthChainId,
   address: string
 ): EACAggregatorProxyContractView {
-  const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
+  const network = getEthChainId(contextOrNetwork);
   let contract = getContractByABI(
     "EACAggregatorProxy",
     address,

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

@@ -2,6 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 import { LogParams } from "ethers/providers";
+import { EthChainId } from "@sentio/sdk/eth";
 import {
   AnswerUpdatedEventObject,
   NewRoundEventObject,
@@ -24,7 +25,10 @@ export function mockAnswerUpdatedLog(
   contractAddress: string,
   event: AnswerUpdatedEventObject
 ): LogParams {
-  const contract = getEACAggregatorProxyContract(1, contractAddress);
+  const contract = getEACAggregatorProxyContract(
+    EthChainId.ETHEREUM,
+    contractAddress
+  );
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "AnswerUpdated(int256,uint256,uint256)",
     [event.current, event.roundId, event.updatedAt]
@@ -42,7 +46,10 @@ export function mockNewRoundLog(
   contractAddress: string,
   event: NewRoundEventObject
 ): LogParams {
-  const contract = getEACAggregatorProxyContract(1, contractAddress);
+  const contract = getEACAggregatorProxyContract(
+    EthChainId.ETHEREUM,
+    contractAddress
+  );
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "NewRound(uint256,address,uint256)",
     [event.roundId, event.startedBy, event.startedAt]
@@ -60,7 +67,10 @@ export function mockOwnershipTransferRequestedLog(
   contractAddress: string,
   event: OwnershipTransferRequestedEventObject
 ): LogParams {
-  const contract = getEACAggregatorProxyContract(1, contractAddress);
+  const contract = getEACAggregatorProxyContract(
+    EthChainId.ETHEREUM,
+    contractAddress
+  );
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "OwnershipTransferRequested(address,address)",
     [event.from, event.to]
@@ -78,7 +88,10 @@ export function mockOwnershipTransferredLog(
   contractAddress: string,
   event: OwnershipTransferredEventObject
 ): LogParams {
-  const contract = getEACAggregatorProxyContract(1, contractAddress);
+  const contract = getEACAggregatorProxyContract(
+    EthChainId.ETHEREUM,
+    contractAddress
+  );
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "OwnershipTransferred(address,address)",
     [event.from, event.to]

package/src/eth/builtin/internal/erc1155-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 { ERC1155, ERC1155__factory } from "./index.js";
 import {
@@ -502,10 +502,10 @@ export class ERC1155ProcessorTemplate extends BaseProcessorTemplate<
 }
 
 export function getERC1155Contract(
-  contextOrNetwork: BaseContext | Networkish,
+  contextOrNetwork: EthContext | EthChainId,
   address: string
 ): ERC1155ContractView {
-  const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
+  const network = getEthChainId(contextOrNetwork);
   let contract = getContractByABI(
     "ERC1155",
     address,

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

@@ -2,6 +2,7 @@
 /* tslint:disable */
 /* eslint-disable */
 import { LogParams } from "ethers/providers";
+import { EthChainId } from "@sentio/sdk/eth";
 import {
   ApprovalForAllEventObject,
   TransferBatchEventObject,
@@ -24,7 +25,7 @@ export function mockApprovalForAllLog(
   contractAddress: string,
   event: ApprovalForAllEventObject
 ): LogParams {
-  const contract = getERC1155Contract(1, contractAddress);
+  const contract = getERC1155Contract(EthChainId.ETHEREUM, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "ApprovalForAll(address,address,bool)",
     [event.account, event.operator, event.approved]
@@ -42,7 +43,7 @@ export function mockTransferBatchLog(
   contractAddress: string,
   event: TransferBatchEventObject
 ): LogParams {
-  const contract = getERC1155Contract(1, contractAddress);
+  const contract = getERC1155Contract(EthChainId.ETHEREUM, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "TransferBatch(address,address,address,uint256[],uint256[])",
     [event.operator, event.from, event.to, event.ids, event.values]
@@ -60,7 +61,7 @@ export function mockTransferSingleLog(
   contractAddress: string,
   event: TransferSingleEventObject
 ): LogParams {
-  const contract = getERC1155Contract(1, contractAddress);
+  const contract = getERC1155Contract(EthChainId.ETHEREUM, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "TransferSingle(address,address,address,uint256,uint256)",
     [event.operator, event.from, event.to, event.id, event.value]
@@ -78,7 +79,7 @@ export function mockURILog(
   contractAddress: string,
   event: URIEventObject
 ): LogParams {
-  const contract = getERC1155Contract(1, contractAddress);
+  const contract = getERC1155Contract(EthChainId.ETHEREUM, contractAddress);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "URI(string,uint256)",
     [event.value, event.id]

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(', ')}]