@sentio/sdk 2.16.2-rc.1 → 2.16.2-rc.3

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

@@ -239,7 +239,7 @@ export class WETH9Processor extends BaseProcessor<
         null
       );
     }
-    return super.onEvent(handler, filter!, fetchConfig);
+    return super.onEthEvent(handler, filter!, fetchConfig);
   }
 
   onEventTransfer(
@@ -254,7 +254,7 @@ export class WETH9Processor extends BaseProcessor<
         null
       );
     }
-    return super.onEvent(handler, filter!, fetchConfig);
+    return super.onEthEvent(handler, filter!, fetchConfig);
   }
 
   onEventDeposit(
@@ -265,7 +265,7 @@ export class WETH9Processor extends BaseProcessor<
     if (!filter) {
       filter = templateContract.filters["Deposit(address,uint256)"](null, null);
     }
-    return super.onEvent(handler, filter!, fetchConfig);
+    return super.onEthEvent(handler, filter!, fetchConfig);
   }
 
   onEventWithdrawal(
@@ -279,84 +279,84 @@ export class WETH9Processor extends BaseProcessor<
         null
       );
     }
-    return super.onEvent(handler, filter!, fetchConfig);
+    return super.onEthEvent(handler, filter!, fetchConfig);
   }
 
   onCallName(
     handler: (call: NameCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0x06fdde03", handler as any, fetchConfig);
+    return super.onEthTrace("0x06fdde03", handler as any, fetchConfig);
   }
 
   onCallApprove(
     handler: (call: ApproveCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0x095ea7b3", handler as any, fetchConfig);
+    return super.onEthTrace("0x095ea7b3", handler as any, fetchConfig);
   }
 
   onCallTotalSupply(
     handler: (call: TotalSupplyCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0x18160ddd", handler as any, fetchConfig);
+    return super.onEthTrace("0x18160ddd", handler as any, fetchConfig);
   }
 
   onCallTransferFrom(
     handler: (call: TransferFromCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0x23b872dd", handler as any, fetchConfig);
+    return super.onEthTrace("0x23b872dd", handler as any, fetchConfig);
   }
 
   onCallWithdraw(
     handler: (call: WithdrawCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0x2e1a7d4d", handler as any, fetchConfig);
+    return super.onEthTrace("0x2e1a7d4d", handler as any, fetchConfig);
   }
 
   onCallDecimals(
     handler: (call: DecimalsCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0x313ce567", handler as any, fetchConfig);
+    return super.onEthTrace("0x313ce567", handler as any, fetchConfig);
   }
 
   onCallBalanceOf(
     handler: (call: BalanceOfCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0x70a08231", handler as any, fetchConfig);
+    return super.onEthTrace("0x70a08231", handler as any, fetchConfig);
   }
 
   onCallSymbol(
     handler: (call: SymbolCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0x95d89b41", handler as any, fetchConfig);
+    return super.onEthTrace("0x95d89b41", handler as any, fetchConfig);
   }
 
   onCallTransfer(
     handler: (call: TransferCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0xa9059cbb", handler as any, fetchConfig);
+    return super.onEthTrace("0xa9059cbb", handler as any, fetchConfig);
   }
 
   onCallDeposit(
     handler: (call: DepositCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0xd0e30db0", handler as any, fetchConfig);
+    return super.onEthTrace("0xd0e30db0", handler as any, fetchConfig);
   }
 
   onCallAllowance(
     handler: (call: AllowanceCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0xdd62ed3e", handler as any, fetchConfig);
+    return super.onEthTrace("0xdd62ed3e", handler as any, fetchConfig);
   }
 
   public static filters = {
@@ -428,7 +428,7 @@ export class WETH9ProcessorTemplate extends BaseProcessorTemplate<
         null
       );
     }
-    return super.onEvent(handler, filter!, fetchConfig);
+    return super.onEthEvent(handler, filter!, fetchConfig);
   }
 
   onEventTransfer(
@@ -443,7 +443,7 @@ export class WETH9ProcessorTemplate extends BaseProcessorTemplate<
         null
       );
     }
-    return super.onEvent(handler, filter!, fetchConfig);
+    return super.onEthEvent(handler, filter!, fetchConfig);
   }
 
   onEventDeposit(
@@ -454,7 +454,7 @@ export class WETH9ProcessorTemplate extends BaseProcessorTemplate<
     if (!filter) {
       filter = templateContract.filters["Deposit(address,uint256)"](null, null);
     }
-    return super.onEvent(handler, filter!, fetchConfig);
+    return super.onEthEvent(handler, filter!, fetchConfig);
   }
 
   onEventWithdrawal(
@@ -468,7 +468,7 @@ export class WETH9ProcessorTemplate extends BaseProcessorTemplate<
         null
       );
     }
-    return super.onEvent(handler, filter!, fetchConfig);
+    return super.onEthEvent(handler, filter!, fetchConfig);
   }
 }
 

package/src/eth/codegen/ethers-sentio.ts

@@ -116,25 +116,25 @@ export default class EthersSentio extends Ethers.default {
         const content = `
 
 ${contract.name}Processor.bind({ address: '${contract.address}', network: EthChainId.${chainKey} })
-  .onAllEvents((evt, ctx) => {
+  .onEvent((evt, ctx) => {
     ctx.meter.Counter('event_count').add(1, { name: evt.name })
     ctx.eventLogger.emit(evt.name, {
       ...evt.args.toObject(),
     })
 })
-  .onAllTraces(function (trace, ctx) {
-    const succeed = trace.error === undefined
-    ctx.meter.Counter('trace_count').add(1, { name: trace.name, success: String(succeed) })
-    if (succeed) {
-      ctx.eventLogger.emit(trace.name, {
-        distinctId: trace.action.from,
-        ...trace.args.toObject(),
-      })
-    }
-  })
 `
         exampleContent += content
       }
+      // .onAllTraces(function (trace, ctx) {
+      //   const succeed = trace.error === undefined
+      //   ctx.meter.Counter('trace_count').add(1, { name: trace.name, success: String(succeed) })
+      //   if (succeed) {
+      //     ctx.eventLogger.emit(trace.name, {
+      //       distinctId: trace.action.from,
+      //       ...trace.args.toObject(),
+      //     })
+      //   }
+      // })
 
       files.push({
         path: join(rootDir, 'processor.eth.example.ts'),

package/src/eth/codegen/event-handler.ts

@@ -16,7 +16,7 @@ export function generateEventHandler(event: EventDeclaration, contractName: stri
     if (!filter) {
       filter = templateContract.filters['${filterName}'](${event.inputs.map(() => 'null').join(',')})
     }
-    return super.onEvent(handler, filter!, fetchConfig)
+    return super.onEthEvent(handler, filter!, fetchConfig)
   }
   `
 }

package/src/eth/codegen/functions-handler.ts

@@ -47,7 +47,7 @@ function generateCallHandler(fn: FunctionDeclaration, contractName: string, over
     handler: (call: ${upperFirst(overloadedName ?? fn.name)}CallTrace, ctx: ${contractName}Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("${sighash}", handler as any, fetchConfig);
+    return super.onEthTrace("${sighash}", handler as any, fetchConfig);
   }
 `
 }

package/src/sui/sui-processor.ts

@@ -69,7 +69,7 @@ export class SuiBaseProcessor {
     return this.config.network
   }
 
-  public onMoveEvent(
+  protected onMoveEvent(
     handler: (event: SuiEvent, ctx: SuiContext) => void,
     filter: EventFilter | EventFilter[],
     fetchConfig?: Partial<MoveFetchConfig>
@@ -130,7 +130,7 @@ export class SuiBaseProcessor {
     return this
   }
 
-  public onEntryFunctionCall(
+  protected onEntryFunctionCall(
     handler: (call: MoveCallSuiTransaction, ctx: SuiContext) => void,
     filter: FunctionNameAndCallFilter | FunctionNameAndCallFilter[],
     fetchConfig?: Partial<MoveFetchConfig>
@@ -144,8 +144,6 @@ export class SuiBaseProcessor {
       _filters.push(filter)
     }
 
-    // const address = this.config.address
-    // const moduleName = this.moduleName
     const processor = this
     const allFunctionType = new Set(_filters.map((f) => processor.config.address + '::' + f.function))
 
@@ -193,4 +191,52 @@ export class SuiBaseProcessor {
     })
     return this
   }
+
+  onEvent(handler: (event: SuiEvent, ctx: SuiContext) => void, fetchConfig?: Partial<MoveFetchConfig>): this {
+    this.onMoveEvent(handler, { type: '' }, fetchConfig)
+    return this
+  }
+
+  onTransactionBlock(
+    handler: (call: SuiTransactionBlockResponse, ctx: SuiContext) => void,
+    includeFailed = false,
+    fetchConfig?: Partial<MoveFetchConfig>
+  ): this {
+    const _fetchConfig = MoveFetchConfig.fromPartial({ ...DEFAULT_FETCH_CONFIG, ...fetchConfig })
+
+    const processor = this
+
+    this.callHandlers.push({
+      handler: async function (data) {
+        if (!data.transaction) {
+          throw new ServerError(Status.INVALID_ARGUMENT, 'call is null')
+        }
+        const tx = data.transaction as SuiTransactionBlockResponse
+
+        const ctx = new SuiContext(
+          processor.moduleName,
+          processor.config.network,
+          processor.config.address,
+          data.timestamp || new Date(0),
+          data.slot,
+          tx,
+          0,
+          processor.config.baseLabels
+        )
+        if (tx) {
+          await handler(tx, ctx)
+        }
+        return ctx.getProcessResult()
+      },
+      filters: [{ function: '', includeFailed }],
+      fetchConfig: _fetchConfig,
+    })
+    return this
+  }
+}
+
+export class SuiModulesProcessor extends SuiBaseProcessor {
+  constructor(options: SuiBindOptions) {
+    super('*', options)
+  }
 }