@sentio/sdk 2.40.0-rc.12 → 2.40.0-rc.14

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

@@ -127,8 +127,10 @@ export class WETH9ContractView extends ContractView<WETH9> {
           context: ethCallContext,
           calldata,
         });
+        console.debug("looking up eth call key:", key);
         const ret = preparedData.ethCallResults[key];
         if (ret) {
+          console.debug("prepared eth call found:", key);
           const result = iface.decodeFunctionResult("name", ret).toArray();
           return result.length == 1 ? result[0] : result;
         }
@@ -155,8 +157,10 @@ export class WETH9ContractView extends ContractView<WETH9> {
           context: ethCallContext,
           calldata,
         });
+        console.debug("looking up eth call key:", key);
         const ret = preparedData.ethCallResults[key];
         if (ret) {
+          console.debug("prepared eth call found:", key);
           const result = iface
             .decodeFunctionResult("totalSupply", ret)
             .toArray();
@@ -185,8 +189,10 @@ export class WETH9ContractView extends ContractView<WETH9> {
           context: ethCallContext,
           calldata,
         });
+        console.debug("looking up eth call key:", key);
         const ret = preparedData.ethCallResults[key];
         if (ret) {
+          console.debug("prepared eth call found:", key);
           const result = iface.decodeFunctionResult("decimals", ret).toArray();
           return result.length == 1 ? result[0] : result;
         }
@@ -214,8 +220,10 @@ export class WETH9ContractView extends ContractView<WETH9> {
           context: ethCallContext,
           calldata,
         });
+        console.debug("looking up eth call key:", key);
         const ret = preparedData.ethCallResults[key];
         if (ret) {
+          console.debug("prepared eth call found:", key);
           const result = iface.decodeFunctionResult("balanceOf", ret).toArray();
           return result.length == 1 ? result[0] : result;
         }
@@ -245,8 +253,10 @@ export class WETH9ContractView extends ContractView<WETH9> {
           context: ethCallContext,
           calldata,
         });
+        console.debug("looking up eth call key:", key);
         const ret = preparedData.ethCallResults[key];
         if (ret) {
+          console.debug("prepared eth call found:", key);
           const result = iface.decodeFunctionResult("symbol", ret).toArray();
           return result.length == 1 ? result[0] : result;
         }
@@ -275,8 +285,10 @@ export class WETH9ContractView extends ContractView<WETH9> {
           context: ethCallContext,
           calldata,
         });
+        console.debug("looking up eth call key:", key);
         const ret = preparedData.ethCallResults[key];
         if (ret) {
+          console.debug("prepared eth call found:", key);
           const result = iface.decodeFunctionResult("allowance", ret).toArray();
           return result.length == 1 ? result[0] : result;
         }
@@ -312,8 +324,10 @@ export class WETH9ContractView extends ContractView<WETH9> {
             context: ethCallContext,
             calldata,
           });
+          console.debug("looking up eth call key:", key);
           const ret = preparedData.ethCallResults[key];
           if (ret) {
+            console.debug("prepared eth call found:", key);
             const result = iface.decodeFunctionResult("approve", ret).toArray();
             return result.length == 1 ? result[0] : result;
           }
@@ -348,8 +362,10 @@ export class WETH9ContractView extends ContractView<WETH9> {
             context: ethCallContext,
             calldata,
           });
+          console.debug("looking up eth call key:", key);
           const ret = preparedData.ethCallResults[key];
           if (ret) {
+            console.debug("prepared eth call found:", key);
             const result = iface
               .decodeFunctionResult("transferFrom", ret)
               .toArray();
@@ -380,8 +396,10 @@ export class WETH9ContractView extends ContractView<WETH9> {
             context: ethCallContext,
             calldata,
           });
+          console.debug("looking up eth call key:", key);
           const ret = preparedData.ethCallResults[key];
           if (ret) {
+            console.debug("prepared eth call found:", key);
             const result = iface
               .decodeFunctionResult("withdraw", ret)
               .toArray();
@@ -413,8 +431,10 @@ export class WETH9ContractView extends ContractView<WETH9> {
             context: ethCallContext,
             calldata,
           });
+          console.debug("looking up eth call key:", key);
           const ret = preparedData.ethCallResults[key];
           if (ret) {
+            console.debug("prepared eth call found:", key);
             const result = iface
               .decodeFunctionResult("transfer", ret)
               .toArray();
@@ -444,8 +464,10 @@ export class WETH9ContractView extends ContractView<WETH9> {
             context: ethCallContext,
             calldata,
           });
+          console.debug("looking up eth call key:", key);
           const ret = preparedData.ethCallResults[key];
           if (ret) {
+            console.debug("prepared eth call found:", key);
             const result = iface.decodeFunctionResult("deposit", ret).toArray();
             return result.length == 1 ? result[0] : result;
           }
@@ -637,7 +659,7 @@ export class WETH9BoundContractView extends BoundContractView<
   async name(overrides?: Overrides): Promise<string> {
     const ethCallContext = {
       chainId: this.context.chainId,
-      blockTag: this.context.blockNumber.toString(16),
+      blockTag: "0x" + this.context.blockNumber.toString(16),
       address: this.context.address,
     };
     return await this.view.name(
@@ -653,7 +675,7 @@ export class WETH9BoundContractView extends BoundContractView<
   async totalSupply(overrides?: Overrides): Promise<bigint> {
     const ethCallContext = {
       chainId: this.context.chainId,
-      blockTag: this.context.blockNumber.toString(16),
+      blockTag: "0x" + this.context.blockNumber.toString(16),
       address: this.context.address,
     };
     return await this.view.totalSupply(
@@ -669,7 +691,7 @@ export class WETH9BoundContractView extends BoundContractView<
   async decimals(overrides?: Overrides): Promise<bigint> {
     const ethCallContext = {
       chainId: this.context.chainId,
-      blockTag: this.context.blockNumber.toString(16),
+      blockTag: "0x" + this.context.blockNumber.toString(16),
       address: this.context.address,
     };
     return await this.view.decimals(
@@ -685,7 +707,7 @@ export class WETH9BoundContractView extends BoundContractView<
   async balanceOf(arg0: string, overrides?: Overrides): Promise<bigint> {
     const ethCallContext = {
       chainId: this.context.chainId,
-      blockTag: this.context.blockNumber.toString(16),
+      blockTag: "0x" + this.context.blockNumber.toString(16),
       address: this.context.address,
     };
     return await this.view.balanceOf(
@@ -702,7 +724,7 @@ export class WETH9BoundContractView extends BoundContractView<
   async symbol(overrides?: Overrides): Promise<string> {
     const ethCallContext = {
       chainId: this.context.chainId,
-      blockTag: this.context.blockNumber.toString(16),
+      blockTag: "0x" + this.context.blockNumber.toString(16),
       address: this.context.address,
     };
     return await this.view.symbol(
@@ -722,7 +744,7 @@ export class WETH9BoundContractView extends BoundContractView<
   ): Promise<bigint> {
     const ethCallContext = {
       chainId: this.context.chainId,
-      blockTag: this.context.blockNumber.toString(16),
+      blockTag: "0x" + this.context.blockNumber.toString(16),
       address: this.context.address,
     };
     return await this.view.allowance(
@@ -748,7 +770,7 @@ export class WETH9BoundContractView extends BoundContractView<
     ): Promise<boolean> {
       const ethCallContext = {
         chainId: this.context.chainId,
-        blockTag: this.context.blockNumber.toString(16),
+        blockTag: "0x" + this.context.blockNumber.toString(16),
         address: this.context.address,
       };
       return await this.view.callStatic.approve(
@@ -770,7 +792,7 @@ export class WETH9BoundContractView extends BoundContractView<
     ): Promise<boolean> {
       const ethCallContext = {
         chainId: this.context.chainId,
-        blockTag: this.context.blockNumber.toString(16),
+        blockTag: "0x" + this.context.blockNumber.toString(16),
         address: this.context.address,
       };
       return await this.view.callStatic.transferFrom(
@@ -788,7 +810,7 @@ export class WETH9BoundContractView extends BoundContractView<
     async withdraw(wad: BigNumberish, overrides?: Overrides): Promise<void> {
       const ethCallContext = {
         chainId: this.context.chainId,
-        blockTag: this.context.blockNumber.toString(16),
+        blockTag: "0x" + this.context.blockNumber.toString(16),
         address: this.context.address,
       };
       return await this.view.callStatic.withdraw(
@@ -808,7 +830,7 @@ export class WETH9BoundContractView extends BoundContractView<
     ): Promise<boolean> {
       const ethCallContext = {
         chainId: this.context.chainId,
-        blockTag: this.context.blockNumber.toString(16),
+        blockTag: "0x" + this.context.blockNumber.toString(16),
         address: this.context.address,
       };
       return await this.view.callStatic.transfer(
@@ -825,7 +847,7 @@ export class WETH9BoundContractView extends BoundContractView<
     async deposit(overrides?: Overrides): Promise<void> {
       const ethCallContext = {
         chainId: this.context.chainId,
-        blockTag: this.context.blockNumber.toString(16),
+        blockTag: "0x" + this.context.blockNumber.toString(16),
         address: this.context.address,
       };
       return await this.view.callStatic.deposit(
@@ -846,10 +868,14 @@ export class WETH9BoundContractView extends BoundContractView<
     name(overrides?: Overrides): EthCallParam {
       const chainId =
         overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const blockTag =
-        overrides?.blockTag?.toString() ??
-        this.context.blockNumber.toString(16);
       const address = this.context.address;
+      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      if (overrides?.blockTag) {
+        blockTag =
+          typeof overrides.blockTag == "string"
+            ? overrides.blockTag
+            : "0x" + overrides.blockTag.toString(16);
+      }
 
       return this.view.encodeCall.name({ chainId, address, blockTag });
     },
@@ -860,10 +886,14 @@ export class WETH9BoundContractView extends BoundContractView<
     ): EthCallParam {
       const chainId =
         overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const blockTag =
-        overrides?.blockTag?.toString() ??
-        this.context.blockNumber.toString(16);
       const address = this.context.address;
+      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      if (overrides?.blockTag) {
+        blockTag =
+          typeof overrides.blockTag == "string"
+            ? overrides.blockTag
+            : "0x" + overrides.blockTag.toString(16);
+      }
 
       return this.view.encodeCall.approve(guy, wad, {
         chainId,
@@ -874,10 +904,14 @@ export class WETH9BoundContractView extends BoundContractView<
     totalSupply(overrides?: Overrides): EthCallParam {
       const chainId =
         overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const blockTag =
-        overrides?.blockTag?.toString() ??
-        this.context.blockNumber.toString(16);
       const address = this.context.address;
+      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      if (overrides?.blockTag) {
+        blockTag =
+          typeof overrides.blockTag == "string"
+            ? overrides.blockTag
+            : "0x" + overrides.blockTag.toString(16);
+      }
 
       return this.view.encodeCall.totalSupply({ chainId, address, blockTag });
     },
@@ -889,10 +923,14 @@ export class WETH9BoundContractView extends BoundContractView<
     ): EthCallParam {
       const chainId =
         overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const blockTag =
-        overrides?.blockTag?.toString() ??
-        this.context.blockNumber.toString(16);
       const address = this.context.address;
+      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      if (overrides?.blockTag) {
+        blockTag =
+          typeof overrides.blockTag == "string"
+            ? overrides.blockTag
+            : "0x" + overrides.blockTag.toString(16);
+      }
 
       return this.view.encodeCall.transferFrom(src, dst, wad, {
         chainId,
@@ -903,30 +941,42 @@ export class WETH9BoundContractView extends BoundContractView<
     withdraw(wad: BigNumberish, overrides?: Overrides): EthCallParam {
       const chainId =
         overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const blockTag =
-        overrides?.blockTag?.toString() ??
-        this.context.blockNumber.toString(16);
       const address = this.context.address;
+      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      if (overrides?.blockTag) {
+        blockTag =
+          typeof overrides.blockTag == "string"
+            ? overrides.blockTag
+            : "0x" + overrides.blockTag.toString(16);
+      }
 
       return this.view.encodeCall.withdraw(wad, { chainId, address, blockTag });
     },
     decimals(overrides?: Overrides): EthCallParam {
       const chainId =
         overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const blockTag =
-        overrides?.blockTag?.toString() ??
-        this.context.blockNumber.toString(16);
       const address = this.context.address;
+      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      if (overrides?.blockTag) {
+        blockTag =
+          typeof overrides.blockTag == "string"
+            ? overrides.blockTag
+            : "0x" + overrides.blockTag.toString(16);
+      }
 
       return this.view.encodeCall.decimals({ chainId, address, blockTag });
     },
     balanceOf(arg0: string, overrides?: Overrides): EthCallParam {
       const chainId =
         overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const blockTag =
-        overrides?.blockTag?.toString() ??
-        this.context.blockNumber.toString(16);
       const address = this.context.address;
+      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      if (overrides?.blockTag) {
+        blockTag =
+          typeof overrides.blockTag == "string"
+            ? overrides.blockTag
+            : "0x" + overrides.blockTag.toString(16);
+      }
 
       return this.view.encodeCall.balanceOf(arg0, {
         chainId,
@@ -937,10 +987,14 @@ export class WETH9BoundContractView extends BoundContractView<
     symbol(overrides?: Overrides): EthCallParam {
       const chainId =
         overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const blockTag =
-        overrides?.blockTag?.toString() ??
-        this.context.blockNumber.toString(16);
       const address = this.context.address;
+      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      if (overrides?.blockTag) {
+        blockTag =
+          typeof overrides.blockTag == "string"
+            ? overrides.blockTag
+            : "0x" + overrides.blockTag.toString(16);
+      }
 
       return this.view.encodeCall.symbol({ chainId, address, blockTag });
     },
@@ -951,10 +1005,14 @@ export class WETH9BoundContractView extends BoundContractView<
     ): EthCallParam {
       const chainId =
         overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const blockTag =
-        overrides?.blockTag?.toString() ??
-        this.context.blockNumber.toString(16);
       const address = this.context.address;
+      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      if (overrides?.blockTag) {
+        blockTag =
+          typeof overrides.blockTag == "string"
+            ? overrides.blockTag
+            : "0x" + overrides.blockTag.toString(16);
+      }
 
       return this.view.encodeCall.transfer(dst, wad, {
         chainId,
@@ -965,20 +1023,28 @@ export class WETH9BoundContractView extends BoundContractView<
     deposit(overrides?: Overrides): EthCallParam {
       const chainId =
         overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const blockTag =
-        overrides?.blockTag?.toString() ??
-        this.context.blockNumber.toString(16);
       const address = this.context.address;
+      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      if (overrides?.blockTag) {
+        blockTag =
+          typeof overrides.blockTag == "string"
+            ? overrides.blockTag
+            : "0x" + overrides.blockTag.toString(16);
+      }
 
       return this.view.encodeCall.deposit({ chainId, address, blockTag });
     },
     allowance(arg0: string, arg1: string, overrides?: Overrides): EthCallParam {
       const chainId =
         overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const blockTag =
-        overrides?.blockTag?.toString() ??
-        this.context.blockNumber.toString(16);
       const address = this.context.address;
+      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      if (overrides?.blockTag) {
+        blockTag =
+          typeof overrides.blockTag == "string"
+            ? overrides.blockTag
+            : "0x" + overrides.blockTag.toString(16);
+      }
 
       return this.view.encodeCall.allowance(arg0, arg1, {
         chainId,

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

@@ -51,8 +51,10 @@ export function generateViewFunction(view: boolean, fn: FunctionDeclaration, inc
           context: ethCallContext,
           calldata
         })
+        console.debug("looking up eth call key:", key)
         const ret = preparedData.ethCallResults[key]
         if (ret) {
+          console.debug("prepared eth call found:", key)
           const result = iface.decodeFunctionResult("${fn.name}", ret).toArray()
           return result.length == 1? result[0]: result
         }
@@ -90,7 +92,7 @@ export function generateBoundViewFunction(view: boolean, fn: FunctionDeclaration
   })}overrides?: Overrides): ${generateReturnTypes(fn)} {
     const ethCallContext = {
       chainId: this.context.chainId,
-      blockTag: this.context.blockNumber.toString(16),
+      blockTag: "0x" + this.context.blockNumber.toString(16),
       address: this.context.address,
     }
     return await this.${qualifier}.${declName}(${
@@ -152,8 +154,11 @@ export function generateBoundFunctionCallEncoder(fn: FunctionDeclaration, includ
     useStructs: true
   })}overrides?: Overrides): EthCallParam {
     const chainId = overrides?.chainId?.toString() ?? this.context.chainId.toString()
-    const blockTag = overrides?.blockTag?.toString() ?? this.context.blockNumber.toString(16)
     const address = this.context.address
+    let blockTag = "0x" + this.context.blockNumber.toString(16)
+    if (overrides?.blockTag) {
+      blockTag = typeof(overrides.blockTag) == 'string'? overrides.blockTag: "0x" + overrides.blockTag.toString(16)
+    }
     
     return this.view.encodeCall.${declName}(${
       fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''

package/src/eth/context.ts

@@ -188,6 +188,9 @@ export class ContractContext<
     if (view.callStatic) {
       view.callStatic.context = this
     }
+    if (view.encodeCall) {
+      view.encodeCall.context = this
+    }
     this.contractName = contractName
     this.contract = view
   }
@@ -226,6 +229,10 @@ export class BoundContractView<TContract extends BaseContract, TContractView ext
     context: EthContext
     view: TContractView
   }
+  encodeCall: {
+    context: EthContext
+    view: TContractView
+  }
 
   constructor(address: string, view: TContractView) {
     this.address = address