@sentio/sdk 2.15.6-rc.1 → 2.15.6-rc.3

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

@@ -18,13 +18,13 @@ import {
   DummyProvider,
   EthChainId,
   TypedCallTrace,
-  getEthChainId,
   EthContext,
   EthFetchConfig,
 } from "@sentio/sdk/eth";
 
-import { WETH9, WETH9__factory } from "./index.js";
+import { WETH9__factory } from "./index.js";
 import {
+  WETH9,
   ApprovalEvent,
   ApprovalEventFilter,
   TransferEvent,
@@ -175,48 +175,38 @@ export class WETH9BoundContractView extends BoundContractView<
   WETH9ContractView
 > {
   async name(overrides?: Overrides): Promise<string> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.name(overrides || {});
+    return await this.view.name({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async totalSupply(overrides?: Overrides): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.totalSupply(overrides || {});
+    return await this.view.totalSupply({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async decimals(overrides?: Overrides): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.decimals(overrides || {});
+    return await this.view.decimals({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async balanceOf(arg0: string, overrides?: Overrides): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.balanceOf(arg0, overrides || {});
+    return await this.view.balanceOf(arg0, {
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async symbol(overrides?: Overrides): Promise<string> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.symbol(overrides || {});
+    return await this.view.symbol({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async allowance(
@@ -224,12 +214,10 @@ export class WETH9BoundContractView extends BoundContractView<
     arg1: string,
     overrides?: Overrides
   ): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.allowance(arg0, arg1, overrides || {});
+    return await this.view.allowance(arg0, arg1, {
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 }
 
@@ -485,19 +473,26 @@ export class WETH9ProcessorTemplate extends BaseProcessorTemplate<
 }
 
 export function getWETH9Contract(
-  contextOrNetwork: EthContext | EthChainId,
+  chainId: EthChainId,
   address: string
 ): WETH9ContractView {
-  const network = getEthChainId(contextOrNetwork);
   let contract = getContractByABI(
     "WETH9",
     address,
-    network
+    chainId
   ) as WETH9ContractView;
   if (!contract) {
-    const rawContract = WETH9__factory.connect(address, getProvider(network));
+    const rawContract = WETH9__factory.connect(address, getProvider(chainId));
     contract = new WETH9ContractView(rawContract);
-    addContractByABI("WETH9", address, network, contract);
+    addContractByABI("WETH9", address, chainId, contract);
   }
   return contract;
 }
+
+export function getWETH9ContractOnContext(
+  context: EthContext,
+  address: string
+): WETH9BoundContractView {
+  const view = getWETH9Contract(context.getChainId(), address);
+  return new WETH9BoundContractView(address, view);
+}

package/src/eth/codegen/file.ts

@@ -106,18 +106,21 @@ export class ${contract.name}ProcessorTemplate extends BaseProcessorTemplate<${c
     .join('\n')}
   }
 
-  export function get${contract.name}Contract(contextOrNetwork: EthContext | EthChainId, address: string): ${
-    contract.name
-  }ContractView {
-    const network = getEthChainId(contextOrNetwork) 
-    let contract = getContractByABI("${contract.name}", address, network) as ${contract.name}ContractView
+  export function get${contract.name}Contract(chainId: EthChainId, address: string): ${contract.name}ContractView {
+    let contract = getContractByABI("${contract.name}", address, chainId) as ${contract.name}ContractView
     if (!contract) {
-      const rawContract = ${contract.name}__factory.connect(address, getProvider(network))
+      const rawContract = ${contract.name}__factory.connect(address, getProvider(chainId))
       contract = new ${contract.name}ContractView(rawContract)
-      addContractByABI("${contract.name}", address, network, contract)
+      addContractByABI("${contract.name}", address, chainId, contract)
     }
     return contract
   }
+  
+  export function get${contract.name}ContractOnContext(context: EthContext, address: string): 
+    ${contract.name}BoundContractView {
+    const view = get${contract.name}Contract(context.getChainId(), address)
+    return new ${contract.name}BoundContractView(address, view) 
+  }
   `
   const eventsImports = Object.values(contract.events).flatMap((events) => {
     if (events.length === 1) {
@@ -166,16 +169,14 @@ export class ${contract.name}ProcessorTemplate extends BaseProcessorTemplate<${c
         'DummyProvider',
         'EthChainId',
         'TypedCallTrace',
-        'getEthChainId',
-        // 'toBlockTag',
         'EthContext',
         'EthFetchConfig',
       ],
       // '@sentio/sdk/eth': ['BaseContext'],
       // '@sentio/protos': ['EthFetchConfig'],
       './common.js': ['PromiseOrValue'],
-      './index.js': [`${contract.name}`, `${contract.name}__factory`],
-      [`./${contract.name}.js`]: eventsImports.concat(uniqueStructImports),
+      './index.js': [`${contract.name}__factory`],
+      [`./${contract.name}.js`]: [`${contract.name}`, ...eventsImports, ...uniqueStructImports],
     },
     source
   )

package/src/eth/codegen/view-function.ts

@@ -60,14 +60,12 @@ export function generateBoundViewFunction(fn: FunctionDeclaration, includeArgTyp
   async ${declName ?? fn.name}(${generateInputTypes(fn.inputs, {
     useStructs: true,
   })}overrides?: Overrides): ${generateReturnTypes(fn)} {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      }
-    }
     return await this.view.${declName}(${
     fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
-  } overrides || {})
+  } {
+      blockTag: this.context.blockNumber,
+      ...overrides
+    })
   }
   `
 }

package/src/eth/index.ts

@@ -2,7 +2,7 @@ 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, getEthChainId } from './provider.js'
+export { getProvider, DummyProvider } from './provider.js'
 export { EthContext } from './context.js'
 export * from './eth.js'
 export { BindOptions, AccountBindOptions } from './bind-options.js'

package/src/eth/provider.ts

@@ -2,23 +2,21 @@ 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 getEthChainId(networkish?: EthContext | EthChainId): EthChainId {
-  if (!networkish) {
-    networkish = EthChainId.ETHEREUM
-  }
-  if (networkish instanceof BaseContext) {
-    networkish = networkish.getChainId()
-  }
-  return networkish
-}
+// export function getEthChainId(networkish?: EthContext | EthChainId): EthChainId {
+//   if (!networkish) {
+//     networkish = EthChainId.ETHEREUM
+//   }
+//   if (networkish instanceof BaseContext) {
+//     networkish = networkish.getChainId()
+//   }
+//   return networkish
+// }
 
 export function getProvider(chainId?: EthChainId): Provider {
   // const network = getNetworkFromCtxOrNetworkish(networkish)

package/src/utils/token.ts

@@ -3,7 +3,8 @@ 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 { EthChainId, EthContext, getEthChainId } from '../eth/index.js'
+import { EthChainId, EthContext } from '../eth/index.js'
+import { BaseContext } from '../core/index.js'
 
 export interface TokenInfo {
   symbol: string
@@ -35,7 +36,13 @@ export async function getERC20TokenInfo(
   contextOrNetworkish: EthContext | EthChainId,
   tokenAddress: string
 ): Promise<TokenInfo> {
-  const chainId = getEthChainId(contextOrNetworkish)
+  let chainId: EthChainId
+  if (contextOrNetworkish instanceof BaseContext) {
+    chainId = contextOrNetworkish.getChainId()
+  } else {
+    chainId = contextOrNetworkish || EthChainId.ETHEREUM
+  }
+
   const key = chainId + tokenAddress
   const res = TOKEN_INFOS.get(key)
   if (res) {