@sentio/sdk 2.60.0-rc.1 → 2.60.0-rc.11

package/src/eth/base-processor.ts

@@ -1,4 +1,4 @@
-import { BaseContract, DeferredTopicFilter, LogDescription, TransactionResponseParams } from 'ethers'
+import { BaseContract, DeferredTopicFilter, LogDescription, LogParams, TransactionResponseParams } from 'ethers'
 
 import { BoundContractView, ContractContext, ContractView, GlobalContext } from './context.js'
 import {
@@ -93,6 +93,7 @@ export class GlobalProcessor {
   blockHandlers: BlockHandler[] = proxyHandlers([])
   transactionHandler: TransactionHandler[] = proxyHandlers([])
   traceHandlers: TraceHandler[] = proxyHandlers([])
+  eventHandlers: EventsHandler[] = []
 
   static bind(config: Omit<BindOptions, 'address'>): GlobalProcessor {
     const processor = new GlobalProcessor(config)
@@ -333,6 +334,47 @@ export class GlobalProcessor {
     return this
   }
 
+  public onEvent(
+    handler: (rawLog: LogParams, ctx: GlobalContext) => PromiseOrVoid,
+    filter?: AddressOrTypeEventFilter | AddressOrTypeEventFilter[],
+    handlerOptions?: HandlerOptions<EthFetchConfig, TypedEvent>
+  ): this {
+    let _filters: AddressOrTypeEventFilter[] = []
+
+    if (Array.isArray(filter)) {
+      _filters = filter
+    } else if (filter) {
+      _filters.push(filter)
+    }
+    const chainId = this.getChainId()
+
+    this.eventHandlers.push({
+      filters: _filters,
+      fetchConfig: EthFetchConfig.fromPartial(handlerOptions || {}),
+      handlerName: getHandlerName(),
+      handler: async function (data) {
+        const { log, block, transaction, transactionReceipt } = formatEthData(data)
+        if (!log) {
+          throw new ServerError(Status.INVALID_ARGUMENT, 'Log is empty')
+        }
+        const ctx = new GlobalContext(
+          chainId,
+          transaction?.to || '*',
+          data.timestamp,
+          block,
+          log,
+          undefined,
+          transaction,
+          transactionReceipt
+        )
+
+        await handler(log, ctx)
+        return ctx.stopAndGetResult()
+      }
+    })
+    return this
+  }
+
   public onTrace(
     signatures: string | string[],
     handler: (trace: Trace, ctx: GlobalContext) => PromiseOrVoid,

package/src/eth/eth-plugin.ts

@@ -212,6 +212,53 @@ export class EthPlugin extends Plugin {
           })
         }
       }
+
+      for (const eventsHandler of processor.eventHandlers) {
+        // associate id with filter
+        const handlerId = this.handlerRegister.register(eventsHandler.handler, processor.getChainId())
+        const logConfig: LogHandlerConfig = {
+          handlerId: handlerId,
+          handlerName: eventsHandler.handlerName,
+          filters: [],
+          fetchConfig: eventsHandler.fetchConfig
+        }
+
+        if (!eventsHandler.filters || eventsHandler.filters.length === 0) {
+          // if no filter, then we assume all logs
+          logConfig.filters.push({
+            topics: []
+          })
+        } else {
+          for (const filter of eventsHandler.filters) {
+            const topics = await filter.getTopicFilter()
+            // if (!filter.topics) {
+            //   throw new ServerError(Status.INVALID_ARGUMENT, 'Topic should not be null')
+            // }
+            let address = undefined
+            if (filter.address) {
+              address = filter.address.toString()
+            }
+            const logFilter: LogFilter = {
+              addressType: filter.addressType,
+              address: address && validateAndNormalizeAddress(address),
+              topics: []
+            }
+
+            for (const ts of topics) {
+              let hashes: string[] = []
+              if (Array.isArray(ts)) {
+                hashes = hashes.concat(ts)
+              } else if (ts) {
+                hashes.push(ts)
+              }
+              logFilter.topics.push({ hashes: hashes })
+            }
+            logConfig.filters.push(logFilter)
+          }
+        }
+        contractConfig.logConfigs.push(logConfig)
+      }
+
       config.contractConfigs.push(contractConfig)
     }
 
@@ -238,9 +285,7 @@ export class EthPlugin extends Plugin {
 
         for (const filter of eventsHandler.filters) {
           const topics = await filter.getTopicFilter()
-          // if (!filter.topics) {
-          //   throw new ServerError(Status.INVALID_ARGUMENT, 'Topic should not be null')
-          // }
+
           let address = undefined
           if (filter.address) {
             address = filter.address.toString()
@@ -262,6 +307,7 @@ export class EthPlugin extends Plugin {
           }
           logConfig.filters.push(logFilter)
         }
+
         accountConfig.logConfigs.push(logConfig)
       }
 

package/src/eth/eth.ts

@@ -150,34 +150,39 @@ export function formatEthData(data: {
     return data.__formattedEthData
   }
 
-  const log = data.log ? formatLog(data.log) : undefined
-  if (data.block && !data.block.transactions) {
-    data.block.transactions = []
-  }
-  const block = data.block ? formatRichBlock(data.block) : undefined
-  const trace = data.trace ? (data.trace as Trace) : undefined
-  let transaction = undefined
-  if (data.transaction) {
-    if (!data.transaction.v) {
-      data.transaction.v = '0x1c'
-      data.transaction.r = '0x88ff6cf0fefd94db46111149ae4bfc179e9b94721fffd821d38d16464b3f71d0'
-      data.transaction.s = '0x45e0aff800961cfce805daef7016b9b675c137a6a41a548f7b60a3484c06a33a'
+  try {
+    const log = data.log ? formatLog(data.log) : undefined
+    if (data.block && !data.block.transactions) {
+      data.block.transactions = []
+    }
+    const block = data.block ? formatRichBlock(data.block) : undefined
+    const trace = data.trace ? (data.trace as Trace) : undefined
+    let transaction = undefined
+    if (data.transaction) {
+      if (!data.transaction.v) {
+        data.transaction.v = '0x1c'
+        data.transaction.r = '0x88ff6cf0fefd94db46111149ae4bfc179e9b94721fffd821d38d16464b3f71d0'
+        data.transaction.s = '0x45e0aff800961cfce805daef7016b9b675c137a6a41a548f7b60a3484c06a33a'
+      }
+      transaction = formatTransactionResponse(data.transaction)
+    }
+    const transactionReceipt = data.transactionReceipt ? formatTransactionReceipt(data.transactionReceipt) : undefined
+
+    const result = {
+      log,
+      block,
+      trace,
+      transaction,
+      transactionReceipt
     }
-    transaction = formatTransactionResponse(data.transaction)
-  }
-  const transactionReceipt = data.transactionReceipt ? formatTransactionReceipt(data.transactionReceipt) : undefined
-
-  const result = {
-    log,
-    block,
-    trace,
-    transaction,
-    transactionReceipt
-  }
 
-  // Cache the result on the input data object
-  data.__formattedEthData = result
-  return result
+    // Cache the result on the input data object
+    data.__formattedEthData = result
+    return result
+  } catch (e) {
+    console.error('Error formatting eth data', e)
+    return data
+  }
 }
 
 export function formatRichBlock(block: RichBlock): RichBlock {