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

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
   ) {

package/src/eth/base-processor.ts

@@ -15,7 +15,7 @@ import { BindInternalOptions, BindOptions } from '../core/bind-options.js'
 import { PromiseOrVoid } from '../promise-or-void.js'
 import { Trace } from './trace.js'
 import { ServerError, Status } from 'nice-grpc'
-import { EthEvent } from './eth-event.js'
+import { Eth } from './eth.js'
 
 export interface AddressOrTypeEventFilter extends DeferredTopicFilter {
   addressType?: AddressType
@@ -78,7 +78,7 @@ export abstract class BaseProcessor<
   }
 
   public onEvent(
-    handler: (event: EthEvent, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
+    handler: (event: Eth, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid,
     filter: DeferredTopicFilter | DeferredTopicFilter[],
     fetchConfig?: EthFetchConfig
   ) {
@@ -120,7 +120,7 @@ export abstract class BaseProcessor<
         const parsed = contractView.rawContract.interface.parseLog(logParam)
 
         if (parsed) {
-          const event: EthEvent = { ...log, args: parsed.args }
+          const event: Eth = { ...log, args: parsed.args }
           await handler(event, ctx)
           return ctx.getProcessResult()
         }
@@ -189,7 +189,7 @@ export abstract class BaseProcessor<
     return this
   }
 
-  public onAllEvents(handler: (event: EthEvent, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {
+  public onAllEvents(handler: (event: Eth, ctx: ContractContext<TContract, TBoundContractView>) => PromiseOrVoid) {
     const _filters: DeferredTopicFilter[] = []
     const tmpContract = this.CreateBoundContractView()
 

package/src/eth/{eth-event.ts → eth.ts}

@@ -1,6 +1,6 @@
 import { LogParams } from 'ethers/providers'
 import { Result } from 'ethers'
 
-export interface EthEvent<TArgsArray extends Array<any> = any, TArgsObject = any> extends LogParams {
+export interface Eth<TArgsArray extends Array<any> = any, TArgsObject = any> extends LogParams {
   args: TArgsArray & TArgsObject & Result
 }

package/src/eth/index.ts

@@ -5,4 +5,6 @@ export { getProvider, DummyProvider } from './provider.js'
 export type { TypedCallTrace, Trace } from './trace.js'
 export { EthPlugin } from './eth-plugin.js'
 
+export * from './eth.js'
+
 export { getProcessor, addProcessor, getContractByABI, addContractByABI } from './binds.js'

package/src/index.ts

@@ -1,4 +1,4 @@
-export { transformEtherError, EthersError } from './error.js'
+export { transformEtherError, SimpleEthersError } from './error.js'
 
 // TODO maybe remove this
 export * from '@sentio/protos'

package/src/target-ethers-sentio/view-function.cts

@@ -60,19 +60,12 @@ export function generateBoundViewFunction(fn: FunctionDeclaration, includeArgTyp
   async ${declName ?? fn.name}(${generateInputTypes(fn.inputs, {
     useStructs: true,
   })}overrides?: Overrides): ${generateReturnTypes(fn)} {
-    try {
-      if (!overrides && this.context) {
-        overrides = {
-          blockTag: toBlockTag(this.context.blockNumber),
-        }
+    if (!overrides && this.context) {
+      overrides = {
+        blockTag: toBlockTag(this.context.blockNumber),
       }
-      return await this.view.${declName}(${
-    fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
-  } overrides || {})
-
-    } catch (e) {
-      throw transformEtherError(e, this.context)
     }
+    return await this.view.${declName}(${fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''} overrides || {})
   }
   `
 }

package/lib/eth/eth-event.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=eth-event.js.map

package/lib/eth/eth-event.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"eth-event.js","sourceRoot":"","sources":["../../src/eth/eth-event.ts"],"names":[],"mappings":"","sourcesContent":["import { LogParams } from 'ethers/providers'\nimport { Result } from 'ethers'\n\nexport interface EthEvent<TArgsArray extends Array<any> = any, TArgsObject = any> extends LogParams {\n  args: TArgsArray & TArgsObject & Result\n}\n"]}