@sentio/sdk 2.15.5 → 2.15.6-rc.2

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

@@ -18,7 +18,6 @@ import {
   DummyProvider,
   EthChainId,
   TypedCallTrace,
-  getEthChainId,
   EthContext,
   EthFetchConfig,
 } from "@sentio/sdk/eth";
@@ -421,51 +420,41 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
   EACAggregatorProxyContractView
 > {
   async accessController(overrides?: Overrides): Promise<string> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.accessController(overrides || {});
+    return await this.view.accessController({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async aggregator(overrides?: Overrides): Promise<string> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.aggregator(overrides || {});
+    return await this.view.aggregator({
+      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 description(overrides?: Overrides): Promise<string> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.description(overrides || {});
+    return await this.view.description({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async getAnswer(
     _roundId: BigNumberish,
     overrides?: Overrides
   ): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.getAnswer(_roundId, overrides || {});
+    return await this.view.getAnswer(_roundId, {
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async getRoundData(
@@ -480,42 +469,34 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
       answeredInRound: bigint;
     }
   > {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.getRoundData(_roundId, overrides || {});
+    return await this.view.getRoundData(_roundId, {
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async getTimestamp(
     _roundId: BigNumberish,
     overrides?: Overrides
   ): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.getTimestamp(_roundId, overrides || {});
+    return await this.view.getTimestamp(_roundId, {
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async latestAnswer(overrides?: Overrides): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.latestAnswer(overrides || {});
+    return await this.view.latestAnswer({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async latestRound(overrides?: Overrides): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.latestRound(overrides || {});
+    return await this.view.latestRound({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async latestRoundData(
@@ -529,60 +510,48 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
       answeredInRound: bigint;
     }
   > {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.latestRoundData(overrides || {});
+    return await this.view.latestRoundData({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async latestTimestamp(overrides?: Overrides): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.latestTimestamp(overrides || {});
+    return await this.view.latestTimestamp({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async owner(overrides?: Overrides): Promise<string> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.owner(overrides || {});
+    return await this.view.owner({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async phaseAggregators(
     arg0: BigNumberish,
     overrides?: Overrides
   ): Promise<string> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.phaseAggregators(arg0, overrides || {});
+    return await this.view.phaseAggregators(arg0, {
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async phaseId(overrides?: Overrides): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.phaseId(overrides || {});
+    return await this.view.phaseId({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async proposedAggregator(overrides?: Overrides): Promise<string> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.proposedAggregator(overrides || {});
+    return await this.view.proposedAggregator({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async proposedGetRoundData(
@@ -597,12 +566,10 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
       answeredInRound: bigint;
     }
   > {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.proposedGetRoundData(_roundId, overrides || {});
+    return await this.view.proposedGetRoundData(_roundId, {
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async proposedLatestRoundData(
@@ -616,21 +583,17 @@ export class EACAggregatorProxyBoundContractView extends BoundContractView<
       answeredInRound: bigint;
     }
   > {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.proposedLatestRoundData(overrides || {});
+    return await this.view.proposedLatestRoundData({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async version(overrides?: Overrides): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.version(overrides || {});
+    return await this.view.version({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 }
 
@@ -1067,22 +1030,29 @@ export class EACAggregatorProxyProcessorTemplate extends BaseProcessorTemplate<
 }
 
 export function getEACAggregatorProxyContract(
-  contextOrNetwork: EthContext | EthChainId,
+  chainId: EthChainId,
   address: string
 ): EACAggregatorProxyContractView {
-  const network = getEthChainId(contextOrNetwork);
   let contract = getContractByABI(
     "EACAggregatorProxy",
     address,
-    network
+    chainId
   ) as EACAggregatorProxyContractView;
   if (!contract) {
     const rawContract = EACAggregatorProxy__factory.connect(
       address,
-      getProvider(network)
+      getProvider(chainId)
     );
     contract = new EACAggregatorProxyContractView(rawContract);
-    addContractByABI("EACAggregatorProxy", address, network, contract);
+    addContractByABI("EACAggregatorProxy", address, chainId, contract);
   }
   return contract;
 }
+
+export function getEACAggregatorProxyContractOnContext(
+  context: EthContext,
+  address: string
+): EACAggregatorProxyBoundContractView {
+  const view = getEACAggregatorProxyContract(context.getChainId(), address);
+  return new EACAggregatorProxyBoundContractView(address, view);
+}

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

@@ -18,7 +18,6 @@ import {
   DummyProvider,
   EthChainId,
   TypedCallTrace,
-  getEthChainId,
   EthContext,
   EthFetchConfig,
 } from "@sentio/sdk/eth";
@@ -202,12 +201,10 @@ export class ERC1155BoundContractView extends BoundContractView<
     id: BigNumberish,
     overrides?: Overrides
   ): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.balanceOf(account, id, overrides || {});
+    return await this.view.balanceOf(account, id, {
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async balanceOfBatch(
@@ -215,12 +212,10 @@ export class ERC1155BoundContractView extends BoundContractView<
     ids: BigNumberish[],
     overrides?: Overrides
   ): Promise<bigint[]> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.balanceOfBatch(accounts, ids, overrides || {});
+    return await this.view.balanceOfBatch(accounts, ids, {
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async isApprovedForAll(
@@ -228,33 +223,27 @@ export class ERC1155BoundContractView extends BoundContractView<
     operator: string,
     overrides?: Overrides
   ): Promise<boolean> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.isApprovedForAll(account, operator, overrides || {});
+    return await this.view.isApprovedForAll(account, operator, {
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async supportsInterface(
     interfaceId: BytesLike,
     overrides?: Overrides
   ): Promise<boolean> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.supportsInterface(interfaceId, overrides || {});
+    return await this.view.supportsInterface(interfaceId, {
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async uri(id: BigNumberish, overrides?: Overrides): Promise<string> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.uri(id, overrides || {});
+    return await this.view.uri(id, {
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 }
 
@@ -502,19 +491,26 @@ export class ERC1155ProcessorTemplate extends BaseProcessorTemplate<
 }
 
 export function getERC1155Contract(
-  contextOrNetwork: EthContext | EthChainId,
+  chainId: EthChainId,
   address: string
 ): ERC1155ContractView {
-  const network = getEthChainId(contextOrNetwork);
   let contract = getContractByABI(
     "ERC1155",
     address,
-    network
+    chainId
   ) as ERC1155ContractView;
   if (!contract) {
-    const rawContract = ERC1155__factory.connect(address, getProvider(network));
+    const rawContract = ERC1155__factory.connect(address, getProvider(chainId));
     contract = new ERC1155ContractView(rawContract);
-    addContractByABI("ERC1155", address, network, contract);
+    addContractByABI("ERC1155", address, chainId, contract);
   }
   return contract;
 }
+
+export function getERC1155ContractOnContext(
+  context: EthContext,
+  address: string
+): ERC1155BoundContractView {
+  const view = getERC1155Contract(context.getChainId(), address);
+  return new ERC1155BoundContractView(address, view);
+}

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

@@ -18,7 +18,6 @@ import {
   DummyProvider,
   EthChainId,
   TypedCallTrace,
-  getEthChainId,
   EthContext,
   EthFetchConfig,
 } from "@sentio/sdk/eth";
@@ -254,75 +253,59 @@ export class ERC20BoundContractView extends BoundContractView<
     spender: string,
     overrides?: Overrides
   ): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.allowance(owner, spender, overrides || {});
+    return await this.view.allowance(owner, spender, {
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   async balanceOf(account: string, overrides?: Overrides): Promise<bigint> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.balanceOf(account, overrides || {});
+    return await this.view.balanceOf(account, {
+      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 locker(overrides?: Overrides): Promise<string> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.locker(overrides || {});
+    return await this.view.locker({
+      blockTag: this.context.blockNumber,
+      ...overrides,
+    });
   }
 
   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 owner(overrides?: Overrides): Promise<string> {
-    if (!overrides && this.context) {
-      overrides = {
-        blockTag: this.context.blockNumber,
-      };
-    }
-    return await this.view.owner(overrides || {});
+    return await this.view.owner({
+      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 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,
+    });
   }
 }
 
@@ -610,19 +593,26 @@ export class ERC20ProcessorTemplate extends BaseProcessorTemplate<
 }
 
 export function getERC20Contract(
-  contextOrNetwork: EthContext | EthChainId,
+  chainId: EthChainId,
   address: string
 ): ERC20ContractView {
-  const network = getEthChainId(contextOrNetwork);
   let contract = getContractByABI(
     "ERC20",
     address,
-    network
+    chainId
   ) as ERC20ContractView;
   if (!contract) {
-    const rawContract = ERC20__factory.connect(address, getProvider(network));
+    const rawContract = ERC20__factory.connect(address, getProvider(chainId));
     contract = new ERC20ContractView(rawContract);
-    addContractByABI("ERC20", address, network, contract);
+    addContractByABI("ERC20", address, chainId, contract);
   }
   return contract;
 }
+
+export function getERC20ContractOnContext(
+  context: EthContext,
+  address: string
+): ERC20BoundContractView {
+  const view = getERC20Contract(context.getChainId(), address);
+  return new ERC20BoundContractView(address, view);
+}