@sentio/sdk 2.43.1 → 2.43.2-rc.2

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

@@ -21,7 +21,6 @@ import {
   EthContext,
   EthFetchConfig,
   PreprocessResult,
-  makeEthCallKey,
 } from "@sentio/sdk/eth";
 import { EthCallParam, EthCallContext, PreparedData } from "@sentio/protos";
 
@@ -180,20 +179,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ethCallContext?: EthCallContext
   ): Promise<bigint> {
     try {
-      if (preparedData?.ethCallResults && ethCallContext) {
-        const calldata = iface.encodeFunctionData("totalSupply", []);
-        const ethCallKey = makeEthCallKey({
-          context: ethCallContext,
-          calldata,
-        });
-        const ret = preparedData.ethCallResults[ethCallKey];
-        if (ret) {
-          const result = iface
-            .decodeFunctionResult("totalSupply", ret)
-            .toArray();
-          return result.length == 1 ? result[0] : result;
-        }
-      }
       return await this.contract.getFunction("totalSupply()")(overrides || {});
     } catch (e) {
       const stack = new Error().stack;
@@ -208,18 +193,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ethCallContext?: EthCallContext
   ): Promise<bigint> {
     try {
-      if (preparedData?.ethCallResults && ethCallContext) {
-        const calldata = iface.encodeFunctionData("balanceOf", [owner]);
-        const ethCallKey = makeEthCallKey({
-          context: ethCallContext,
-          calldata,
-        });
-        const ret = preparedData.ethCallResults[ethCallKey];
-        if (ret) {
-          const result = iface.decodeFunctionResult("balanceOf", ret).toArray();
-          return result.length == 1 ? result[0] : result;
-        }
-      }
       return await this.contract.getFunction("balanceOf(address)")(
         owner,
         overrides || {}
@@ -237,20 +210,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ethCallContext?: EthCallContext
   ): Promise<string> {
     try {
-      if (preparedData?.ethCallResults && ethCallContext) {
-        const calldata = iface.encodeFunctionData("getApproved", [tokenId]);
-        const ethCallKey = makeEthCallKey({
-          context: ethCallContext,
-          calldata,
-        });
-        const ret = preparedData.ethCallResults[ethCallKey];
-        if (ret) {
-          const result = iface
-            .decodeFunctionResult("getApproved", ret)
-            .toArray();
-          return result.length == 1 ? result[0] : result;
-        }
-      }
       return await this.contract.getFunction("getApproved(uint256)")(
         tokenId,
         overrides || {}
@@ -269,23 +228,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ethCallContext?: EthCallContext
   ): Promise<boolean> {
     try {
-      if (preparedData?.ethCallResults && ethCallContext) {
-        const calldata = iface.encodeFunctionData("isApprovedForAll", [
-          owner,
-          operator,
-        ]);
-        const ethCallKey = makeEthCallKey({
-          context: ethCallContext,
-          calldata,
-        });
-        const ret = preparedData.ethCallResults[ethCallKey];
-        if (ret) {
-          const result = iface
-            .decodeFunctionResult("isApprovedForAll", ret)
-            .toArray();
-          return result.length == 1 ? result[0] : result;
-        }
-      }
       return await this.contract.getFunction(
         "isApprovedForAll(address,address)"
       )(owner, operator, overrides || {});
@@ -301,18 +243,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ethCallContext?: EthCallContext
   ): Promise<string> {
     try {
-      if (preparedData?.ethCallResults && ethCallContext) {
-        const calldata = iface.encodeFunctionData("name", []);
-        const ethCallKey = makeEthCallKey({
-          context: ethCallContext,
-          calldata,
-        });
-        const ret = preparedData.ethCallResults[ethCallKey];
-        if (ret) {
-          const result = iface.decodeFunctionResult("name", ret).toArray();
-          return result.length == 1 ? result[0] : result;
-        }
-      }
       return await this.contract.getFunction("name()")(overrides || {});
     } catch (e) {
       const stack = new Error().stack;
@@ -327,18 +257,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ethCallContext?: EthCallContext
   ): Promise<string> {
     try {
-      if (preparedData?.ethCallResults && ethCallContext) {
-        const calldata = iface.encodeFunctionData("ownerOf", [tokenId]);
-        const ethCallKey = makeEthCallKey({
-          context: ethCallContext,
-          calldata,
-        });
-        const ret = preparedData.ethCallResults[ethCallKey];
-        if (ret) {
-          const result = iface.decodeFunctionResult("ownerOf", ret).toArray();
-          return result.length == 1 ? result[0] : result;
-        }
-      }
       return await this.contract.getFunction("ownerOf(uint256)")(
         tokenId,
         overrides || {}
@@ -356,22 +274,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ethCallContext?: EthCallContext
   ): Promise<boolean> {
     try {
-      if (preparedData?.ethCallResults && ethCallContext) {
-        const calldata = iface.encodeFunctionData("supportsInterface", [
-          interfaceId,
-        ]);
-        const ethCallKey = makeEthCallKey({
-          context: ethCallContext,
-          calldata,
-        });
-        const ret = preparedData.ethCallResults[ethCallKey];
-        if (ret) {
-          const result = iface
-            .decodeFunctionResult("supportsInterface", ret)
-            .toArray();
-          return result.length == 1 ? result[0] : result;
-        }
-      }
       return await this.contract.getFunction("supportsInterface(bytes4)")(
         interfaceId,
         overrides || {}
@@ -388,18 +290,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ethCallContext?: EthCallContext
   ): Promise<string> {
     try {
-      if (preparedData?.ethCallResults && ethCallContext) {
-        const calldata = iface.encodeFunctionData("symbol", []);
-        const ethCallKey = makeEthCallKey({
-          context: ethCallContext,
-          calldata,
-        });
-        const ret = preparedData.ethCallResults[ethCallKey];
-        if (ret) {
-          const result = iface.decodeFunctionResult("symbol", ret).toArray();
-          return result.length == 1 ? result[0] : result;
-        }
-      }
       return await this.contract.getFunction("symbol()")(overrides || {});
     } catch (e) {
       const stack = new Error().stack;
@@ -414,18 +304,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ethCallContext?: EthCallContext
   ): Promise<string> {
     try {
-      if (preparedData?.ethCallResults && ethCallContext) {
-        const calldata = iface.encodeFunctionData("tokenURI", [tokenId]);
-        const ethCallKey = makeEthCallKey({
-          context: ethCallContext,
-          calldata,
-        });
-        const ret = preparedData.ethCallResults[ethCallKey];
-        if (ret) {
-          const result = iface.decodeFunctionResult("tokenURI", ret).toArray();
-          return result.length == 1 ? result[0] : result;
-        }
-      }
       return await this.contract.getFunction("tokenURI(uint256)")(
         tokenId,
         overrides || {}
@@ -447,18 +325,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
       ethCallContext?: EthCallContext
     ): Promise<void> {
       try {
-        if (preparedData?.ethCallResults && ethCallContext) {
-          const calldata = iface.encodeFunctionData("approve", [to, tokenId]);
-          const ethCallKey = makeEthCallKey({
-            context: ethCallContext,
-            calldata,
-          });
-          const ret = preparedData.ethCallResults[ethCallKey];
-          if (ret) {
-            const result = iface.decodeFunctionResult("approve", ret).toArray();
-            return result.length == 1 ? result[0] : result;
-          }
-        }
         return await this.contract
           .getFunction("approve(address,uint256)")
           .staticCall(to, tokenId, overrides || {});
@@ -476,24 +342,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
       ethCallContext?: EthCallContext
     ): Promise<void> {
       try {
-        if (preparedData?.ethCallResults && ethCallContext) {
-          const calldata = iface.encodeFunctionData("safeTransferFrom", [
-            from,
-            to,
-            tokenId,
-          ]);
-          const ethCallKey = makeEthCallKey({
-            context: ethCallContext,
-            calldata,
-          });
-          const ret = preparedData.ethCallResults[ethCallKey];
-          if (ret) {
-            const result = iface
-              .decodeFunctionResult("safeTransferFrom", ret)
-              .toArray();
-            return result.length == 1 ? result[0] : result;
-          }
-        }
         return await this.contract
           .getFunction("safeTransferFrom(address,address,uint256)")
           .staticCall(from, to, tokenId, overrides || {});
@@ -512,25 +360,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
       ethCallContext?: EthCallContext
     ): Promise<void> {
       try {
-        if (preparedData?.ethCallResults && ethCallContext) {
-          const calldata = iface.encodeFunctionData("safeTransferFrom", [
-            from,
-            to,
-            tokenId,
-            data,
-          ]);
-          const ethCallKey = makeEthCallKey({
-            context: ethCallContext,
-            calldata,
-          });
-          const ret = preparedData.ethCallResults[ethCallKey];
-          if (ret) {
-            const result = iface
-              .decodeFunctionResult("safeTransferFrom", ret)
-              .toArray();
-            return result.length == 1 ? result[0] : result;
-          }
-        }
         return await this.contract
           .getFunction("safeTransferFrom(address,address,uint256,bytes)")
           .staticCall(from, to, tokenId, data, overrides || {});
@@ -547,23 +376,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
       ethCallContext?: EthCallContext
     ): Promise<void> {
       try {
-        if (preparedData?.ethCallResults && ethCallContext) {
-          const calldata = iface.encodeFunctionData("setApprovalForAll", [
-            operator,
-            _approved,
-          ]);
-          const ethCallKey = makeEthCallKey({
-            context: ethCallContext,
-            calldata,
-          });
-          const ret = preparedData.ethCallResults[ethCallKey];
-          if (ret) {
-            const result = iface
-              .decodeFunctionResult("setApprovalForAll", ret)
-              .toArray();
-            return result.length == 1 ? result[0] : result;
-          }
-        }
         return await this.contract
           .getFunction("setApprovalForAll(address,bool)")
           .staticCall(operator, _approved, overrides || {});
@@ -581,24 +393,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
       ethCallContext?: EthCallContext
     ): Promise<void> {
       try {
-        if (preparedData?.ethCallResults && ethCallContext) {
-          const calldata = iface.encodeFunctionData("transferFrom", [
-            from,
-            to,
-            tokenId,
-          ]);
-          const ethCallKey = makeEthCallKey({
-            context: ethCallContext,
-            calldata,
-          });
-          const ret = preparedData.ethCallResults[ethCallKey];
-          if (ret) {
-            const result = iface
-              .decodeFunctionResult("transferFrom", ret)
-              .toArray();
-            return result.length == 1 ? result[0] : result;
-          }
-        }
         return await this.contract
           .getFunction("transferFrom(address,address,uint256)")
           .staticCall(from, to, tokenId, overrides || {});

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

@@ -21,7 +21,6 @@ import {
   EthContext,
   EthFetchConfig,
   PreprocessResult,
-  makeEthCallKey,
 } from "@sentio/sdk/eth";
 import { EthCallParam, EthCallContext, PreparedData } from "@sentio/protos";
 
@@ -134,18 +133,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
     ethCallContext?: EthCallContext
   ): Promise<string> {
     try {
-      if (preparedData?.ethCallResults && ethCallContext) {
-        const calldata = iface.encodeFunctionData("name", []);
-        const ethCallKey = makeEthCallKey({
-          context: ethCallContext,
-          calldata,
-        });
-        const ret = preparedData.ethCallResults[ethCallKey];
-        if (ret) {
-          const result = iface.decodeFunctionResult("name", ret).toArray();
-          return result.length == 1 ? result[0] : result;
-        }
-      }
       return await this.contract.getFunction("name()")(overrides || {});
     } catch (e) {
       const stack = new Error().stack;
@@ -159,20 +146,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
     ethCallContext?: EthCallContext
   ): Promise<bigint> {
     try {
-      if (preparedData?.ethCallResults && ethCallContext) {
-        const calldata = iface.encodeFunctionData("totalSupply", []);
-        const ethCallKey = makeEthCallKey({
-          context: ethCallContext,
-          calldata,
-        });
-        const ret = preparedData.ethCallResults[ethCallKey];
-        if (ret) {
-          const result = iface
-            .decodeFunctionResult("totalSupply", ret)
-            .toArray();
-          return result.length == 1 ? result[0] : result;
-        }
-      }
       return await this.contract.getFunction("totalSupply()")(overrides || {});
     } catch (e) {
       const stack = new Error().stack;
@@ -186,18 +159,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
     ethCallContext?: EthCallContext
   ): Promise<bigint> {
     try {
-      if (preparedData?.ethCallResults && ethCallContext) {
-        const calldata = iface.encodeFunctionData("decimals", []);
-        const ethCallKey = makeEthCallKey({
-          context: ethCallContext,
-          calldata,
-        });
-        const ret = preparedData.ethCallResults[ethCallKey];
-        if (ret) {
-          const result = iface.decodeFunctionResult("decimals", ret).toArray();
-          return result.length == 1 ? result[0] : result;
-        }
-      }
       return await this.contract.getFunction("decimals()")(overrides || {});
     } catch (e) {
       const stack = new Error().stack;
@@ -212,18 +173,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
     ethCallContext?: EthCallContext
   ): Promise<bigint> {
     try {
-      if (preparedData?.ethCallResults && ethCallContext) {
-        const calldata = iface.encodeFunctionData("balanceOf", [arg0]);
-        const ethCallKey = makeEthCallKey({
-          context: ethCallContext,
-          calldata,
-        });
-        const ret = preparedData.ethCallResults[ethCallKey];
-        if (ret) {
-          const result = iface.decodeFunctionResult("balanceOf", ret).toArray();
-          return result.length == 1 ? result[0] : result;
-        }
-      }
       return await this.contract.getFunction("balanceOf(address)")(
         arg0,
         overrides || {}
@@ -240,18 +189,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
     ethCallContext?: EthCallContext
   ): Promise<string> {
     try {
-      if (preparedData?.ethCallResults && ethCallContext) {
-        const calldata = iface.encodeFunctionData("symbol", []);
-        const ethCallKey = makeEthCallKey({
-          context: ethCallContext,
-          calldata,
-        });
-        const ret = preparedData.ethCallResults[ethCallKey];
-        if (ret) {
-          const result = iface.decodeFunctionResult("symbol", ret).toArray();
-          return result.length == 1 ? result[0] : result;
-        }
-      }
       return await this.contract.getFunction("symbol()")(overrides || {});
     } catch (e) {
       const stack = new Error().stack;
@@ -267,18 +204,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
     ethCallContext?: EthCallContext
   ): Promise<bigint> {
     try {
-      if (preparedData?.ethCallResults && ethCallContext) {
-        const calldata = iface.encodeFunctionData("allowance", [arg0, arg1]);
-        const ethCallKey = makeEthCallKey({
-          context: ethCallContext,
-          calldata,
-        });
-        const ret = preparedData.ethCallResults[ethCallKey];
-        if (ret) {
-          const result = iface.decodeFunctionResult("allowance", ret).toArray();
-          return result.length == 1 ? result[0] : result;
-        }
-      }
       return await this.contract.getFunction("allowance(address,address)")(
         arg0,
         arg1,
@@ -301,18 +226,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
       ethCallContext?: EthCallContext
     ): Promise<boolean> {
       try {
-        if (preparedData?.ethCallResults && ethCallContext) {
-          const calldata = iface.encodeFunctionData("approve", [guy, wad]);
-          const ethCallKey = makeEthCallKey({
-            context: ethCallContext,
-            calldata,
-          });
-          const ret = preparedData.ethCallResults[ethCallKey];
-          if (ret) {
-            const result = iface.decodeFunctionResult("approve", ret).toArray();
-            return result.length == 1 ? result[0] : result;
-          }
-        }
         return await this.contract
           .getFunction("approve(address,uint256)")
           .staticCall(guy, wad, overrides || {});
@@ -330,24 +243,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
       ethCallContext?: EthCallContext
     ): Promise<boolean> {
       try {
-        if (preparedData?.ethCallResults && ethCallContext) {
-          const calldata = iface.encodeFunctionData("transferFrom", [
-            src,
-            dst,
-            wad,
-          ]);
-          const ethCallKey = makeEthCallKey({
-            context: ethCallContext,
-            calldata,
-          });
-          const ret = preparedData.ethCallResults[ethCallKey];
-          if (ret) {
-            const result = iface
-              .decodeFunctionResult("transferFrom", ret)
-              .toArray();
-            return result.length == 1 ? result[0] : result;
-          }
-        }
         return await this.contract
           .getFunction("transferFrom(address,address,uint256)")
           .staticCall(src, dst, wad, overrides || {});
@@ -363,20 +258,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
       ethCallContext?: EthCallContext
     ): Promise<void> {
       try {
-        if (preparedData?.ethCallResults && ethCallContext) {
-          const calldata = iface.encodeFunctionData("withdraw", [wad]);
-          const ethCallKey = makeEthCallKey({
-            context: ethCallContext,
-            calldata,
-          });
-          const ret = preparedData.ethCallResults[ethCallKey];
-          if (ret) {
-            const result = iface
-              .decodeFunctionResult("withdraw", ret)
-              .toArray();
-            return result.length == 1 ? result[0] : result;
-          }
-        }
         return await this.contract
           .getFunction("withdraw(uint256)")
           .staticCall(wad, overrides || {});
@@ -393,20 +274,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
       ethCallContext?: EthCallContext
     ): Promise<boolean> {
       try {
-        if (preparedData?.ethCallResults && ethCallContext) {
-          const calldata = iface.encodeFunctionData("transfer", [dst, wad]);
-          const ethCallKey = makeEthCallKey({
-            context: ethCallContext,
-            calldata,
-          });
-          const ret = preparedData.ethCallResults[ethCallKey];
-          if (ret) {
-            const result = iface
-              .decodeFunctionResult("transfer", ret)
-              .toArray();
-            return result.length == 1 ? result[0] : result;
-          }
-        }
         return await this.contract
           .getFunction("transfer(address,uint256)")
           .staticCall(dst, wad, overrides || {});
@@ -421,18 +288,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
       ethCallContext?: EthCallContext
     ): Promise<void> {
       try {
-        if (preparedData?.ethCallResults && ethCallContext) {
-          const calldata = iface.encodeFunctionData("deposit", []);
-          const ethCallKey = makeEthCallKey({
-            context: ethCallContext,
-            calldata,
-          });
-          const ret = preparedData.ethCallResults[ethCallKey];
-          if (ret) {
-            const result = iface.decodeFunctionResult("deposit", ret).toArray();
-            return result.length == 1 ? result[0] : result;
-          }
-        }
         return await this.contract
           .getFunction("deposit()")
           .staticCall(overrides || {});

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

@@ -44,22 +44,6 @@ export function generateViewFunction(view: boolean, fn: FunctionDeclaration, inc
     useStructs: true
   })}overrides?: Overrides, preparedData?: PreparedData, ethCallContext?: EthCallContext): ${generateReturnTypes(fn)} {
     try {
-      if (preparedData?.ethCallResults && ethCallContext) {
-        const calldata = iface.encodeFunctionData(
-          "${fn.name}",[${
-            fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
-          }] 
-        )
-        const ethCallKey = makeEthCallKey({
-          context: ethCallContext,
-          calldata
-        })
-        const ret = preparedData.ethCallResults[ethCallKey]
-        if (ret) {
-          const result = iface.decodeFunctionResult("${fn.name}", ret).toArray()
-          return result.length == 1? result[0]: result
-        }
-      }
       return await ${func}${call}(${
         fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
       } overrides || {})

package/src/eth/eth.ts

@@ -70,11 +70,11 @@ export function transformEtherError(e: Error, ctx: ContractContext<any, any> | u
       }
       return new SimpleEthersError(msg, err, stack)
     } else {
-      return new SimpleEthersError(`eth call error, ${checkPage}:\n${JSON.stringify(err)}`, err, stack)
+      return new SimpleEthersError(`eth call error ${err.message}, ${checkPage}:\n${JSON.stringify(err)}`, err, stack)
     }
   }
 
-  msg = 'other error during call error\n' + JSON.stringify(e) + '\n' + stack?.toString() + '\n' + checkPage
+  msg = 'other error during call error ${e.message}\n' + JSON.stringify(e) + '\n' + stack?.toString() + '\n' + checkPage
   return new Error(msg)
 }