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

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)
 }