@sentio/sdk 2.0.0-rc.13 → 2.0.0-rc.15

package/src/builtin/internal/erc20_processor.ts

@@ -266,107 +266,75 @@ export class ERC20BoundContractView extends BoundContractView<
     spender: string,
     overrides?: Overrides
   ): Promise<bigint> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.allowance(owner, spender, overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.allowance(owner, spender, overrides || {});
   }
 
   async balanceOf(account: string, overrides?: Overrides): Promise<bigint> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.balanceOf(account, overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.balanceOf(account, overrides || {});
   }
 
   async decimals(overrides?: Overrides): Promise<bigint> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.decimals(overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.decimals(overrides || {});
   }
 
   async locker(overrides?: Overrides): Promise<string> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.locker(overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.locker(overrides || {});
   }
 
   async name(overrides?: Overrides): Promise<string> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.name(overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.name(overrides || {});
   }
 
   async owner(overrides?: Overrides): Promise<string> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.owner(overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.owner(overrides || {});
   }
 
   async symbol(overrides?: Overrides): Promise<string> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.symbol(overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.symbol(overrides || {});
   }
 
   async totalSupply(overrides?: Overrides): Promise<bigint> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.totalSupply(overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.totalSupply(overrides || {});
   }
 }
 

package/src/builtin/internal/erc20bytes_processor.ts

@@ -172,68 +172,48 @@ export class ERC20BytesBoundContractView extends BoundContractView<
   ERC20BytesContractView
 > {
   async name(overrides?: Overrides): Promise<string> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.name(overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.name(overrides || {});
   }
 
   async totalSupply(overrides?: Overrides): Promise<bigint> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.totalSupply(overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.totalSupply(overrides || {});
   }
 
   async decimals(overrides?: Overrides): Promise<bigint> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.decimals(overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.decimals(overrides || {});
   }
 
   async balanceOf(who: string, overrides?: Overrides): Promise<bigint> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.balanceOf(who, overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.balanceOf(who, overrides || {});
   }
 
   async symbol(overrides?: Overrides): Promise<string> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.symbol(overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.symbol(overrides || {});
   }
 
   async allowance(
@@ -241,16 +221,12 @@ export class ERC20BytesBoundContractView extends BoundContractView<
     spender: string,
     overrides?: Overrides
   ): Promise<bigint> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.allowance(owner, spender, overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.allowance(owner, spender, overrides || {});
   }
 }
 

package/src/builtin/internal/erc721_processor.ts

@@ -273,45 +273,33 @@ export class ERC721BoundContractView extends BoundContractView<
   ERC721ContractView
 > {
   async totalSupply(overrides?: Overrides): Promise<bigint> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.totalSupply(overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.totalSupply(overrides || {});
   }
 
   async balanceOf(owner: string, overrides?: Overrides): Promise<bigint> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.balanceOf(owner, overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.balanceOf(owner, overrides || {});
   }
 
   async getApproved(
     tokenId: BigNumberish,
     overrides?: Overrides
   ): Promise<string> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.getApproved(tokenId, overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.getApproved(tokenId, overrides || {});
   }
 
   async isApprovedForAll(
@@ -319,87 +307,63 @@ export class ERC721BoundContractView extends BoundContractView<
     operator: string,
     overrides?: Overrides
   ): Promise<boolean> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.isApprovedForAll(owner, operator, overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.isApprovedForAll(owner, operator, overrides || {});
   }
 
   async name(overrides?: Overrides): Promise<string> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.name(overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.name(overrides || {});
   }
 
   async ownerOf(tokenId: BigNumberish, overrides?: Overrides): Promise<string> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.ownerOf(tokenId, overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.ownerOf(tokenId, overrides || {});
   }
 
   async supportsInterface(
     interfaceId: BytesLike,
     overrides?: Overrides
   ): Promise<boolean> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.supportsInterface(interfaceId, overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.supportsInterface(interfaceId, overrides || {});
   }
 
   async symbol(overrides?: Overrides): Promise<string> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.symbol(overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.symbol(overrides || {});
   }
 
   async tokenURI(
     tokenId: BigNumberish,
     overrides?: Overrides
   ): Promise<string> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.tokenURI(tokenId, overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.tokenURI(tokenId, overrides || {});
   }
 }
 

package/src/builtin/internal/weth9_processor.ts

@@ -182,68 +182,48 @@ export class WETH9BoundContractView extends BoundContractView<
   WETH9ContractView
 > {
   async name(overrides?: Overrides): Promise<string> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.name(overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.name(overrides || {});
   }
 
   async totalSupply(overrides?: Overrides): Promise<bigint> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.totalSupply(overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.totalSupply(overrides || {});
   }
 
   async decimals(overrides?: Overrides): Promise<bigint> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.decimals(overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.decimals(overrides || {});
   }
 
   async balanceOf(arg0: string, overrides?: Overrides): Promise<bigint> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.balanceOf(arg0, overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.balanceOf(arg0, overrides || {});
   }
 
   async symbol(overrides?: Overrides): Promise<string> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.symbol(overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.symbol(overrides || {});
   }
 
   async allowance(
@@ -251,16 +231,12 @@ export class WETH9BoundContractView extends BoundContractView<
     arg1: string,
     overrides?: Overrides
   ): Promise<bigint> {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        };
-      }
-      return await this.view.allowance(arg0, arg1, overrides || {});
-    } catch (e) {
-      throw transformEtherError(e, this.context);
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
+      };
     }
+    return await this.view.allowance(arg0, arg1, overrides || {});
   }
 }
 

package/src/core/context.ts

@@ -4,7 +4,7 @@ import { LogParams } from 'ethers/providers'
 import { RecordMetaData } from '@sentio/protos'
 import { Trace } from '../eth/trace.js'
 import { Labels, normalizeLabels } from './metadata.js'
-import { CHAIN_IDS } from '../utils/chain.js'
+import { CHAIN_IDS } from '../chain.js'
 import { BaseContext } from './base-context.js'
 
 export abstract class EthContext extends BaseContext {

package/src/core/sui-plugin.ts

@@ -3,7 +3,7 @@ import { ContractConfig, DataBinding, HandlerType, ProcessConfigResponse, Proces
 
 import { ServerError, Status } from 'nice-grpc'
 
-import { CHAIN_IDS } from '../utils/chain.js'
+import { CHAIN_IDS } from '../chain.js'
 import { SuiProcessorState } from './sui-processor.js'
 
 export class SuiPlugin extends Plugin {

package/src/error.ts

@@ -1,8 +1,9 @@
 // Transform error in more readable format
 import { ContractContext } from './core/context.js'
+import { CallExceptionError } from 'ethers'
 // import { errors } from 'ethers/providers'
 
-export class EthersError extends Error {
+export class SimpleEthersError extends Error {
   e: Error
 
   constructor(message: string, e: Error) {
@@ -16,11 +17,14 @@ export class EthersError extends Error {
 }
 
 export function transformEtherError(e: Error, ctx: ContractContext<any, any> | undefined): Error {
+  if (e instanceof SimpleEthersError) {
+    return e
+  }
+
   let msg = ''
-  // @ts-ignore expected error fields
-  if (e.code === errors.CALL_EXCEPTION) {
-    // @ts-ignore expected error fields
-    if (e.data === '0x') {
+  const err = e as CallExceptionError
+  if (err.code === 'CALL_EXCEPTION') {
+    if (err.data === '0x') {
       if (ctx) {
         msg =
           "jsonrpc eth_call return '0x' (likely contract not existed) at chain " +
@@ -28,18 +32,12 @@ export function transformEtherError(e: Error, ctx: ContractContext<any, any> | u
           ': ' +
           JSON.stringify(e)
       } else {
-        msg = "jsonrpc eth_call return '0x' (likely contract not existed): " + JSON.stringify(e)
+        msg = "jsonrpc eth_call return '0x' (likely contract not existed): " + JSON.stringify(err)
       }
+      return new SimpleEthersError(msg, err)
     }
-    return new EthersError(msg, e)
   }
 
-  if (e instanceof EthersError) {
-    return e
-  }
-
-  // TODO gracefully handle more errors
-
-  msg = 'ethers call error\n' + e.message + '\n' + e.stack?.toString()
+  msg = 'ethers call error\n' + JSON.stringify(e) + '\n' + e.stack?.toString()
   return new Error(msg)
 }

package/src/eth/base-processor-template.ts

@@ -8,7 +8,7 @@ import { Trace } from './trace.js'
 import { ListStateStorage } from '@sentio/runtime'
 import { EventFilter, LogParams, Network } from 'ethers/providers'
 import { DeferredTopicFilter } from 'ethers/contract'
-import { EthEvent } from './eth-event.js'
+import { Eth } from './eth.js'
 
 export class ProcessorTemplateProcessorState extends ListStateStorage<
   BaseProcessorTemplate<BaseContract, BoundContractView<BaseContract, any>>
@@ -37,7 +37,7 @@ export abstract class BaseProcessorTemplate<
     fetchConfig?: EthFetchConfig
   }[] = []
   eventHandlers: {
-    handler: (event: EthEvent, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid
+    handler: (event: Eth, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid
     filter: DeferredTopicFilter | DeferredTopicFilter[]
     fetchConfig?: EthFetchConfig
   }[] = []
@@ -88,7 +88,7 @@ export abstract class BaseProcessorTemplate<
   }
 
   public onEvent(
-    handler: (event: EthEvent, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
+    handler: (event: Eth, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
     filter: DeferredTopicFilter | DeferredTopicFilter[],
     fetchConfig?: EthFetchConfig
   ) {