@sentio/sdk 2.18.1-rc.9 → 2.18.2-rc.1

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

@@ -103,45 +103,50 @@ export class ERC20BytesContractView extends ContractView<ERC20Bytes> {
   }
 
   async name(overrides?: Overrides): Promise<string> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("name()")(overrides || {});
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
   async totalSupply(overrides?: Overrides): Promise<bigint> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("totalSupply()")(overrides || {});
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
   async decimals(overrides?: Overrides): Promise<bigint> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("decimals()")(overrides || {});
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
   async balanceOf(who: string, overrides?: Overrides): Promise<bigint> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("balanceOf(address)")(
         who,
         overrides || {}
       );
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
   async symbol(overrides?: Overrides): Promise<string> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("symbol()")(overrides || {});
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
@@ -150,6 +155,7 @@ export class ERC20BytesContractView extends ContractView<ERC20Bytes> {
     spender: string,
     overrides?: Overrides
   ): Promise<bigint> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("allowance(address,address)")(
         owner,
@@ -157,7 +163,7 @@ export class ERC20BytesContractView extends ContractView<ERC20Bytes> {
         overrides || {}
       );
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
@@ -169,12 +175,13 @@ export class ERC20BytesContractView extends ContractView<ERC20Bytes> {
       value: BigNumberish,
       overrides?: Overrides
     ): Promise<boolean> {
+      const stack = new Error().stack;
       try {
         return await this.contract
           .getFunction("approve(address,uint256)")
           .staticCall(spender, value, overrides || {});
       } catch (e) {
-        throw transformEtherError(e, undefined);
+        throw transformEtherError(e, undefined, stack);
       }
     },
     async transferFrom(
@@ -183,12 +190,13 @@ export class ERC20BytesContractView extends ContractView<ERC20Bytes> {
       value: BigNumberish,
       overrides?: Overrides
     ): Promise<boolean> {
+      const stack = new Error().stack;
       try {
         return await this.contract
           .getFunction("transferFrom(address,address,uint256)")
           .staticCall(from, to, value, overrides || {});
       } catch (e) {
-        throw transformEtherError(e, undefined);
+        throw transformEtherError(e, undefined, stack);
       }
     },
     async transfer(
@@ -196,12 +204,13 @@ export class ERC20BytesContractView extends ContractView<ERC20Bytes> {
       value: BigNumberish,
       overrides?: Overrides
     ): Promise<boolean> {
+      const stack = new Error().stack;
       try {
         return await this.contract
           .getFunction("transfer(address,uint256)")
           .staticCall(to, value, overrides || {});
       } catch (e) {
-        throw transformEtherError(e, undefined);
+        throw transformEtherError(e, undefined, stack);
       }
     },
   };

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

@@ -155,21 +155,23 @@ export class ERC721ContractView extends ContractView<ERC721> {
   }
 
   async totalSupply(overrides?: Overrides): Promise<bigint> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("totalSupply()")(overrides || {});
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
   async balanceOf(owner: string, overrides?: Overrides): Promise<bigint> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("balanceOf(address)")(
         owner,
         overrides || {}
       );
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
@@ -177,13 +179,14 @@ export class ERC721ContractView extends ContractView<ERC721> {
     tokenId: BigNumberish,
     overrides?: Overrides
   ): Promise<string> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("getApproved(uint256)")(
         tokenId,
         overrides || {}
       );
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
@@ -192,31 +195,34 @@ export class ERC721ContractView extends ContractView<ERC721> {
     operator: string,
     overrides?: Overrides
   ): Promise<boolean> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction(
         "isApprovedForAll(address,address)"
       )(owner, operator, overrides || {});
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
   async name(overrides?: Overrides): Promise<string> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("name()")(overrides || {});
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
   async ownerOf(tokenId: BigNumberish, overrides?: Overrides): Promise<string> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("ownerOf(uint256)")(
         tokenId,
         overrides || {}
       );
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
@@ -224,21 +230,23 @@ export class ERC721ContractView extends ContractView<ERC721> {
     interfaceId: BytesLike,
     overrides?: Overrides
   ): Promise<boolean> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("supportsInterface(bytes4)")(
         interfaceId,
         overrides || {}
       );
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
   async symbol(overrides?: Overrides): Promise<string> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("symbol()")(overrides || {});
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
@@ -246,13 +254,14 @@ export class ERC721ContractView extends ContractView<ERC721> {
     tokenId: BigNumberish,
     overrides?: Overrides
   ): Promise<string> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("tokenURI(uint256)")(
         tokenId,
         overrides || {}
       );
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
@@ -264,12 +273,13 @@ export class ERC721ContractView extends ContractView<ERC721> {
       tokenId: BigNumberish,
       overrides?: Overrides
     ): Promise<void> {
+      const stack = new Error().stack;
       try {
         return await this.contract
           .getFunction("approve(address,uint256)")
           .staticCall(to, tokenId, overrides || {});
       } catch (e) {
-        throw transformEtherError(e, undefined);
+        throw transformEtherError(e, undefined, stack);
       }
     },
     async safeTransferFrom_address_address_uint256(
@@ -278,12 +288,13 @@ export class ERC721ContractView extends ContractView<ERC721> {
       tokenId: BigNumberish,
       overrides?: Overrides
     ): Promise<void> {
+      const stack = new Error().stack;
       try {
         return await this.contract
           .getFunction("safeTransferFrom(address,address,uint256)")
           .staticCall(from, to, tokenId, overrides || {});
       } catch (e) {
-        throw transformEtherError(e, undefined);
+        throw transformEtherError(e, undefined, stack);
       }
     },
     async safeTransferFrom_address_address_uint256_bytes(
@@ -293,12 +304,13 @@ export class ERC721ContractView extends ContractView<ERC721> {
       data: BytesLike,
       overrides?: Overrides
     ): Promise<void> {
+      const stack = new Error().stack;
       try {
         return await this.contract
           .getFunction("safeTransferFrom(address,address,uint256,bytes)")
           .staticCall(from, to, tokenId, data, overrides || {});
       } catch (e) {
-        throw transformEtherError(e, undefined);
+        throw transformEtherError(e, undefined, stack);
       }
     },
     async setApprovalForAll(
@@ -306,12 +318,13 @@ export class ERC721ContractView extends ContractView<ERC721> {
       _approved: boolean,
       overrides?: Overrides
     ): Promise<void> {
+      const stack = new Error().stack;
       try {
         return await this.contract
           .getFunction("setApprovalForAll(address,bool)")
           .staticCall(operator, _approved, overrides || {});
       } catch (e) {
-        throw transformEtherError(e, undefined);
+        throw transformEtherError(e, undefined, stack);
       }
     },
     async transferFrom(
@@ -320,12 +333,13 @@ export class ERC721ContractView extends ContractView<ERC721> {
       tokenId: BigNumberish,
       overrides?: Overrides
     ): Promise<void> {
+      const stack = new Error().stack;
       try {
         return await this.contract
           .getFunction("transferFrom(address,address,uint256)")
           .staticCall(from, to, tokenId, overrides || {});
       } catch (e) {
-        throw transformEtherError(e, undefined);
+        throw transformEtherError(e, undefined, stack);
       }
     },
   };

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

@@ -112,45 +112,50 @@ export class WETH9ContractView extends ContractView<WETH9> {
   }
 
   async name(overrides?: Overrides): Promise<string> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("name()")(overrides || {});
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
   async totalSupply(overrides?: Overrides): Promise<bigint> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("totalSupply()")(overrides || {});
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
   async decimals(overrides?: Overrides): Promise<bigint> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("decimals()")(overrides || {});
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
   async balanceOf(arg0: string, overrides?: Overrides): Promise<bigint> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("balanceOf(address)")(
         arg0,
         overrides || {}
       );
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
   async symbol(overrides?: Overrides): Promise<string> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("symbol()")(overrides || {});
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
@@ -159,6 +164,7 @@ export class WETH9ContractView extends ContractView<WETH9> {
     arg1: string,
     overrides?: Overrides
   ): Promise<bigint> {
+    const stack = new Error().stack;
     try {
       return await this.contract.getFunction("allowance(address,address)")(
         arg0,
@@ -166,7 +172,7 @@ export class WETH9ContractView extends ContractView<WETH9> {
         overrides || {}
       );
     } catch (e) {
-      throw transformEtherError(e, undefined);
+      throw transformEtherError(e, undefined, stack);
     }
   }
 
@@ -178,12 +184,13 @@ export class WETH9ContractView extends ContractView<WETH9> {
       wad: BigNumberish,
       overrides?: Overrides
     ): Promise<boolean> {
+      const stack = new Error().stack;
       try {
         return await this.contract
           .getFunction("approve(address,uint256)")
           .staticCall(guy, wad, overrides || {});
       } catch (e) {
-        throw transformEtherError(e, undefined);
+        throw transformEtherError(e, undefined, stack);
       }
     },
     async transferFrom(
@@ -192,21 +199,23 @@ export class WETH9ContractView extends ContractView<WETH9> {
       wad: BigNumberish,
       overrides?: Overrides
     ): Promise<boolean> {
+      const stack = new Error().stack;
       try {
         return await this.contract
           .getFunction("transferFrom(address,address,uint256)")
           .staticCall(src, dst, wad, overrides || {});
       } catch (e) {
-        throw transformEtherError(e, undefined);
+        throw transformEtherError(e, undefined, stack);
       }
     },
     async withdraw(wad: BigNumberish, overrides?: Overrides): Promise<void> {
+      const stack = new Error().stack;
       try {
         return await this.contract
           .getFunction("withdraw(uint256)")
           .staticCall(wad, overrides || {});
       } catch (e) {
-        throw transformEtherError(e, undefined);
+        throw transformEtherError(e, undefined, stack);
       }
     },
     async transfer(
@@ -214,21 +223,23 @@ export class WETH9ContractView extends ContractView<WETH9> {
       wad: BigNumberish,
       overrides?: Overrides
     ): Promise<boolean> {
+      const stack = new Error().stack;
       try {
         return await this.contract
           .getFunction("transfer(address,uint256)")
           .staticCall(dst, wad, overrides || {});
       } catch (e) {
-        throw transformEtherError(e, undefined);
+        throw transformEtherError(e, undefined, stack);
       }
     },
     async deposit(overrides?: Overrides): Promise<void> {
+      const stack = new Error().stack;
       try {
         return await this.contract
           .getFunction("deposit()")
           .staticCall(overrides || {});
       } catch (e) {
-        throw transformEtherError(e, undefined);
+        throw transformEtherError(e, undefined, stack);
       }
     },
   };

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

@@ -35,12 +35,13 @@ export function generateViewFunction(view: boolean, fn: FunctionDeclaration, inc
   async ${declName}(${generateInputTypes(fn.inputs, {
       useStructs: true,
     })}overrides?: Overrides): ${generateReturnTypes(fn)} {
+    const stack = new Error().stack
     try {    
        return await ${func}${call}(${
       fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
     } overrides || {})
     } catch (e) {
-      throw transformEtherError(e, undefined)
+      throw transformEtherError(e, undefined, stack)
     }
   }
   `,

package/src/eth/eth.ts

@@ -42,9 +42,9 @@ export interface RichBlock extends BlockParams {
 export class SimpleEthersError extends Error {
   e: Error
 
-  constructor(message: string, e: Error) {
+  constructor(message: string, e: Error, stack?: string) {
     super(message)
-    this.stack = e.stack
+    this.stack = stack
   }
 
   toString() {
@@ -52,7 +52,7 @@ export class SimpleEthersError extends Error {
   }
 }
 
-export function transformEtherError(e: Error, ctx: ContractContext<any, any> | undefined): Error {
+export function transformEtherError(e: Error, ctx: ContractContext<any, any> | undefined, stack?: string): Error {
   if (e instanceof SimpleEthersError) {
     return e
   }
@@ -65,22 +65,17 @@ export function transformEtherError(e: Error, ctx: ContractContext<any, any> | u
   if (err.code === 'CALL_EXCEPTION' || err.code === 'BAD_DATA') {
     if (err.data === '0x') {
       if (ctx) {
-        msg =
-          "jsonrpc eth_call return '0x' (likely contract not existed) at chain " +
-          ctx.chainId +
-          ': ' +
-          JSON.stringify(e)
+        msg = `jsonrpc eth_call return '0x' (likely contract not existed) at chain ${ctx.chainId}, ${checkPage}:\n${e.message}`
       } else {
-        msg = "jsonrpc eth_call return '0x' (likely contract not existed): " + JSON.stringify(err)
+        msg = `jsonrpc eth_call return '0x' (likely contract not existed), ${checkPage}:\n${e.message}`
       }
-      msg += '\n' + checkPage
-      return new SimpleEthersError(msg, err)
+      return new SimpleEthersError(msg, err, stack)
     } else {
-      return new SimpleEthersError('eth call error, ' + checkPage, err)
+      return new SimpleEthersError(`eth call error, ${checkPage}:\nerr.message`, err, stack)
     }
   }
 
-  msg = 'other error during call error\n' + JSON.stringify(e) + '\n' + e.stack?.toString() + '\n' + checkPage
+  msg = 'other error during call error\n' + JSON.stringify(e) + '\n' + stack?.toString() + '\n' + checkPage
   return new Error(msg)
 }