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

package/src/eth/eth.ts

@@ -23,8 +23,9 @@ import {
 import type { AccessList } from 'ethers/transaction'
 import { ContractContext } from './context.js'
 import { getAddress } from 'ethers/address'
-import { getBigInt } from 'ethers/utils'
-import { EthCallContext, EthCallParam } from '@sentio/protos'
+import { getBigInt, getNumber } from 'ethers/utils'
+import { type EthCallContext, type EthCallParam, EthCallParamSchema } from '@sentio/protos'
+import { create } from '@bufbuild/protobuf'
 import { ALL_ADDRESS } from '../core/index.js'
 
 export interface IResult {
@@ -126,14 +127,14 @@ class FormattedTransactionReceipt implements TransactionReceiptParams {
     return this.data.transactionHash
   }
   get index(): number {
-    return this.data.transactionIndex
+    return getNumber(this.data.transactionIndex)
   }
 
   get blockHash(): string {
     return this.data.blockHash
   }
   get blockNumber(): number {
-    return this.data.blockNumber
+    return getNumber(this.data.blockNumber)
   }
   get logsBloom(): string {
     return this.data.logsBloom
@@ -178,10 +179,10 @@ class FormattedTransactionReceipt implements TransactionReceiptParams {
     return this._l1Fee !== undefined ? this._l1Fee : (this._l1Fee = allowNull(getBigInt)(this.data.l1Fee))
   }
   get type(): number {
-    return this.data.type
+    return allowNull(getNumber, 0)(this.data.type)
   }
   get status(): number | null {
-    return this.data.status
+    return allowNull(getNumber)(this.data.status)
   }
   get root(): string | null {
     return this.data.root
@@ -197,7 +198,7 @@ export class FormattedLog implements LogParams {
     return this.raw.blockHash
   }
   get blockNumber(): number {
-    return this.raw.blockNumber
+    return getNumber(this.raw.blockNumber)
   }
   get removed(): boolean {
     return this.raw.removed
@@ -213,11 +214,14 @@ export class FormattedLog implements LogParams {
   }
 
   get transactionIndex(): number {
-    return this.raw.transactionIndex
+    // Raw RPC logs carry these as hex strings (e.g. "0xf3"); coerce so the value honors the
+    // declared `number` type and is valid for the int32 RecordMetaData fields it feeds.
+    // (Restores the getNumber coercion that ethers' formatLog applied before #1411.)
+    return getNumber(this.raw.transactionIndex)
   }
 
   get index(): number {
-    return this.raw.logIndex
+    return getNumber(this.raw.logIndex)
   }
 
   get data(): string {
@@ -240,11 +244,12 @@ function formatLog(log: any): LogParams {
 }
 
 export function formatEthData(data: {
-  log?: any
-  block?: any
-  trace?: any
-  transaction?: any
-  transactionReceipt?: any
+  // raw_* JSON payloads sent by the driver
+  rawLog?: string
+  rawBlock?: string
+  rawTrace?: string
+  rawTransaction?: string
+  rawTransactionReceipt?: string
   __formattedEthData?: any
 }) {
   // Return cached result if it exists
@@ -253,22 +258,29 @@ export function formatEthData(data: {
   }
 
   try {
-    const log = data.log ? formatLog(data.log) : undefined
-    if (data.block && !data.block.transactions) {
-      data.block.transactions = []
+    // All Eth* data is delivered as raw_* JSON payloads; parse them here.
+    const logObj = data.rawLog ? JSON.parse(data.rawLog) : undefined
+    const blockObj = data.rawBlock ? JSON.parse(data.rawBlock) : undefined
+    const traceObj = data.rawTrace ? JSON.parse(data.rawTrace) : undefined
+    const transactionObj = data.rawTransaction ? JSON.parse(data.rawTransaction) : undefined
+    const transactionReceiptObj = data.rawTransactionReceipt ? JSON.parse(data.rawTransactionReceipt) : undefined
+
+    const log = logObj ? formatLog(logObj) : undefined
+    if (blockObj && !blockObj.transactions) {
+      blockObj.transactions = []
     }
-    const block = data.block ? formatRichBlock(data.block) : undefined
-    const trace = data.trace ? (data.trace as Trace) : undefined
+    const block = blockObj ? formatRichBlock(blockObj) : undefined
+    const trace = traceObj ? (traceObj 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'
+    if (transactionObj) {
+      if (!transactionObj.v) {
+        transactionObj.v = '0x1c'
+        transactionObj.r = '0x88ff6cf0fefd94db46111149ae4bfc179e9b94721fffd821d38d16464b3f71d0'
+        transactionObj.s = '0x45e0aff800961cfce805daef7016b9b675c137a6a41a548f7b60a3484c06a33a'
       }
-      transaction = formatTransactionResponse(data.transaction)
+      transaction = formatTransactionResponse(transactionObj)
     }
-    const transactionReceipt = data.transactionReceipt ? formatTransactionReceipt(data.transactionReceipt) : undefined
+    const transactionReceipt = transactionReceiptObj ? formatTransactionReceipt(transactionReceiptObj) : undefined
 
     const result = {
       log,
@@ -291,7 +303,7 @@ class FormattedTransactionResponse implements TransactionResponseParams {
   constructor(readonly raw: any) {}
 
   get blockNumber(): number | null {
-    return this.raw.blockNumber
+    return allowNull(getNumber)(this.raw.blockNumber)
   }
   _blockHash: string | undefined | null
   get blockHash(): string | null {
@@ -309,13 +321,15 @@ class FormattedTransactionResponse implements TransactionResponseParams {
     return this.raw.hash
   }
   get index(): number {
-    return this.raw.transactionIndex
+    // transactionIndex is absent for pending/partial txs; default to 0 (matches the prior
+    // `this.transaction.index || 0` handling) while still coercing hex strings when present.
+    return allowNull(getNumber, 0)(this.raw.transactionIndex)
   }
   get type(): number {
     if (this.raw.type === '0x' || this.raw.type == null) {
       return 0
     }
-    return this.raw.type
+    return getNumber(this.raw.type)
   }
   _to: string | null
   get to(): string | null {
@@ -332,7 +346,7 @@ class FormattedTransactionResponse implements TransactionResponseParams {
     return this._from ?? (this._from = getAddress(this.raw.from))
   }
   get nonce(): number {
-    return this.raw.nonce
+    return getNumber(this.raw.nonce)
   }
   _gasLimit: bigint
   get gasLimit(): bigint {
@@ -528,10 +542,10 @@ export function encodeCallData(
   try {
     const iface = new Interface([funcABI])
     const calldata = iface.encodeFunctionData(name, values)
-    return {
+    return create(EthCallParamSchema, {
       context,
       calldata
-    }
+    })
   } catch (e) {
     const stack = new Error().stack
     throw transformEtherError(e, undefined, stack)

package/src/eth/index.ts

@@ -13,7 +13,7 @@ export { AccountContext, ContractContext, GlobalContext, ContractView, BoundCont
 
 export { EthPlugin } from './eth-plugin.js'
 
-export { EthFetchConfig, PreprocessResult } from '@sentio/protos'
+export type { EthFetchConfig, PreprocessResult } from '@sentio/protos'
 
 export { EthChainId } from '@sentio/chain'
 

package/src/fuel/asset-processor.ts

@@ -1,5 +1,11 @@
 import { CallHandler, FuelBaseProcessor, FuelProcessorState } from './types.js'
-import { Data_FuelReceipt, Data_FuelTransaction, FuelAssetHandlerConfig_AssetFilter } from '@sentio/protos'
+import {
+  Data_FuelTransaction,
+  FuelAssetHandlerConfig_AssetFilter,
+  FuelAssetHandlerConfig_AssetFilterSchema,
+  timestampDate
+} from '@sentio/protos'
+import { create } from '@bufbuild/protobuf'
 import { FuelNetwork, getProvider } from './network.js'
 import { FuelContext } from './context.js'
 import { decodeFuelTransaction } from './transaction.js'
@@ -8,7 +14,7 @@ import { getOptionsSignature } from './fuel-processor.js'
 import { getHandlerName, proxyProcessor } from '../utils/metrics.js'
 
 export class FuelAssetProcessor implements FuelBaseProcessor<FuelAssetProcessorConfig> {
-  txHandlers: CallHandler<Data_FuelTransaction | Data_FuelReceipt>[] = []
+  txHandlers: CallHandler<Data_FuelTransaction>[] = []
   blockHandlers = []
   private provider: Provider
 
@@ -42,11 +48,13 @@ export class FuelAssetProcessor implements FuelBaseProcessor<FuelAssetProcessorC
     for (const assetId of assetIds) {
       for (const from of froms) {
         for (const to of tos) {
-          filters.push({
-            assetId: assetId,
-            fromAddress: from,
-            toAddress: to
-          })
+          filters.push(
+            create(FuelAssetHandlerConfig_AssetFilterSchema, {
+              assetId: assetId,
+              fromAddress: from,
+              toAddress: to
+            })
+          )
         }
       }
     }
@@ -94,7 +102,7 @@ export class FuelAssetProcessor implements FuelBaseProcessor<FuelAssetProcessorC
           this.config.chainId,
           assetId,
           this.config.name ?? '',
-          call.timestamp || new Date(0),
+          call.timestamp ? timestampDate(call.timestamp) : new Date(0),
           tx,
           null
         )

package/src/fuel/context.ts

@@ -1,6 +1,7 @@
 import { BaseContext, Labels, normalizeLabels } from '../core/index.js'
 import { FuelChainId } from '@sentio/chain'
-import { RecordMetaData } from '@sentio/protos'
+import { RecordMetaData, RecordMetaDataSchema } from '@sentio/protos'
+import { create } from '@bufbuild/protobuf'
 import type { CallResult, Contract } from 'fuels'
 import { InvocationScopeLike } from 'fuels'
 import { FuelBlock, FuelLog, FuelTransaction } from './types.js'
@@ -39,7 +40,7 @@ export class FuelContext extends BaseContext {
   }
 
   protected getMetaDataInternal(name: string, labels: Labels): RecordMetaData {
-    return {
+    return create(RecordMetaDataSchema, {
       address: this.contractAddress,
       contractName: this.contractName,
       blockNumber: BigInt(this.block?.height?.toString() ?? (this.transaction?.blockNumber || 0)),
@@ -49,7 +50,7 @@ export class FuelContext extends BaseContext {
       name: name,
       logIndex: this.logIndex,
       labels: normalizeLabels(labels)
-    }
+    })
   }
 }
 

package/src/fuel/fuel-plugin.ts

@@ -2,17 +2,22 @@ import { errorString, GLOBAL_CONFIG, mergeProcessResults, Plugin, PluginManager,
 import { PartitionHandlerManager } from '../core/index.js'
 import { HandlerRegister } from '../core/handler-register.js'
 import {
-  ContractConfig,
+  ContractConfigSchema,
   DataBinding,
+  FuelAssetHandlerConfigSchema,
+  FuelReceiptHandlerConfigSchema,
+  FuelTransactionHandlerConfigSchema,
   HandlerType,
   InitResponse,
+  OnIntervalConfigSchema,
   ProcessConfigResponse,
   ProcessResult,
   ProcessStreamResponse_Partitions,
+  ProcessStreamResponse_PartitionsSchema,
   StartRequest
 } from '@sentio/protos'
-
-import { ServerError, Status } from 'nice-grpc'
+import { create } from '@bufbuild/protobuf'
+import { ConnectError, Code } from '@connectrpc/connect'
 import { FuelAssetProcessor } from './asset-processor.js'
 import { FuelProcessorState } from './types.js'
 import { FuelProcessor } from './fuel-processor.js'
@@ -39,7 +44,7 @@ export class FuelPlugin extends Plugin {
         continue
       }
       const processorConfig = processor.config
-      const contractConfig = ContractConfig.fromPartial({
+      const contractConfig = create(ContractConfigSchema, {
         processorType: USER_PROCESSOR,
         contract: {
           name: processorConfig.name,
@@ -60,24 +65,25 @@ export class FuelPlugin extends Plugin {
         const handlerName = txHandler.handlerName
         if (processor instanceof FuelProcessor) {
           // on transaction
-          const fetchConfig = {
+          const fetchConfig = create(FuelTransactionHandlerConfigSchema, {
             handlerId,
             handlerName
-          }
+          })
           contractConfig.fuelTransactionConfigs.push(fetchConfig)
         } else if (processor instanceof FuelAssetProcessor) {
           const assetConfig = txHandler.assetConfig
-          contractConfig.assetConfigs.push({
-            filters: assetConfig?.filters || [],
+          contractConfig.assetConfigs.push(
+            create(FuelAssetHandlerConfigSchema, {
+              filters: assetConfig?.filters || [],
+              handlerId,
+              handlerName
+            })
+          )
+        } else if (processor instanceof FuelGlobalProcessor) {
+          const fetchConfig = create(FuelTransactionHandlerConfigSchema, {
             handlerId,
             handlerName
           })
-        } else if (processor instanceof FuelGlobalProcessor) {
-          const fetchConfig = {
-            handlerId,
-            handlerName,
-            filters: []
-          }
           contractConfig.fuelTransactionConfigs.push(fetchConfig)
           contractConfig.contract!.address = '*'
         }
@@ -92,39 +98,38 @@ export class FuelPlugin extends Plugin {
         )
         const handlerName = receiptHandler.handlerName
         if (processor instanceof FuelProcessor) {
-          contractConfig.fuelReceiptConfigs.push({
-            ...receiptHandler.receiptConfig,
-            handlerId,
-            handlerName
-          })
+          contractConfig.fuelReceiptConfigs.push(
+            create(FuelReceiptHandlerConfigSchema, {
+              ...receiptHandler.receiptConfig,
+              handlerId,
+              handlerName
+            })
+          )
         }
       }
 
       for (const blockHandler of processor.blockHandlers) {
         const handlerId = this.handlerRegister.register(blockHandler.handler, chainId)
         this.partitionManager.registerPartitionHandler(HandlerType.FUEL_BLOCK, handlerId, blockHandler.partitionHandler)
-        contractConfig.intervalConfigs.push({
-          slot: 0,
-          slotInterval: blockHandler.blockInterval,
-          minutes: 0,
-          minutesInterval: blockHandler.timeIntervalInMinutes,
-          handlerId: handlerId,
-          handlerName: blockHandler.handlerName,
-          fetchConfig: undefined
-          // fetchConfig: blockHandler.fetchConfig
-        })
+        contractConfig.intervalConfigs.push(
+          create(OnIntervalConfigSchema, {
+            slot: 0,
+            slotInterval: blockHandler.blockInterval,
+            minutes: 0,
+            minutesInterval: blockHandler.timeIntervalInMinutes,
+            handlerId: handlerId,
+            handlerName: blockHandler.handlerName,
+            fetchConfig: undefined
+            // fetchConfig: blockHandler.fetchConfig
+          })
+        )
       }
 
       config.contractConfigs.push(contractConfig)
     }
   }
 
-  supportedHandlers = [
-    HandlerType.FUEL_TRANSACTION,
-    HandlerType.FUEL_RECEIPT,
-    HandlerType.FUEL_CALL,
-    HandlerType.FUEL_BLOCK
-  ]
+  supportedHandlers = [HandlerType.FUEL_TRANSACTION, HandlerType.FUEL_RECEIPT, HandlerType.FUEL_BLOCK]
 
   processBinding(request: DataBinding): Promise<ProcessResult> {
     switch (request.handlerType) {
@@ -135,7 +140,7 @@ export class FuelPlugin extends Plugin {
       case HandlerType.FUEL_BLOCK:
         return this.processBlock(request)
       default:
-        throw new ServerError(Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType)
+        throw new ConnectError('No handle type registered ' + request.handlerType, Code.InvalidArgument)
     }
   }
 
@@ -143,41 +148,34 @@ export class FuelPlugin extends Plugin {
     let data: any
     switch (request.handlerType) {
       case HandlerType.FUEL_TRANSACTION:
-        if (!request.data?.fuelTransaction) {
-          throw new ServerError(Status.INVALID_ARGUMENT, "fuelTransaction can't be empty")
+        if (request.data?.value.case !== 'fuelTransaction') {
+          throw new ConnectError("fuelTransaction can't be empty", Code.InvalidArgument)
         }
-        data = request.data.fuelTransaction
+        data = request.data.value.value
         break
       case HandlerType.FUEL_RECEIPT:
-        if (!request.data?.fuelLog) {
-          throw new ServerError(Status.INVALID_ARGUMENT, "fuelReceipt can't be empty")
+        if (request.data?.value.case !== 'fuelLog') {
+          throw new ConnectError("fuelReceipt can't be empty", Code.InvalidArgument)
         }
-        data = request.data.fuelLog
+        data = request.data.value.value
         break
       case HandlerType.FUEL_BLOCK:
-        if (!request.data?.fuelBlock) {
-          throw new ServerError(Status.INVALID_ARGUMENT, "fuelBlock can't be empty")
-        }
-        data = request.data.fuelBlock
-        break
-      case HandlerType.FUEL_CALL:
-        // FUEL_CALL uses the same data as FUEL_TRANSACTION
-        if (!request.data?.fuelTransaction) {
-          throw new ServerError(Status.INVALID_ARGUMENT, "fuelTransaction can't be empty for FUEL_CALL")
+        if (request.data?.value.case !== 'fuelBlock') {
+          throw new ConnectError("fuelBlock can't be empty", Code.InvalidArgument)
         }
-        data = request.data.fuelTransaction
+        data = request.data.value.value
         break
       default:
-        throw new ServerError(Status.INVALID_ARGUMENT, 'No handle type registered ' + request.handlerType)
+        throw new ConnectError('No handle type registered ' + request.handlerType, Code.InvalidArgument)
     }
     const partitions = await this.partitionManager.processPartitionForHandlerType(
       request.handlerType,
       request.handlerIds,
       data
     )
-    return {
+    return create(ProcessStreamResponse_PartitionsSchema, {
       partitions
-    }
+    })
   }
 
   async start(request: StartRequest) {
@@ -186,15 +184,15 @@ export class FuelPlugin extends Plugin {
         await processor.configure()
       }
     } catch (e) {
-      throw new ServerError(Status.INTERNAL, 'error starting FuelPlugin: ' + errorString(e))
+      throw new ConnectError('error starting FuelPlugin: ' + errorString(e), Code.Internal)
     }
   }
 
   async processReceipt(binding: DataBinding): Promise<ProcessResult> {
-    const receipt = binding?.data?.fuelLog
+    const receipt = binding?.data?.value.case === 'fuelLog' ? binding.data.value.value : undefined
 
     if (!receipt?.transaction) {
-      throw new ServerError(Status.INVALID_ARGUMENT, "transaction can't be null")
+      throw new ConnectError("transaction can't be null", Code.InvalidArgument)
     }
 
     const promises: Promise<ProcessResult>[] = []
@@ -206,9 +204,9 @@ export class FuelPlugin extends Plugin {
           handlerId
         )(receipt)
         .catch((e: any) => {
-          throw new ServerError(
-            Status.INTERNAL,
-            'error processing transaction: ' + JSON.stringify(receipt) + '\n' + errorString(e)
+          throw new ConnectError(
+            'error processing transaction: ' + JSON.stringify(receipt) + '\n' + errorString(e),
+            Code.Internal
           )
         })
       if (GLOBAL_CONFIG.execution.sequential) {
@@ -220,10 +218,10 @@ export class FuelPlugin extends Plugin {
   }
 
   async processTransaction(binding: DataBinding): Promise<ProcessResult> {
-    if (!binding.data?.fuelTransaction?.transaction) {
-      throw new ServerError(Status.INVALID_ARGUMENT, "transaction can't be null")
+    if (binding.data?.value.case !== 'fuelTransaction' || !binding.data.value.value.transaction) {
+      throw new ConnectError("transaction can't be null", Code.InvalidArgument)
     }
-    const fuelTransaction = binding.data.fuelTransaction
+    const fuelTransaction = binding.data.value.value
 
     const promises: Promise<ProcessResult>[] = []
 
@@ -234,9 +232,9 @@ export class FuelPlugin extends Plugin {
           handlerId
         )(fuelTransaction)
         .catch((e: any) => {
-          throw new ServerError(
-            Status.INTERNAL,
-            'error processing transaction: ' + JSON.stringify(fuelTransaction.transaction) + '\n' + errorString(e)
+          throw new ConnectError(
+            'error processing transaction: ' + JSON.stringify(fuelTransaction.transaction) + '\n' + errorString(e),
+            Code.Internal
           )
         })
       if (GLOBAL_CONFIG.execution.sequential) {
@@ -248,10 +246,10 @@ export class FuelPlugin extends Plugin {
   }
 
   async processBlock(binding: DataBinding): Promise<ProcessResult> {
-    if (!binding.data?.fuelBlock?.block) {
-      throw new ServerError(Status.INVALID_ARGUMENT, "Block can't be empty")
+    if (binding.data?.value.case !== 'fuelBlock' || !binding.data.value.value.block) {
+      throw new ConnectError("Block can't be empty", Code.InvalidArgument)
     }
-    const ethBlock = binding.data.fuelBlock
+    const ethBlock = binding.data.value.value
 
     const promises: Promise<ProcessResult>[] = []
     for (const handlerId of binding.handlerIds) {
@@ -262,9 +260,9 @@ export class FuelPlugin extends Plugin {
         )(ethBlock)
         .catch((e: any) => {
           console.error('error processing block: ', e)
-          throw new ServerError(
-            Status.INTERNAL,
-            'error processing block: ' + ethBlock.block?.height + '\n' + errorString(e)
+          throw new ConnectError(
+            'error processing block: ' + (ethBlock.block as any)?.height + '\n' + errorString(e),
+            Code.Internal
           )
         })
       if (GLOBAL_CONFIG.execution.sequential) {

package/src/fuel/fuel-processor-template.ts

@@ -1,5 +1,6 @@
 import { FuelContext, FuelContractContext } from './context.js'
-import { HandleInterval, TemplateInstance } from '@sentio/protos'
+import { HandleInterval, HandleIntervalSchema, TemplateInstance, TemplateInstanceSchema } from '@sentio/protos'
+import { create } from '@bufbuild/protobuf'
 import { PromiseOrVoid } from '../core/promises.js'
 import { ListStateStorage, processMetrics } from '@sentio/runtime'
 import { Contract } from 'fuels'
@@ -53,7 +54,7 @@ export abstract class FuelBaseProcessorTemplate<TContract extends Contract> {
    * @param ctx
    */
   public bind(options: Omit<Omit<FuelProcessorConfig, 'chainId'>, 'abi'>, ctx: FuelContext): void {
-    const instance: TemplateInstance = {
+    const instance: TemplateInstance = create(TemplateInstanceSchema, {
       templateId: this.id,
       contract: {
         address: options.address,
@@ -65,7 +66,7 @@ export abstract class FuelBaseProcessorTemplate<TContract extends Contract> {
       endBlock: BigInt(options.endBlock || 0),
       baseLabels: {}
       // baseLabels: options.baseLabels
-    }
+    })
 
     ctx.sendTemplateInstance(instance)
 
@@ -130,10 +131,10 @@ export abstract class FuelBaseProcessorTemplate<TContract extends Contract> {
     return this.onInterval(
       handler,
       undefined,
-      {
+      create(HandleIntervalSchema, {
         recentInterval: blockInterval,
         backfillInterval: backfillBlockInterval
-      }
+      })
       // fetchConfig
     )
   }
@@ -146,7 +147,7 @@ export abstract class FuelBaseProcessorTemplate<TContract extends Contract> {
   ) {
     return this.onInterval(
       handler,
-      { recentInterval: timeIntervalInMinutes, backfillInterval: backfillBlockInterval },
+      create(HandleIntervalSchema, { recentInterval: timeIntervalInMinutes, backfillInterval: backfillBlockInterval }),
       undefined
       // fetchConfig
     )