@sentio/sdk 2.7.4-rc.2 → 2.8.0-rc.1

package/lib/utils/token.d.ts

@@ -1,4 +1,6 @@
 import { BigDecimal } from '../core/big-decimal.js';
+import { Networkish } from 'ethers';
+import { BaseContext } from '../core/index.js';
 export interface TokenInfo {
     symbol: string;
     name: string;
@@ -9,5 +11,5 @@ export declare const NATIVE_ETH: {
     decimal: number;
     name: string;
 };
-export declare function getERC20TokenInfo(tokenAddress: string, chainId?: number): Promise<TokenInfo>;
-export declare function getER20NormalizedAmount(tokenAddress: string, amount: bigint, chainId: number): Promise<BigDecimal>;
+export declare function getERC20TokenInfo(tokenAddress: string, contextOrNetworkish: BaseContext | Networkish): Promise<TokenInfo>;
+export declare function getER20NormalizedAmount(tokenAddress: string, amount: bigint, contextOrNetworkish: BaseContext | Networkish): Promise<BigDecimal>;

package/lib/utils/token.js

@@ -2,6 +2,7 @@ import { getERC20Contract } from '../eth/builtin/erc20.js';
 import { getERC20BytesContract } from '../eth/builtin/erc20bytes.js';
 import { scaleDown } from '../core/big-decimal.js';
 import { decodeBytes32String } from 'ethers';
+import { getNetworkFromCtxOrNetworkish } from '../eth/index.js';
 export const NATIVE_ETH = {
     symbol: 'ETH',
     decimal: 18,
@@ -15,7 +16,8 @@ async function getTokenInfoPromise(symbol, name, decimal) {
         decimal: Number(await decimal),
     };
 }
-export async function getERC20TokenInfo(tokenAddress, chainId = 1) {
+export async function getERC20TokenInfo(tokenAddress, contextOrNetworkish) {
+    const chainId = getNetworkFromCtxOrNetworkish(contextOrNetworkish).chainId.toString();
     const key = chainId + tokenAddress;
     const res = TOKEN_INFOS.get(key);
     if (res) {
@@ -42,8 +44,8 @@ export async function getERC20TokenInfo(tokenAddress, chainId = 1) {
     TOKEN_INFOS.set(key, info);
     return info;
 }
-export async function getER20NormalizedAmount(tokenAddress, amount, chainId) {
-    const tokenInfo = await getERC20TokenInfo(tokenAddress, chainId);
+export async function getER20NormalizedAmount(tokenAddress, amount, contextOrNetworkish) {
+    const tokenInfo = await getERC20TokenInfo(tokenAddress, contextOrNetworkish);
     return scaleDown(amount, tokenInfo.decimal);
 }
 //# sourceMappingURL=token.js.map

package/lib/utils/token.js.map

@@ -1 +1 @@
-{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/utils/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAAc,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAE9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAA;AAQ5C,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,MAAM,EAAE,KAAK;IACb,OAAO,EAAE,EAAE;IACX,IAAI,EAAE,YAAY;CACnB,CAAA;AAED,MAAM,WAAW,GAAG,IAAI,GAAG,EAA8B,CAAA;AAEzD,KAAK,UAAU,mBAAmB,CAChC,MAAuC,EACvC,IAAqC,EACrC,OAA+B;IAE/B,OAAO;QACL,MAAM,EAAE,MAAM,MAAM;QACpB,IAAI,EAAE,MAAM,IAAI;QAChB,OAAO,EAAE,MAAM,CAAC,MAAM,OAAO,CAAC;KAC/B,CAAA;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,YAAoB,EAAE,OAAO,GAAG,CAAC;IACvE,MAAM,GAAG,GAAG,OAAO,GAAG,YAAY,CAAA;IAClC,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAChC,IAAI,GAAG,EAAE;QACP,OAAO,GAAG,CAAA;KACX;IACD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IACxD,MAAM,aAAa,GAAG,qBAAqB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IAElE,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,IAAI;QACF,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;KAC7B;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,GAAG,mBAAmB,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC,CAAA;KACvD;IAED,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI;QACF,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAA;KACjC;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,GAAG,mBAAmB,CAAC,MAAM,aAAa,CAAC,MAAM,EAAE,CAAC,CAAA;KAC3D;IAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAA;IACzC,MAAM,IAAI,GAAG,mBAAmB,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAEvD,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAC1B,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,YAAoB,EACpB,MAAc,EACd,OAAe;IAEf,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IAChE,OAAO,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;AAC7C,CAAC","sourcesContent":["import { getERC20Contract } from '../eth/builtin/erc20.js'\nimport { getERC20BytesContract } from '../eth/builtin/erc20bytes.js'\nimport { BigDecimal, scaleDown } from '../core/big-decimal.js'\nimport { PromiseOrValue } from '../eth/builtin/internal/common.js'\nimport { decodeBytes32String } from 'ethers'\n\nexport interface TokenInfo {\n  symbol: string\n  name: string\n  decimal: number\n}\n\nexport const NATIVE_ETH = {\n  symbol: 'ETH',\n  decimal: 18,\n  name: 'Native ETH',\n}\n\nconst TOKEN_INFOS = new Map<string, Promise<TokenInfo>>()\n\nasync function getTokenInfoPromise(\n  symbol: PromiseOrValue<string> | string,\n  name: PromiseOrValue<string> | string,\n  decimal: PromiseOrValue<bigint>\n): Promise<TokenInfo> {\n  return {\n    symbol: await symbol,\n    name: await name,\n    decimal: Number(await decimal),\n  }\n}\n\nexport async function getERC20TokenInfo(tokenAddress: string, chainId = 1): Promise<TokenInfo> {\n  const key = chainId + tokenAddress\n  const res = TOKEN_INFOS.get(key)\n  if (res) {\n    return res\n  }\n  const contract = getERC20Contract(tokenAddress, chainId)\n  const bytesContract = getERC20BytesContract(tokenAddress, chainId)\n\n  let name = ''\n  try {\n    name = await contract.name()\n  } catch (e) {\n    name = decodeBytes32String(await bytesContract.name())\n  }\n\n  let symbol = ''\n  try {\n    symbol = await contract.symbol()\n  } catch (e) {\n    symbol = decodeBytes32String(await bytesContract.symbol())\n  }\n\n  const decimal = await contract.decimals()\n  const info = getTokenInfoPromise(symbol, name, decimal)\n\n  TOKEN_INFOS.set(key, info)\n  return info\n}\n\nexport async function getER20NormalizedAmount(\n  tokenAddress: string,\n  amount: bigint,\n  chainId: number\n): Promise<BigDecimal> {\n  const tokenInfo = await getERC20TokenInfo(tokenAddress, chainId)\n  return scaleDown(amount, tokenInfo.decimal)\n}\n"]}
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/utils/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAAc,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAE9D,OAAO,EAAE,mBAAmB,EAAc,MAAM,QAAQ,CAAA;AAExD,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAA;AAQ/D,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,MAAM,EAAE,KAAK;IACb,OAAO,EAAE,EAAE;IACX,IAAI,EAAE,YAAY;CACnB,CAAA;AAED,MAAM,WAAW,GAAG,IAAI,GAAG,EAA8B,CAAA;AAEzD,KAAK,UAAU,mBAAmB,CAChC,MAAuC,EACvC,IAAqC,EACrC,OAA+B;IAE/B,OAAO;QACL,MAAM,EAAE,MAAM,MAAM;QACpB,IAAI,EAAE,MAAM,IAAI;QAChB,OAAO,EAAE,MAAM,CAAC,MAAM,OAAO,CAAC;KAC/B,CAAA;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,YAAoB,EACpB,mBAA6C;IAE7C,MAAM,OAAO,GAAG,6BAA6B,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAA;IACrF,MAAM,GAAG,GAAG,OAAO,GAAG,YAAY,CAAA;IAClC,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAChC,IAAI,GAAG,EAAE;QACP,OAAO,GAAG,CAAA;KACX;IACD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IACxD,MAAM,aAAa,GAAG,qBAAqB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IAElE,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,IAAI;QACF,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;KAC7B;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,GAAG,mBAAmB,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC,CAAA;KACvD;IAED,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI;QACF,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAA;KACjC;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,GAAG,mBAAmB,CAAC,MAAM,aAAa,CAAC,MAAM,EAAE,CAAC,CAAA;KAC3D;IAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAA;IACzC,MAAM,IAAI,GAAG,mBAAmB,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAEvD,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAC1B,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,YAAoB,EACpB,MAAc,EACd,mBAA6C;IAE7C,MAAM,SAAS,GAAG,MAAM,iBAAiB,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAA;IAC5E,OAAO,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;AAC7C,CAAC","sourcesContent":["import { getERC20Contract } from '../eth/builtin/erc20.js'\nimport { getERC20BytesContract } from '../eth/builtin/erc20bytes.js'\nimport { BigDecimal, scaleDown } from '../core/big-decimal.js'\nimport { PromiseOrValue } from '../eth/builtin/internal/common.js'\nimport { decodeBytes32String, Networkish } from 'ethers'\nimport { BaseContext } from '../core/index.js'\nimport { getNetworkFromCtxOrNetworkish } from '../eth/index.js'\n\nexport interface TokenInfo {\n  symbol: string\n  name: string\n  decimal: number\n}\n\nexport const NATIVE_ETH = {\n  symbol: 'ETH',\n  decimal: 18,\n  name: 'Native ETH',\n}\n\nconst TOKEN_INFOS = new Map<string, Promise<TokenInfo>>()\n\nasync function getTokenInfoPromise(\n  symbol: PromiseOrValue<string> | string,\n  name: PromiseOrValue<string> | string,\n  decimal: PromiseOrValue<bigint>\n): Promise<TokenInfo> {\n  return {\n    symbol: await symbol,\n    name: await name,\n    decimal: Number(await decimal),\n  }\n}\n\nexport async function getERC20TokenInfo(\n  tokenAddress: string,\n  contextOrNetworkish: BaseContext | Networkish\n): Promise<TokenInfo> {\n  const chainId = getNetworkFromCtxOrNetworkish(contextOrNetworkish).chainId.toString()\n  const key = chainId + tokenAddress\n  const res = TOKEN_INFOS.get(key)\n  if (res) {\n    return res\n  }\n  const contract = getERC20Contract(tokenAddress, chainId)\n  const bytesContract = getERC20BytesContract(tokenAddress, chainId)\n\n  let name = ''\n  try {\n    name = await contract.name()\n  } catch (e) {\n    name = decodeBytes32String(await bytesContract.name())\n  }\n\n  let symbol = ''\n  try {\n    symbol = await contract.symbol()\n  } catch (e) {\n    symbol = decodeBytes32String(await bytesContract.symbol())\n  }\n\n  const decimal = await contract.decimals()\n  const info = getTokenInfoPromise(symbol, name, decimal)\n\n  TOKEN_INFOS.set(key, info)\n  return info\n}\n\nexport async function getER20NormalizedAmount(\n  tokenAddress: string,\n  amount: bigint,\n  contextOrNetworkish: BaseContext | Networkish\n): Promise<BigDecimal> {\n  const tokenInfo = await getERC20TokenInfo(tokenAddress, contextOrNetworkish)\n  return scaleDown(amount, tokenInfo.decimal)\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "2.7.4-rc.2",
+  "version": "2.8.0-rc.1",
   "type": "module",
   "scripts": {
     "compile": "tsc && cp src/utils/*.csv lib/utils && cp src/tsup.config.ts lib",
@@ -23,8 +23,8 @@
     "@project-serum/anchor": "^0.26.0",
     "@sentio/bigdecimal": "^9.1.1-patch.3",
     "@sentio/ethers-v6": "^1.0.25",
-    "@sentio/protos": "^2.7.4-rc.2",
-    "@sentio/runtime": "^2.7.4-rc.2",
+    "@sentio/protos": "^2.8.0-rc.1",
+    "@sentio/runtime": "^2.8.0-rc.1",
     "@solana/web3.js": "^1.73.2",
     "@types/prettier": "^2.7.2",
     "aptos-sdk": "npm:aptos@^1.7.1",
@@ -80,5 +80,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "5f121c6585d0175729927c13d1e3aea8fce741ad"
+  "gitHead": "b0afef263d7d67dd47f55feb2a041b768749ff9a"
 }

package/src/aptos/context.ts

@@ -27,6 +27,10 @@ export class AptosContext extends BaseContext {
     }
   }
 
+  getChainId(): string {
+    return getChainId(this.network)
+  }
+
   getMetaData(name: string, labels: Labels): RecordMetaData {
     return {
       address: this.address,
@@ -35,7 +39,7 @@ export class AptosContext extends BaseContext {
       transactionIndex: 0,
       transactionHash: this.transaction?.hash || '', // TODO
       logIndex: 0,
-      chainId: getChainId(this.network),
+      chainId: this.getChainId(),
       name: name,
       labels: normalizeLabels(labels),
     }
@@ -56,6 +60,10 @@ export class AptosResourceContext extends BaseContext {
     this.timestampInMicros = timestampInMicros
   }
 
+  getChainId(): string {
+    return getChainId(this.network)
+  }
+
   getMetaData(name: string, labels: Labels): RecordMetaData {
     return {
       address: this.address,
@@ -64,7 +72,7 @@ export class AptosResourceContext extends BaseContext {
       transactionIndex: 0,
       transactionHash: '',
       logIndex: 0,
-      chainId: getChainId(this.network),
+      chainId: this.getChainId(),
       name: name,
       labels: normalizeLabels(labels),
     }

package/src/core/base-context.ts

@@ -23,4 +23,6 @@ export abstract class BaseContext {
   }
 
   abstract getMetaData(name: string, labels: Labels): RecordMetaData
+
+  abstract getChainId(): string
 }

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

@@ -19,7 +19,9 @@ import {
   ContractView,
   DummyProvider,
   TypedCallTrace,
+  getNetworkFromCtxOrNetworkish,
 } from "@sentio/sdk/eth";
+import { BaseContext } from "@sentio/sdk";
 import { EthFetchConfig } from "@sentio/protos";
 
 import { EACAggregatorProxy, EACAggregatorProxy__factory } from "./index.js";
@@ -1086,8 +1088,9 @@ export class EACAggregatorProxyProcessorTemplate extends BaseProcessorTemplate<
 
 export function getEACAggregatorProxyContract(
   address: string,
-  network: Networkish = 1
+  contextOrNetwork: BaseContext | Networkish
 ): EACAggregatorProxyContractView {
+  const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
   let contract = getContractByABI(
     "EACAggregatorProxy",
     address,

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

@@ -24,7 +24,7 @@ export function mockAnswerUpdatedLog(
   contractAddress: string,
   event: AnswerUpdatedEventObject
 ): LogParams {
-  const contract = getEACAggregatorProxyContract(contractAddress);
+  const contract = getEACAggregatorProxyContract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "AnswerUpdated(int256,uint256,uint256)",
     [event.current, event.roundId, event.updatedAt]
@@ -42,7 +42,7 @@ export function mockNewRoundLog(
   contractAddress: string,
   event: NewRoundEventObject
 ): LogParams {
-  const contract = getEACAggregatorProxyContract(contractAddress);
+  const contract = getEACAggregatorProxyContract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "NewRound(uint256,address,uint256)",
     [event.roundId, event.startedBy, event.startedAt]
@@ -60,7 +60,7 @@ export function mockOwnershipTransferRequestedLog(
   contractAddress: string,
   event: OwnershipTransferRequestedEventObject
 ): LogParams {
-  const contract = getEACAggregatorProxyContract(contractAddress);
+  const contract = getEACAggregatorProxyContract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "OwnershipTransferRequested(address,address)",
     [event.from, event.to]
@@ -78,7 +78,7 @@ export function mockOwnershipTransferredLog(
   contractAddress: string,
   event: OwnershipTransferredEventObject
 ): LogParams {
-  const contract = getEACAggregatorProxyContract(contractAddress);
+  const contract = getEACAggregatorProxyContract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "OwnershipTransferred(address,address)",
     [event.from, event.to]

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

@@ -19,7 +19,9 @@ import {
   ContractView,
   DummyProvider,
   TypedCallTrace,
+  getNetworkFromCtxOrNetworkish,
 } from "@sentio/sdk/eth";
+import { BaseContext } from "@sentio/sdk";
 import { EthFetchConfig } from "@sentio/protos";
 
 import { ERC1155, ERC1155__factory } from "./index.js";
@@ -509,8 +511,9 @@ export class ERC1155ProcessorTemplate extends BaseProcessorTemplate<
 
 export function getERC1155Contract(
   address: string,
-  network: Networkish = 1
+  contextOrNetwork: BaseContext | Networkish
 ): ERC1155ContractView {
+  const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
   let contract = getContractByABI(
     "ERC1155",
     address,

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

@@ -24,7 +24,7 @@ export function mockApprovalForAllLog(
   contractAddress: string,
   event: ApprovalForAllEventObject
 ): LogParams {
-  const contract = getERC1155Contract(contractAddress);
+  const contract = getERC1155Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "ApprovalForAll(address,address,bool)",
     [event.account, event.operator, event.approved]
@@ -42,7 +42,7 @@ export function mockTransferBatchLog(
   contractAddress: string,
   event: TransferBatchEventObject
 ): LogParams {
-  const contract = getERC1155Contract(contractAddress);
+  const contract = getERC1155Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "TransferBatch(address,address,address,uint256[],uint256[])",
     [event.operator, event.from, event.to, event.ids, event.values]
@@ -60,7 +60,7 @@ export function mockTransferSingleLog(
   contractAddress: string,
   event: TransferSingleEventObject
 ): LogParams {
-  const contract = getERC1155Contract(contractAddress);
+  const contract = getERC1155Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "TransferSingle(address,address,address,uint256,uint256)",
     [event.operator, event.from, event.to, event.id, event.value]
@@ -78,7 +78,7 @@ export function mockURILog(
   contractAddress: string,
   event: URIEventObject
 ): LogParams {
-  const contract = getERC1155Contract(contractAddress);
+  const contract = getERC1155Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "URI(string,uint256)",
     [event.value, event.id]

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

@@ -19,7 +19,9 @@ import {
   ContractView,
   DummyProvider,
   TypedCallTrace,
+  getNetworkFromCtxOrNetworkish,
 } from "@sentio/sdk/eth";
+import { BaseContext } from "@sentio/sdk";
 import { EthFetchConfig } from "@sentio/protos";
 
 import { ERC20, ERC20__factory } from "./index.js";
@@ -622,8 +624,9 @@ export class ERC20ProcessorTemplate extends BaseProcessorTemplate<
 
 export function getERC20Contract(
   address: string,
-  network: Networkish = 1
+  contextOrNetwork: BaseContext | Networkish
 ): ERC20ContractView {
+  const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
   let contract = getContractByABI(
     "ERC20",
     address,

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

@@ -23,7 +23,7 @@ export function mockApprovalLog(
   contractAddress: string,
   event: ApprovalEventObject
 ): LogParams {
-  const contract = getERC20Contract(contractAddress);
+  const contract = getERC20Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Approval(address,address,uint256)",
     [event.owner, event.spender, event.value]
@@ -41,7 +41,7 @@ export function mockOwnershipTransferredLog(
   contractAddress: string,
   event: OwnershipTransferredEventObject
 ): LogParams {
-  const contract = getERC20Contract(contractAddress);
+  const contract = getERC20Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "OwnershipTransferred(address,address)",
     [event.previousOwner, event.newOwner]
@@ -59,7 +59,7 @@ export function mockTransferLog(
   contractAddress: string,
   event: TransferEventObject
 ): LogParams {
-  const contract = getERC20Contract(contractAddress);
+  const contract = getERC20Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Transfer(address,address,uint256)",
     [event.from, event.to, event.value]

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

@@ -19,7 +19,9 @@ import {
   ContractView,
   DummyProvider,
   TypedCallTrace,
+  getNetworkFromCtxOrNetworkish,
 } from "@sentio/sdk/eth";
+import { BaseContext } from "@sentio/sdk";
 import { EthFetchConfig } from "@sentio/protos";
 
 import { ERC20Bytes, ERC20Bytes__factory } from "./index.js";
@@ -418,8 +420,9 @@ export class ERC20BytesProcessorTemplate extends BaseProcessorTemplate<
 
 export function getERC20BytesContract(
   address: string,
-  network: Networkish = 1
+  contextOrNetwork: BaseContext | Networkish
 ): ERC20BytesContractView {
+  const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
   let contract = getContractByABI(
     "ERC20Bytes",
     address,

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

@@ -19,7 +19,7 @@ export function mockApprovalLog(
   contractAddress: string,
   event: ApprovalEventObject
 ): LogParams {
-  const contract = getERC20BytesContract(contractAddress);
+  const contract = getERC20BytesContract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Approval(address,address,uint256)",
     [event.owner, event.spender, event.value]
@@ -37,7 +37,7 @@ export function mockTransferLog(
   contractAddress: string,
   event: TransferEventObject
 ): LogParams {
-  const contract = getERC20BytesContract(contractAddress);
+  const contract = getERC20BytesContract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Transfer(address,address,uint256)",
     [event.from, event.to, event.value]

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

@@ -19,7 +19,9 @@ import {
   ContractView,
   DummyProvider,
   TypedCallTrace,
+  getNetworkFromCtxOrNetworkish,
 } from "@sentio/sdk/eth";
+import { BaseContext } from "@sentio/sdk";
 import { EthFetchConfig } from "@sentio/protos";
 
 import { ERC721, ERC721__factory } from "./index.js";
@@ -639,8 +641,9 @@ export class ERC721ProcessorTemplate extends BaseProcessorTemplate<
 
 export function getERC721Contract(
   address: string,
-  network: Networkish = 1
+  contextOrNetwork: BaseContext | Networkish
 ): ERC721ContractView {
+  const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
   let contract = getContractByABI(
     "ERC721",
     address,

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

@@ -23,7 +23,7 @@ export function mockApprovalLog(
   contractAddress: string,
   event: ApprovalEventObject
 ): LogParams {
-  const contract = getERC721Contract(contractAddress);
+  const contract = getERC721Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Approval(address,address,uint256)",
     [event.owner, event.approved, event.tokenId]
@@ -41,7 +41,7 @@ export function mockApprovalForAllLog(
   contractAddress: string,
   event: ApprovalForAllEventObject
 ): LogParams {
-  const contract = getERC721Contract(contractAddress);
+  const contract = getERC721Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "ApprovalForAll(address,address,bool)",
     [event.owner, event.operator, event.approved]
@@ -59,7 +59,7 @@ export function mockTransferLog(
   contractAddress: string,
   event: TransferEventObject
 ): LogParams {
-  const contract = getERC721Contract(contractAddress);
+  const contract = getERC721Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Transfer(address,address,uint256)",
     [event.from, event.to, event.tokenId]

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

@@ -19,7 +19,9 @@ import {
   ContractView,
   DummyProvider,
   TypedCallTrace,
+  getNetworkFromCtxOrNetworkish,
 } from "@sentio/sdk/eth";
+import { BaseContext } from "@sentio/sdk";
 import { EthFetchConfig } from "@sentio/protos";
 
 import { WETH9, WETH9__factory } from "./index.js";
@@ -492,8 +494,9 @@ export class WETH9ProcessorTemplate extends BaseProcessorTemplate<
 
 export function getWETH9Contract(
   address: string,
-  network: Networkish = 1
+  contextOrNetwork: BaseContext | Networkish
 ): WETH9ContractView {
+  const network = getNetworkFromCtxOrNetworkish(contextOrNetwork);
   let contract = getContractByABI(
     "WETH9",
     address,

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

@@ -24,7 +24,7 @@ export function mockApprovalLog(
   contractAddress: string,
   event: ApprovalEventObject
 ): LogParams {
-  const contract = getWETH9Contract(contractAddress);
+  const contract = getWETH9Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Approval(address,address,uint256)",
     [event.src, event.guy, event.wad]
@@ -42,7 +42,7 @@ export function mockTransferLog(
   contractAddress: string,
   event: TransferEventObject
 ): LogParams {
-  const contract = getWETH9Contract(contractAddress);
+  const contract = getWETH9Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Transfer(address,address,uint256)",
     [event.src, event.dst, event.wad]
@@ -60,7 +60,7 @@ export function mockDepositLog(
   contractAddress: string,
   event: DepositEventObject
 ): LogParams {
-  const contract = getWETH9Contract(contractAddress);
+  const contract = getWETH9Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Deposit(address,uint256)",
     [event.dst, event.wad]
@@ -78,7 +78,7 @@ export function mockWithdrawalLog(
   contractAddress: string,
   event: WithdrawalEventObject
 ): LogParams {
-  const contract = getWETH9Contract(contractAddress);
+  const contract = getWETH9Contract(contractAddress, 1);
   const encodedLog = contract.rawContract.interface.encodeEventLog(
     "Withdrawal(address,uint256)",
     [event.src, event.wad]

package/src/eth/codegen/file.ts

@@ -105,8 +105,10 @@ export class ${contract.name}ProcessorTemplate extends BaseProcessorTemplate<${c
     .join('\n')}
   }
 
-
-  export function get${contract.name}Contract(address: string, network: Networkish = 1): ${contract.name}ContractView {
+  export function get${contract.name}Contract(address: string, contextOrNetwork: BaseContext | Networkish): ${
+    contract.name
+  }ContractView {
+    const network = getNetworkFromCtxOrNetworkish(contextOrNetwork) 
     let contract = getContractByABI("${contract.name}", address, network) as ${contract.name}ContractView
     if (!contract) {
       const rawContract = ${contract.name}__factory.connect(address, getProvider(network))
@@ -162,8 +164,10 @@ export class ${contract.name}ProcessorTemplate extends BaseProcessorTemplate<${c
         'ContractView',
         'DummyProvider',
         'TypedCallTrace',
+        'getNetworkFromCtxOrNetworkish',
         // 'toBlockTag',
       ],
+      '@sentio/sdk': ['BaseContext'],
       '@sentio/protos': ['EthFetchConfig'],
       './common.js': ['PromiseOrValue'],
       './index.js': [`${contract.name}`, `${contract.name}__factory`],
@@ -226,7 +230,7 @@ function generateMockEventLogFunction(event: EventDeclaration, contractName: str
 
   return `
     export function mock${eventName}Log(contractAddress: string, event: ${eventName}EventObject): LogParams {
-      const contract = get${contractName}Contract(contractAddress)
+      const contract = get${contractName}Contract(contractAddress, 1)
       const encodedLog = contract.rawContract.interface.encodeEventLog(
         '${getFullSignatureForEvent(event)}',
         [${eventArgs.join(', ')}]

package/src/eth/context.ts

@@ -50,6 +50,10 @@ export abstract class EthContext extends BaseContext {
 
   protected abstract getContractName(): string
 
+  getChainId(): string {
+    return this.chainId.toString()
+  }
+
   getMetaData(name: string, labels: Labels): RecordMetaData {
     if (this.log) {
       return {

package/src/eth/index.ts

@@ -1,7 +1,7 @@
 export { BaseProcessor } from './base-processor.js'
 export { GenericProcessor } from './generic-processor.js'
 export { BaseProcessorTemplate } from './base-processor-template.js'
-export { getProvider, DummyProvider } from './provider.js'
+export { getProvider, DummyProvider, getNetworkFromCtxOrNetworkish } from './provider.js'
 export type { TypedCallTrace, Trace } from './trace.js'
 export * from './eth.js'
 export { BindOptions, AccountBindOptions } from './bind-options.js'

package/src/eth/provider.ts

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

package/src/solana/solana-context.ts

@@ -14,6 +14,10 @@ export class SolanaContext extends BaseContext {
     this.blockNumber = slot
   }
 
+  getChainId(): string {
+    return this.network
+  }
+
   getMetaData(name: string, labels: Labels): RecordMetaData {
     return {
       address: this.address,
@@ -22,7 +26,7 @@ export class SolanaContext extends BaseContext {
       transactionIndex: 0,
       transactionHash: '', // TODO add
       logIndex: 0,
-      chainId: this.network,
+      chainId: this.getChainId(),
       name: name,
       labels: normalizeLabels(labels),
     }

package/src/sui/context.ts

@@ -30,6 +30,10 @@ export class SuiContext extends BaseContext {
     }
   }
 
+  getChainId(): string {
+    return getChainId(this.network)
+  }
+
   getMetaData(name: string, labels: Labels): RecordMetaData {
     return {
       address: this.address,
@@ -38,7 +42,7 @@ export class SuiContext extends BaseContext {
       transactionIndex: 0,
       transactionHash: this.transaction?.certificate.transactionDigest || '', // TODO
       logIndex: 0,
-      chainId: getChainId(this.network),
+      chainId: this.getChainId(),
       name: name,
       labels: normalizeLabels(labels),
     }

package/src/utils/token.ts

@@ -2,7 +2,9 @@ import { getERC20Contract } from '../eth/builtin/erc20.js'
 import { getERC20BytesContract } from '../eth/builtin/erc20bytes.js'
 import { BigDecimal, scaleDown } from '../core/big-decimal.js'
 import { PromiseOrValue } from '../eth/builtin/internal/common.js'
-import { decodeBytes32String } from 'ethers'
+import { decodeBytes32String, Networkish } from 'ethers'
+import { BaseContext } from '../core/index.js'
+import { getNetworkFromCtxOrNetworkish } from '../eth/index.js'
 
 export interface TokenInfo {
   symbol: string
@@ -30,7 +32,11 @@ async function getTokenInfoPromise(
   }
 }
 
-export async function getERC20TokenInfo(tokenAddress: string, chainId = 1): Promise<TokenInfo> {
+export async function getERC20TokenInfo(
+  tokenAddress: string,
+  contextOrNetworkish: BaseContext | Networkish
+): Promise<TokenInfo> {
+  const chainId = getNetworkFromCtxOrNetworkish(contextOrNetworkish).chainId.toString()
   const key = chainId + tokenAddress
   const res = TOKEN_INFOS.get(key)
   if (res) {
@@ -63,8 +69,8 @@ export async function getERC20TokenInfo(tokenAddress: string, chainId = 1): Prom
 export async function getER20NormalizedAmount(
   tokenAddress: string,
   amount: bigint,
-  chainId: number
+  contextOrNetworkish: BaseContext | Networkish
 ): Promise<BigDecimal> {
-  const tokenInfo = await getERC20TokenInfo(tokenAddress, chainId)
+  const tokenInfo = await getERC20TokenInfo(tokenAddress, contextOrNetworkish)
   return scaleDown(amount, tokenInfo.decimal)
 }