@sentio/sdk 1.39.0 → 1.40.0-rc.2

package/src/core/context.ts

@@ -1,29 +1,43 @@
 import { RecordMetaData } from '@sentio/protos'
-import { BaseContract, EventFilter } from 'ethers'
+import { BaseContract, EventFilter, Transaction } from 'ethers'
 import { Block, Log } from '@ethersproject/abstract-provider'
 import { normalizeLabels } from './meter'
 import { Trace } from './trace'
 import { Labels } from './metadata'
 import { CHAIN_IDS } from '../utils/chain'
 import { BaseContext } from './base-context'
+import { TransactionReceipt } from '@ethersproject/providers'
 
 export abstract class EthContext extends BaseContext {
   chainId: number
   address: string
-  log?: Log
+  private readonly log?: Log
   block?: Block
-  trace?: Trace
+  private readonly trace?: Trace
   blockNumber: bigint | number
   transactionHash?: string
+  transaction?: Transaction
+  transactionReceipt?: TransactionReceipt
   timestamp: Date
 
-  protected constructor(chainId: number, address: string, block?: Block, log?: Log, trace?: Trace, timestamp?: Date) {
+  constructor(
+    chainId: number,
+    address: string,
+    timestamp?: Date,
+    block?: Block,
+    log?: Log,
+    trace?: Trace,
+    transaction?: Transaction,
+    transactionReceipt?: TransactionReceipt
+  ) {
     super()
     this.chainId = chainId
     this.log = log
     this.block = block
     this.trace = trace
     this.address = address
+    this.transaction = transaction
+    this.transactionReceipt = transactionReceipt
     this.timestamp = timestamp || new Date(0)
     if (log) {
       this.blockNumber = log.blockNumber
@@ -83,9 +97,9 @@ export abstract class EthContext extends BaseContext {
 }
 
 export class AccountContext extends EthContext {
-  constructor(chainId: number, address: string, block?: Block, log?: Log, trace?: Trace) {
-    super(chainId, address, block, log, trace)
-  }
+  // constructor(chainId: number, address: string, block?: Block, log?: Log, trace?: Trace) {
+  //   super(chainId, address, new Date(0), block, log, trace)
+  // }
   protected getContractName(): string {
     return 'account'
   }
@@ -102,12 +116,14 @@ export class ContractContext<
     contractName: string,
     view: TContractBoundView,
     chainId: number,
+    timestamp?: Date,
     block?: Block,
     log?: Log,
     trace?: Trace,
-    timestamp?: Date
+    transaction?: Transaction,
+    transactionReceipt?: TransactionReceipt
   ) {
-    super(chainId, view.rawContract.address, block, log, trace, timestamp)
+    super(chainId, view.rawContract.address, timestamp, block, log, trace, transaction, transactionReceipt)
     view.context = this
     this.contractName = contractName
     this.contract = view

package/src/core/eth-plugin.ts

@@ -15,7 +15,6 @@ import {
 } from '@sentio/protos'
 
 import { ServerError, Status } from 'nice-grpc'
-import { Block, Log } from '@ethersproject/abstract-provider'
 import { ProcessorState } from '../binds'
 import { AccountProcessorState } from './account-processor'
 import { ProcessorTemplateProcessorState, TemplateInstanceState } from './base-processor-template'
@@ -48,6 +47,7 @@ export class EthPlugin extends Plugin {
         intervalConfigs: [],
         logConfigs: [],
         traceConfigs: [],
+        transactionConfig: [],
         startBlock: processor.config.startBlock,
         endBlock: 0n,
         instructionConfig: undefined,
@@ -78,6 +78,7 @@ export class EthPlugin extends Plugin {
         contractConfig.traceConfigs.push({
           signature: traceHandler.signature,
           handlerId: handlerId,
+          fetchConfig: traceHandler.fetchConfig,
         })
       }
 
@@ -88,6 +89,7 @@ export class EthPlugin extends Plugin {
         const logConfig: LogHandlerConfig = {
           handlerId: handlerId,
           filters: [],
+          fetchConfig: eventsHandler.fetchConfig,
         }
 
         for (const filter of eventsHandler.filters) {
@@ -135,6 +137,7 @@ export class EthPlugin extends Plugin {
         const logConfig: LogHandlerConfig = {
           handlerId: handlerId,
           filters: [],
+          fetchConfig: eventsHandler.fetchConfig,
         }
 
         for (const filter of eventsHandler.filters) {

package/src/core/sui-plugin.ts

@@ -12,6 +12,7 @@ export class SuiPlugin extends Plugin {
   configure(config: ProcessConfigResponse): void {
     for (const suiProcessor of SuiProcessorState.INSTANCE.getValues()) {
       const contractConfig: ContractConfig = {
+        transactionConfig: [],
         processorType: USER_PROCESSOR,
         contract: {
           name: 'sui contract',

package/src/target-ethers-sentio/event-handler.ts

@@ -9,7 +9,8 @@ export function generateEventHandler(event: EventDeclaration, contractName: stri
   return `
   onEvent${eventName}(
     handler: (event: ${eventNamePrefix}Event, ctx: ${contractName}Context) => void,
-    filter?: ${eventNamePrefix}EventFilter | ${eventNamePrefix}EventFilter[]
+    filter?: ${eventNamePrefix}EventFilter | ${eventNamePrefix}EventFilter[],
+    fetchConfig?: EthFetchConfig
   ) {
     if (!filter) {
       // @ts-ignore
@@ -17,7 +18,7 @@ export function generateEventHandler(event: EventDeclaration, contractName: stri
         // @ts-ignore
         '${filterName}'](${event.inputs.map(() => 'null').join(',')})
     }
-    return super.onEvent(handler, filter!)
+    return super.onEvent(handler, filter!, fetchConfig)
   }
   `
 }

package/src/target-ethers-sentio/file.ts

@@ -162,6 +162,7 @@ export function codeGenSentioFile(contract: Contract): string {
         'TypedCallTrace',
         'toBlockTag',
       ],
+      '@sentio/protos': ['EthFetchConfig'],
       './common': ['PromiseOrValue'],
       './index': [`${contract.name}`, `${contract.name}__factory`],
       [`./${contract.name}`]: eventsImports.concat(uniqueStructImports),

package/src/target-ethers-sentio/functions-handler.ts

@@ -42,9 +42,10 @@ function generateCallHandler(fn: FunctionDeclaration, contractName: string, over
 
   return `
   onCall${capitalizeFirstChar(overloadedName ?? fn.name)}(
-    handler: (call: ${capitalizeFirstChar(overloadedName ?? fn.name)}CallTrace, ctx: ${contractName}Context) => void
+    handler: (call: ${capitalizeFirstChar(overloadedName ?? fn.name)}CallTrace, ctx: ${contractName}Context) => void,
+    fetchConfig?: EthFetchConfig
   ) {
-    return super.onTrace("${sighash}", handler);
+    return super.onTrace("${sighash}", handler, fetchConfig);
   }
 `
 }

package/src/utils/price.ts

@@ -1,7 +1,6 @@
 import { PriceServiceClient, PriceServiceDefinition } from '@sentio/protos/lib/service/price/protos/price'
 import { createChannel, createClientFactory } from 'nice-grpc'
 import { retryMiddleware, RetryOptions } from 'nice-grpc-client-middleware-retry'
-import { errorDetailsClientMiddleware } from 'nice-grpc-error-details'
 import { Endpoints } from '@sentio/runtime'
 
 export function getPriceClient(address?: string) {
@@ -10,10 +9,7 @@ export function getPriceClient(address?: string) {
   }
   const channel = createChannel(address)
 
-  return createClientFactory()
-    .use(errorDetailsClientMiddleware)
-    .use(retryMiddleware)
-    .create(PriceServiceDefinition, channel)
+  return createClientFactory().use(retryMiddleware).create(PriceServiceDefinition, channel)
 }
 
 const priceMap = new Map<string, number>()