@sentio/sdk 3.9.0-rc.9 → 4.0.0-rc.10

package/src/sui/sui-processor.ts

@@ -1,7 +1,15 @@
-import { Data_SuiCall, Data_SuiEvent, Data_SuiObjectChange, MoveFetchConfig } from '@sentio/protos'
+import {
+  type Data_SuiCall,
+  type Data_SuiEvent,
+  type Data_SuiObjectChange,
+  type MoveFetchConfig,
+  MoveFetchConfigSchema,
+  timestampDate
+} from '@sentio/protos'
+import { create } from '@bufbuild/protobuf'
 import { ListStateStorage } from '@sentio/runtime'
 import { SuiNetwork } from './network.js'
-import { ServerError, Status } from 'nice-grpc'
+import { ConnectError, Code } from '@connectrpc/connect'
 import { SuiContext, SuiObjectChangeContext } from './context.js'
 import type { SuiObjectChange } from '@mysten/sui/jsonRpc'
 import type { GrpcTypes } from '@mysten/sui/grpc'
@@ -22,12 +30,13 @@ import { ALL_ADDRESS, Labels, PromiseOrVoid } from '../core/index.js'
 import { Required } from 'utility-types'
 import { getHandlerName, proxyProcessor } from '../utils/metrics.js'
 import { HandlerOptions } from './models.js'
+import { toSuiClientEvent } from './to-client-types.js'
 
-export const DEFAULT_FETCH_CONFIG: MoveFetchConfig = {
+export const DEFAULT_FETCH_CONFIG: MoveFetchConfig = create(MoveFetchConfigSchema, {
   resourceChanges: false,
   allEvents: true,
   inputs: true
-}
+})
 
 export type IndexConfigure = Required<SuiBindOptions, 'startCheckpoint' | 'network'>
 
@@ -76,13 +85,13 @@ export class SuiBaseProcessor {
     return this.config.network
   }
 
-  protected onMoveEvent(
-    handler: (event: SuiEventInput, ctx: SuiContext) => PromiseOrVoid,
+  protected onMoveEvent<T extends SuiEventInput = SuiEventInput>(
+    handler: (event: T, ctx: SuiContext) => PromiseOrVoid,
     filter: EventFilter | EventFilter[],
-    handlerOptions?: HandlerOptions<MoveFetchConfig, SuiEventInput>
+    handlerOptions?: HandlerOptions<MoveFetchConfig, T>
   ): SuiBaseProcessor {
     let _filters: EventFilter[] = []
-    const _fetchConfig = MoveFetchConfig.fromPartial({ ...DEFAULT_FETCH_CONFIG, ...handlerOptions })
+    const _fetchConfig = create(MoveFetchConfigSchema, { ...DEFAULT_FETCH_CONFIG, ...handlerOptions })
 
     if (Array.isArray(filter)) {
       _filters = filter
@@ -99,11 +108,11 @@ export class SuiBaseProcessor {
       handlerName: getHandlerName(),
       handler: async function (data) {
         if (!data.rawTransaction) {
-          throw new ServerError(Status.INVALID_ARGUMENT, 'event is null')
+          throw new ConnectError('event is null', Code.InvalidArgument)
         }
         const txn = JSON.parse(data.rawTransaction) as GrpcTypes.ExecutedTransaction
 
-        const evt = JSON.parse(data.rawEvent) as SuiEventInput
+        const evt = toSuiClientEvent(JSON.parse(data.rawEvent))
         // gRPC events carry no sequence; index is resolved by the runtime.
         const idx = 0
 
@@ -111,15 +120,15 @@ export class SuiBaseProcessor {
           processor.moduleName,
           processor.config.network,
           processor.config.address,
-          data.timestamp || new Date(0),
+          data.timestamp ? timestampDate(data.timestamp) : new Date(0),
           data.slot,
           txn,
           idx,
           processor.config.baseLabels
         )
 
-        const decoded = await processor.coder.decodeEvent<any>(evt)
-        await handler(decoded || evt, ctx)
+        const decoded = await processor.coder.decodeEvent<T>(evt)
+        await handler((decoded || evt) as T, ctx)
 
         return ctx.stopAndGetResult()
       },
@@ -129,9 +138,9 @@ export class SuiBaseProcessor {
         const p = handlerOptions?.partitionKey
         if (!p) return undefined
         if (typeof p === 'function') {
-          const evt = JSON.parse(data.rawEvent) as SuiEventInput
+          const evt = toSuiClientEvent(JSON.parse(data.rawEvent))
           const decoded = await processor.coder.decodeEvent<any>(evt)
-          return p(decoded || evt)
+          return p((decoded || evt) as T)
         }
         return p
       }
@@ -139,13 +148,13 @@ export class SuiBaseProcessor {
     return this
   }
 
-  protected onEntryFunctionCall(
-    handler: (call: GrpcTypes.MoveCall, ctx: SuiContext) => PromiseOrVoid,
+  protected onEntryFunctionCall<T extends GrpcTypes.MoveCall = GrpcTypes.MoveCall>(
+    handler: (call: T, ctx: SuiContext) => PromiseOrVoid,
     filter: FunctionNameAndCallFilter | FunctionNameAndCallFilter[],
-    handlerOptions?: HandlerOptions<MoveFetchConfig, GrpcTypes.MoveCall>
+    handlerOptions?: HandlerOptions<MoveFetchConfig, T>
   ): SuiBaseProcessor {
     let _filters: FunctionNameAndCallFilter[] = []
-    const _fetchConfig = MoveFetchConfig.fromPartial({ ...DEFAULT_FETCH_CONFIG, ...handlerOptions })
+    const _fetchConfig = create(MoveFetchConfigSchema, { ...DEFAULT_FETCH_CONFIG, ...handlerOptions })
 
     if (Array.isArray(filter)) {
       _filters = filter
@@ -160,7 +169,7 @@ export class SuiBaseProcessor {
       handlerName: getHandlerName(),
       handler: async function (data) {
         if (!data.rawTransaction) {
-          throw new ServerError(Status.INVALID_ARGUMENT, 'call is null')
+          throw new ConnectError('call is null', Code.InvalidArgument)
         }
         const tx = JSON.parse(data.rawTransaction) as GrpcTypes.ExecutedTransaction
 
@@ -168,7 +177,7 @@ export class SuiBaseProcessor {
           processor.moduleName,
           processor.config.network,
           processor.config.address,
-          data.timestamp || new Date(0),
+          data.timestamp ? timestampDate(data.timestamp) : new Date(0),
           data.slot,
           tx,
           0,
@@ -178,7 +187,7 @@ export class SuiBaseProcessor {
           const calls = getMoveCalls(tx)
           const programmableTx = getProgrammableTransaction(tx)
           if (!programmableTx) {
-            throw new ServerError(Status.INVALID_ARGUMENT, 'Unexpected getTransactionKind get empty')
+            throw new ConnectError('Unexpected getTransactionKind get empty', Code.InvalidArgument)
           }
 
           // TODO potential pass index
@@ -205,7 +214,7 @@ export class SuiBaseProcessor {
           const calls = getMoveCalls(tx)
           // For simplicity, use the first call for partitioning
           if (calls.length > 0) {
-            return p(calls[0])
+            return p(calls[0] as T)
           }
           return undefined
         }
@@ -228,7 +237,7 @@ export class SuiBaseProcessor {
     filter?: TransactionFilter,
     handlerOptions?: HandlerOptions<MoveFetchConfig, GrpcTypes.ExecutedTransaction>
   ): this {
-    const _fetchConfig = MoveFetchConfig.fromPartial({ ...DEFAULT_FETCH_CONFIG, ...handlerOptions })
+    const _fetchConfig = create(MoveFetchConfigSchema, { ...DEFAULT_FETCH_CONFIG, ...handlerOptions })
 
     const processor = this
 
@@ -236,7 +245,7 @@ export class SuiBaseProcessor {
       handlerName: getHandlerName(),
       handler: async function (data) {
         if (!data.rawTransaction) {
-          throw new ServerError(Status.INVALID_ARGUMENT, 'transaction is null')
+          throw new ConnectError('transaction is null', Code.InvalidArgument)
         }
         const tx = JSON.parse(data.rawTransaction) as GrpcTypes.ExecutedTransaction
 
@@ -244,7 +253,7 @@ export class SuiBaseProcessor {
           processor.moduleName,
           processor.config.network,
           processor.config.address,
-          data.timestamp || new Date(0),
+          data.timestamp ? timestampDate(data.timestamp) : new Date(0),
           data.slot,
           tx,
           0,
@@ -275,7 +284,7 @@ export class SuiBaseProcessor {
     type: string | string[]
   ): this {
     if (this.config.network === SuiNetwork.TEST_NET) {
-      throw new ServerError(Status.INVALID_ARGUMENT, 'object change not supported in testnet')
+      throw new ConnectError('object change not supported in testnet', Code.InvalidArgument)
     }
     const processor = this
     this.objectChangeHandlers.push({
@@ -284,7 +293,7 @@ export class SuiBaseProcessor {
         const ctx = new SuiObjectChangeContext(
           processor.config.network,
           processor.config.address,
-          data.timestamp || new Date(0),
+          data.timestamp ? timestampDate(data.timestamp) : new Date(0),
           data.slot,
           data.txDigest,
           processor.config.baseLabels
@@ -316,7 +325,7 @@ export class SuiGlobalProcessor extends SuiBaseProcessor {
   ): this {
     // TODO enable more strict check
     // if (!filter.publicKeyPrefix || filter.publicKeyPrefix.length < 2) {
-    //   throw new ServerError(Status.INVALID_ARGUMENT, 'restriction too low for global processor')
+    //   throw new ConnectError('restriction too low for global processor', Code.InvalidArgument)
     // }
     return super.onTransactionBlock(handler, filter, fetchConfig)
   }

package/src/sui/to-client-types.ts

@@ -0,0 +1,75 @@
+import type { SuiClientTypes } from '@mysten/sui/client'
+import type { SuiEventInput, SuiMoveObjectInput } from '@typemove/sui'
+
+// The Sentio driver delivers Sui objects/events as protojson of the gRPC
+// `sui.rpc.v2.{Object,Event}` messages — field names like `objectType` and
+// `contents`. typemove's decoder, and the SDK's public handler types, speak
+// the unified `@mysten/sui/client` `SuiClientTypes` shape (`type`, `bcs`).
+// Normalize at the SDK boundary so nothing downstream ever sees the raw gRPC
+// shape: `getType`/`getData` resolve cleanly (`.type` / `.json`) and the
+// decoded envelope honestly matches its declared `SuiClientTypes.Object` type.
+// `SuiGrpcClient.core` performs the equivalent mapping for standalone callers,
+// so both delivery paths converge on `SuiClientTypes` before decoding.
+
+function base64ToBytes(b64: string): Uint8Array {
+  return new Uint8Array(Buffer.from(b64, 'base64'))
+}
+
+// Mirrors mapOwner in @mysten/sui's grpc core. protojson serializes the
+// Owner.OwnerKind enum to its proto value name and uint64 `version` to a string.
+function mapOwner(owner: any): SuiClientTypes.ObjectOwner | null {
+  if (!owner) {
+    return null
+  }
+  switch (owner.kind) {
+    case 'IMMUTABLE':
+      return { $kind: 'Immutable', Immutable: true }
+    case 'ADDRESS':
+      return { $kind: 'AddressOwner', AddressOwner: owner.address }
+    case 'OBJECT':
+      return { $kind: 'ObjectOwner', ObjectOwner: owner.address }
+    case 'SHARED':
+      return { $kind: 'Shared', Shared: { initialSharedVersion: String(owner.version) } }
+    case 'CONSENSUS_ADDRESS':
+      return {
+        $kind: 'ConsensusAddressOwner',
+        ConsensusAddressOwner: { startVersion: String(owner.version), owner: owner.address }
+      }
+    default:
+      return { $kind: 'Unknown' }
+  }
+}
+
+// protojson `sui.rpc.v2.Object` -> unified `SuiClientTypes.Object<{ json: true }>`.
+// Already-unified inputs (from `SuiGrpcClient.core`) pass through: `.type` and
+// `.json` are read with the gRPC names falling back to the unified ones. With
+// `Include = { json: true }` every field except objectId/version/digest/owner/
+// type/json is typed `undefined`, so we deliberately leave them unset.
+export function toSuiClientObject(o: any): SuiMoveObjectInput {
+  return {
+    objectId: o.objectId,
+    version: o.version,
+    digest: o.digest,
+    owner: mapOwner(o.owner)!,
+    type: o.objectType ?? o.type ?? '',
+    content: undefined,
+    previousTransaction: undefined,
+    objectBcs: undefined,
+    json: o.json ?? null,
+    display: undefined
+  } as SuiMoveObjectInput
+}
+
+// protojson `sui.rpc.v2.Event` -> unified `SuiClientTypes.Event`. The
+// discriminating fields (`eventType`, `json`) already share names; only the
+// BCS payload is renamed (`contents` -> `bcs`).
+export function toSuiClientEvent(e: any): SuiEventInput {
+  return {
+    packageId: e.packageId,
+    module: e.module,
+    sender: e.sender,
+    eventType: e.eventType ?? e.type ?? '',
+    bcs: e.contents?.value != null ? base64ToBytes(e.contents.value) : (e.bcs ?? new Uint8Array()),
+    json: e.json ?? null
+  } as SuiEventInput
+}

package/src/testing/aptos-facet.ts

@@ -1,5 +1,6 @@
 import { UserTransactionResponse, EntryFunctionPayloadResponse } from '@aptos-labs/ts-sdk'
-import { DataBinding, HandlerType } from '@sentio/protos'
+import { type DataBinding, DataBindingSchema, HandlerType } from '@sentio/protos'
+import { create } from '@bufbuild/protobuf'
 import { TestProcessorServer } from './test-processor-server.js'
 import { AptosNetwork } from '../aptos/index.js'
 import { parseMoveType, accountTypeString } from '../move/index.js'
@@ -40,16 +41,19 @@ export class AptosFacet {
       for (const callConfig of config.moveCallConfigs) {
         for (const callFilter of callConfig.filters) {
           if (accountTypeString(config.contract.address) + '::' + callFilter.function === payload.function) {
-            return {
+            return create(DataBindingSchema, {
               data: {
-                aptCall: {
-                  rawTransaction: JSON.stringify(transaction)
+                value: {
+                  case: 'aptCall',
+                  value: {
+                    rawTransaction: JSON.stringify(transaction)
+                  }
                 }
               },
               handlerIds: [callConfig.handlerId],
               handlerType: HandlerType.APT_CALL,
               chainId: network
-            }
+            })
           }
         }
       }
@@ -81,18 +85,21 @@ export class AptosFacet {
               accountTypeString(config.contract.address) + '::' + eventFilter.type ===
               parseMoveType(event.type).qname
             ) {
-              return {
+              return create(DataBindingSchema, {
                 data: {
-                  aptEvent: {
-                    rawEvent: JSON.stringify(event),
-                    eventIndex: idx,
-                    rawTransaction: JSON.stringify(transaction)
+                  value: {
+                    case: 'aptEvent',
+                    value: {
+                      rawEvent: JSON.stringify(event),
+                      eventIndex: idx,
+                      rawTransaction: JSON.stringify(transaction)
+                    }
                   }
                 },
                 handlerIds: [eventConfig.handlerId],
                 handlerType: HandlerType.APT_EVENT,
                 chainId: network
-              }
+              })
             }
           }
         }

package/src/testing/cosmos-facet.ts

@@ -1,5 +1,6 @@
 import { TestProcessorServer } from './test-processor-server.js'
-import { DataBinding, HandlerType } from '@sentio/protos'
+import { type DataBinding, DataBindingSchema, HandlerType, timestampNow } from '@sentio/protos'
+import { create } from '@bufbuild/protobuf'
 import { CosmosNetwork } from '../cosmos/network.js'
 
 export class CosmosFacet {
@@ -28,17 +29,20 @@ export class CosmosFacet {
       }
 
       for (const logConfig of config.cosmosLogConfigs) {
-        const binding = {
+        const binding = create(DataBindingSchema, {
           data: {
-            cosmosCall: {
-              transaction,
-              timestamp: new Date()
+            value: {
+              case: 'cosmosCall',
+              value: {
+                transaction,
+                timestamp: timestampNow()
+              }
             }
           },
           handlerIds: [logConfig.handlerId],
           handlerType: HandlerType.COSMOS_CALL,
           chainId: network
-        }
+        })
 
         const logFilters = logConfig.logFilters
         for (const log of transaction.logs || []) {

package/src/testing/eth-facet.ts

@@ -1,5 +1,12 @@
 import { TestProcessorServer } from './test-processor-server.js'
-import { DataBinding, HandlerType, ProcessBindingResponse } from '@sentio/protos'
+import {
+  type DataBinding,
+  DataBindingSchema,
+  HandlerType,
+  type ProcessBindingResponse,
+  timestampNow
+} from '@sentio/protos'
+import { create } from '@bufbuild/protobuf'
 import { Trace } from '../eth/eth.js'
 import { BlockParams, LogParams, TransactionResponseParams } from 'ethers/providers'
 import { ChainId, EthChainId } from '@sentio/chain'
@@ -48,17 +55,20 @@ export class EthFacet {
       }
       for (const config of contract.traceConfigs) {
         if (config.signature == signature) {
-          return {
+          return create(DataBindingSchema, {
             data: {
-              ethTrace: {
-                trace,
-                timestamp: new Date()
+              value: {
+                case: 'ethTrace',
+                value: {
+                  rawTrace: JSON.stringify(trace),
+                  timestamp: timestampNow()
+                }
               }
             },
             handlerIds: [config.handlerId],
             handlerType: HandlerType.ETH_TRACE,
             chainId: network
-          }
+          })
         }
       }
     }
@@ -116,14 +126,17 @@ export class EthFacet {
             break
           }
           if (match) {
-            return {
+            return create(DataBindingSchema, {
               data: {
-                ethLog: { log, timestamp: new Date(), rawLog: JSON.stringify(log) }
+                value: {
+                  case: 'ethLog',
+                  value: { timestamp: timestampNow(), rawLog: JSON.stringify(log) }
+                }
               },
               handlerIds: [config.handlerId],
               handlerType: HandlerType.ETH_LOG,
               chainId: network
-            }
+            })
           }
         }
       }
@@ -190,14 +203,17 @@ export class EthFacet {
             break
           }
           if (match) {
-            return {
+            return create(DataBindingSchema, {
               data: {
-                ethLog: { log, timestamp: new Date(), rawLog: JSON.stringify(log) }
+                value: {
+                  case: 'ethLog',
+                  value: { timestamp: timestampNow(), rawLog: JSON.stringify(log) }
+                }
               },
               handlerIds: [config.handlerId],
               handlerType: HandlerType.ETH_LOG,
               chainId: network
-            }
+            })
           }
         }
       }
@@ -230,14 +246,17 @@ export class EthFacet {
     block: Partial<BlockParams> & { number: number },
     network: EthChainId = EthChainId.ETHEREUM
   ): DataBinding {
-    const binding: DataBinding = {
+    const binding: DataBinding = create(DataBindingSchema, {
       data: {
-        ethBlock: { block }
+        value: {
+          case: 'ethBlock',
+          value: { rawBlock: JSON.stringify(block) }
+        }
       },
       handlerType: HandlerType.ETH_BLOCK,
       handlerIds: [],
       chainId: network
-    }
+    })
     for (const contract of this.server.contractConfigs) {
       if (contract.contract?.chainId !== network) {
         continue
@@ -282,14 +301,17 @@ export class EthFacet {
     transaction: Partial<TransactionResponseParams>,
     network: EthChainId = EthChainId.ETHEREUM
   ): DataBinding {
-    const binding: DataBinding = {
+    const binding: DataBinding = create(DataBindingSchema, {
       data: {
-        ethTransaction: { transaction, timestamp: new Date(), rawTransaction: JSON.stringify(transaction) }
+        value: {
+          case: 'ethTransaction',
+          value: { timestamp: timestampNow(), rawTransaction: JSON.stringify(transaction) }
+        }
       },
       handlerType: HandlerType.ETH_TRANSACTION,
       handlerIds: [],
       chainId: network
-    }
+    })
     for (const contract of this.server.contractConfigs) {
       if (contract.contract?.chainId !== network) {
         continue

package/src/testing/fuel-facet.ts

@@ -1,6 +1,7 @@
 import { TestProcessorServer } from './test-processor-server.js'
 import { FuelChainId } from '@sentio/chain'
-import { DataBinding, HandlerType } from '@sentio/protos'
+import { type DataBinding, DataBindingSchema, HandlerType, timestampNow } from '@sentio/protos'
+import { create } from '@bufbuild/protobuf'
 import { FuelNetwork } from '../fuel/index.js'
 import { getRpcEndpoint } from '../fuel/network.js'
 
@@ -47,33 +48,39 @@ export class FuelFacet {
         continue
       }
       for (const callConfig of config.fuelTransactionConfigs) {
-        const binding = {
+        const binding = create(DataBindingSchema, {
           data: {
-            fuelTransaction: {
-              transaction,
-              timestamp: new Date()
+            value: {
+              case: 'fuelTransaction',
+              value: {
+                transaction,
+                timestamp: timestampNow()
+              }
             }
           },
           handlerIds: [callConfig.handlerId],
           handlerType: HandlerType.FUEL_TRANSACTION,
           chainId: network
-        }
+        })
 
         res.push(binding)
       }
 
       for (const assetConfig of config.assetConfigs) {
-        const binding = {
+        const binding = create(DataBindingSchema, {
           data: {
-            fuelTransaction: {
-              transaction,
-              timestamp: new Date()
+            value: {
+              case: 'fuelTransaction',
+              value: {
+                transaction,
+                timestamp: timestampNow()
+              }
             }
           },
           handlerIds: [assetConfig.handlerId],
           handlerType: HandlerType.FUEL_TRANSACTION,
           chainId: network
-        }
+        })
 
         res.push(binding)
       }
@@ -89,20 +96,23 @@ export class FuelFacet {
 
       for (const config of this.server.contractConfigs) {
         for (const logConfig of config.fuelReceiptConfigs) {
-          const logIds = logConfig.log?.logIds ?? []
+          const logIds = logConfig.receiptFilter?.case === 'log' ? logConfig.receiptFilter.value.logIds : []
           if (logIds.includes(receipt.rb)) {
-            const binding = {
+            const binding = create(DataBindingSchema, {
               data: {
-                fuelLog: {
-                  transaction,
-                  timestamp: new Date(),
-                  receiptIndex: BigInt(i)
+                value: {
+                  case: 'fuelReceipt',
+                  value: {
+                    transaction,
+                    timestamp: timestampNow(),
+                    receiptIndex: BigInt(i)
+                  }
                 }
               },
               handlerIds: [logConfig.handlerId],
               handlerType: HandlerType.FUEL_RECEIPT,
               chainId: network
-            }
+            })
             res.push(binding)
           }
         }

package/src/testing/iota-facet.ts

@@ -1,5 +1,6 @@
 import { MoveCallIotaTransaction, IotaTransactionBlockResponse } from '@iota/iota-sdk/client'
-import { DataBinding, HandlerType } from '@sentio/protos'
+import { type DataBinding, DataBindingSchema, HandlerType, timestampFromDate, timestampNow } from '@sentio/protos'
+import { create } from '@bufbuild/protobuf'
 import { TestProcessorServer } from './test-processor-server.js'
 import { accountTypeString, parseMoveType, SPLITTER } from '../move/index.js'
 import { IotaNetwork } from '../iota/index.js'
@@ -47,18 +48,21 @@ export class IotaFacet {
         for (const callConfig of config.moveCallConfigs) {
           for (const callFilter of callConfig.filters) {
             if (accountTypeString(config.contract.address) + '::' + callFilter.function === functionType) {
-              return {
+              return create(DataBindingSchema, {
                 data: {
-                  suiCall: {
-                    rawTransaction: JSON.stringify(transaction),
-                    timestamp: new Date(),
-                    slot: 10000n
+                  value: {
+                    case: 'suiCall',
+                    value: {
+                      rawTransaction: JSON.stringify(transaction),
+                      timestamp: timestampNow(),
+                      slot: 10000n
+                    }
                   }
                 },
                 handlerIds: [callConfig.handlerId],
                 handlerType: HandlerType.SUI_CALL,
                 chainId: network
-              }
+              })
             }
           }
         }
@@ -91,18 +95,23 @@ export class IotaFacet {
       throw Error('Invalid test global transaction: ' + JSON.stringify(transaction))
     }
 
-    const binding: DataBinding = {
+    const binding: DataBinding = create(DataBindingSchema, {
       handlerIds,
       handlerType: HandlerType.SUI_CALL,
       data: {
-        suiCall: {
-          rawTransaction: JSON.stringify(transaction),
-          timestamp: transaction.timestampMs ? new Date(transaction.timestampMs) : new Date(),
-          slot: BigInt(transaction.checkpoint || 0)
+        value: {
+          case: 'suiCall',
+          value: {
+            rawTransaction: JSON.stringify(transaction),
+            timestamp: transaction.timestampMs
+              ? timestampFromDate(new Date(Number(transaction.timestampMs)))
+              : timestampNow(),
+            slot: BigInt(transaction.checkpoint || 0)
+          }
         }
       },
       chainId: network
-    }
+    })
     return this.server.processBinding(binding)
   }
 
@@ -123,19 +132,22 @@ export class IotaFacet {
               accountTypeString(config.contract.address) + '::' + eventFilter.type ===
               parseMoveType(event.type).qname
             ) {
-              return {
+              return create(DataBindingSchema, {
                 data: {
-                  suiEvent: {
-                    rawEvent: JSON.stringify(event),
-                    rawTransaction: JSON.stringify(transaction),
-                    timestamp: new Date(transaction.timestampMs || 0),
-                    slot: 10000n
+                  value: {
+                    case: 'suiEvent',
+                    value: {
+                      rawEvent: JSON.stringify(event),
+                      rawTransaction: JSON.stringify(transaction),
+                      timestamp: timestampFromDate(new Date(Number(transaction.timestampMs || 0))),
+                      slot: 10000n
+                    }
                   }
                 },
                 handlerIds: [eventConfig.handlerId],
                 handlerType: HandlerType.SUI_EVENT,
                 chainId: network
-              }
+              })
             }
           }
         }