@sentio/sdk 4.0.0-rc.8 → 4.0.0

package/src/sui/sui-object-processor.ts

@@ -16,8 +16,8 @@ import { create } from '@bufbuild/protobuf'
 import { ListStateStorage } from '@sentio/runtime'
 import { SuiNetwork } from './network.js'
 import { SuiAddressContext, SuiContext, SuiObjectChangeContext, SuiObjectContext } from './context.js'
-import type { SuiObjectChange } from '@mysten/sui/jsonRpc'
 import type { GrpcTypes } from '@mysten/sui/grpc'
+import type { SuiClientTypes } from '@mysten/sui/client'
 import type { SuiMoveObjectInput } from '@typemove/sui'
 import { ALL_ADDRESS, PromiseOrVoid } from '../core/index.js'
 import { configure, DEFAULT_FETCH_CONFIG, IndexConfigure, SuiBindOptions } from './sui-processor.js'
@@ -25,7 +25,7 @@ import { CallHandler, TransactionFilter, accountTypeString, ObjectChangeHandler
 import { ConnectError, Code } from '@connectrpc/connect'
 import { TypeDescriptor } from '@typemove/move'
 import { TypedSuiMoveObject } from './models.js'
-import { toSuiClientObject } from './to-client-types.js'
+import { toSuiClientChangedObjects, toSuiClientObjects } from './to-client-types.js'
 import { getHandlerName, proxyProcessor } from '../utils/metrics.js'
 
 export interface SuiObjectBindOptions {
@@ -191,10 +191,7 @@ export class SuiAddressProcessor extends SuiBaseObjectOrAddressProcessorInternal
     data: Data_SuiObject,
     ctx: SuiObjectContext
   ) {
-    return handler(
-      data.rawObjects.map((o) => toSuiClientObject(JSON.parse(o))),
-      ctx
-    )
+    return handler(await toSuiClientObjects(data.rawObjects.map((o) => JSON.parse(o))), ctx)
   }
 
   onTransactionBlock(
@@ -271,8 +268,8 @@ export class SuiObjectProcessor extends SuiBaseObjectOrAddressProcessorInternal<
       return
     }
     return handler(
-      toSuiClientObject(JSON.parse(data.rawSelf)),
-      data.rawObjects.map((o) => toSuiClientObject(JSON.parse(o))),
+      (await toSuiClientObjects([JSON.parse(data.rawSelf)]))[0],
+      await toSuiClientObjects(data.rawObjects.map((o) => JSON.parse(o))),
       ctx
     )
   }
@@ -310,16 +307,14 @@ export class SuiObjectTypeProcessor<T> extends SuiBaseObjectOrAddressProcessor<
       return
     }
     const object = await ctx.coder.filterAndDecodeObjects(this.objectType, [
-      toSuiClientObject(JSON.parse(data.rawSelf))
+      (await toSuiClientObjects([JSON.parse(data.rawSelf)]))[0]
     ])
-    return handler(
-      object[0],
-      data.rawObjects.map((o) => toSuiClientObject(JSON.parse(o))),
-      ctx
-    )
+    return handler(object[0], await toSuiClientObjects(data.rawObjects.map((o) => JSON.parse(o))), ctx)
   }
 
-  public onObjectChange(handler: (changes: SuiObjectChange[], ctx: SuiObjectChangeContext) => PromiseOrVoid): this {
+  public onObjectChange(
+    handler: (changes: SuiClientTypes.ChangedObject[], ctx: SuiObjectChangeContext) => PromiseOrVoid
+  ): this {
     if (this.config.network === SuiNetwork.TEST_NET) {
       throw new ConnectError('object change not supported in testnet', Code.InvalidArgument)
     }
@@ -335,7 +330,7 @@ export class SuiObjectTypeProcessor<T> extends SuiBaseObjectOrAddressProcessor<
           data.txDigest,
           processor.config.baseLabels
         )
-        await handler(data.rawChanges.map((r) => JSON.parse(r)) as SuiObjectChange[], ctx)
+        await handler(await toSuiClientChangedObjects(data.rawChanges.map((r) => JSON.parse(r))), ctx)
         return ctx.stopAndGetResult()
       },
       type: [this.objectType.getSignature()]
@@ -408,9 +403,6 @@ export class SuiWrappedObjectProcessor extends SuiBaseObjectOrAddressProcessorIn
     data: Data_SuiObject,
     ctx: SuiObjectContext
   ) {
-    return handler(
-      data.rawObjects.map((o) => toSuiClientObject(JSON.parse(o))),
-      ctx
-    )
+    return handler(await toSuiClientObjects(data.rawObjects.map((o) => JSON.parse(o))), ctx)
   }
 }

package/src/sui/sui-processor.ts

@@ -11,8 +11,8 @@ import { ListStateStorage } from '@sentio/runtime'
 import { SuiNetwork } from './network.js'
 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'
+import type { SuiClientTypes } from '@mysten/sui/client'
 import type { SuiEventInput } from '@typemove/sui'
 import {
   accountAddressString,
@@ -30,7 +30,7 @@ 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'
+import { toSuiClientChangedObjects, toSuiClientEvent } from './to-client-types.js'
 
 export const DEFAULT_FETCH_CONFIG: MoveFetchConfig = create(MoveFetchConfigSchema, {
   resourceChanges: false,
@@ -113,8 +113,9 @@ export class SuiBaseProcessor {
         const txn = JSON.parse(data.rawTransaction) as GrpcTypes.ExecutedTransaction
 
         const evt = toSuiClientEvent(JSON.parse(data.rawEvent))
-        // gRPC events carry no sequence; index is resolved by the runtime.
-        const idx = 0
+        // gRPC events carry no on-chain sequence; the driver supplies the event's
+        // index within the tx via the eventSeq field (mirrors json-rpc's id.eventSeq).
+        const idx = data.eventSeq
 
         const ctx = new SuiContext(
           processor.moduleName,
@@ -280,7 +281,7 @@ export class SuiBaseProcessor {
   }
 
   protected onObjectChange(
-    handler: (changes: SuiObjectChange[], ctx: SuiObjectChangeContext) => PromiseOrVoid,
+    handler: (changes: SuiClientTypes.ChangedObject[], ctx: SuiObjectChangeContext) => PromiseOrVoid,
     type: string | string[]
   ): this {
     if (this.config.network === SuiNetwork.TEST_NET) {
@@ -298,7 +299,7 @@ export class SuiBaseProcessor {
           data.txDigest,
           processor.config.baseLabels
         )
-        await handler(data.rawChanges.map((r) => JSON.parse(r)) as SuiObjectChange[], ctx)
+        await handler(await toSuiClientChangedObjects(data.rawChanges.map((r) => JSON.parse(r))), ctx)
         return ctx.stopAndGetResult()
       },
       type
@@ -332,7 +333,7 @@ export class SuiGlobalProcessor extends SuiBaseProcessor {
 
   // deprecated,, use object type processor
   public onObjectChange(
-    handler: (changes: SuiObjectChange[], ctx: SuiObjectChangeContext) => void,
+    handler: (changes: SuiClientTypes.ChangedObject[], ctx: SuiObjectChangeContext) => void,
     type: string | string[]
   ): this {
     return super.onObjectChange(handler, type)

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

@@ -1,4 +1,5 @@
 import type { SuiClientTypes } from '@mysten/sui/client'
+import { GrpcCoreClient, GrpcTypes } from '@mysten/sui/grpc'
 import type { SuiEventInput, SuiMoveObjectInput } from '@typemove/sui'
 
 // The Sentio driver delivers Sui objects/events as protojson of the gRPC
@@ -15,54 +16,71 @@ 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
+// protojson `sui.rpc.v2.Object[]` -> unified `SuiClientTypes.Object<{ json: true }>[]`.
+//
+// Same reuse strategy as `toSuiClientChangedObjects`: instead of mirroring the
+// object/owner mapping by hand, drive @mysten/sui's own `getObjects` mapping
+// (which also normalizes the struct tag and owner) through a fake transport, so
+// SDK upgrades stay in lockstep. `getObjects` chunks ids by 50 and calls
+// `ledgerService.batchGetObjects` per chunk reading `{ result: { oneofKind } }`
+// per request, so the fake returns objects keyed by the requested id.
+// `include: { json: true }` leaves content/objectBcs/previousTransaction/display
+// unset, matching the old hand-rolled output.
+// See https://github.com/MystenLabs/ts-sdks/blob/8588da38e0a813f87b345c348e63486a7a766a61/packages/sui/src/grpc/core.ts#L176
+export async function toSuiClientObjects(rawObjects: any[]): Promise<SuiMoveObjectInput[]> {
+  if (rawObjects.length === 0) {
+    return []
   }
-  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 }
+  const byId = new Map(rawObjects.map((o) => [o.objectId, GrpcTypes.Object.fromJson(o, { ignoreUnknownFields: true })]))
+  const core = new GrpcCoreClient({
+    client: {
+      ledgerService: {
+        batchGetObjects: async ({ requests }: any) => ({
+          response: {
+            objects: requests.map((r: any) => ({ result: { oneofKind: 'object', object: byId.get(r.objectId) } }))
+          }
+        })
       }
-    default:
-      return { $kind: 'Unknown' }
-  }
+    }
+  } as any)
+  const res: any = await core.getObjects({ objectIds: rawObjects.map((o) => o.objectId), include: { json: true } })
+  return res.objects as SuiMoveObjectInput[]
 }
 
-// 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.ChangedObject[]` -> unified `SuiClientTypes.ChangedObject[]`.
+//
+// Rather than mirror @mysten/sui's enum/owner mapping by hand, we reuse its own
+// `parseTransactionEffects` so SDK upgrades pick up upstream changes (new enum
+// values, owner kinds, bug fixes) automatically instead of silently drifting.
+// That function isn't exported, so we reach it through its only public caller,
+// `GrpcCoreClient.getTransaction`, fed by an in-memory fake transport that hands
+// back our changes as a protobuf-ts `TransactionEffects` message.
+//
+// Two upstream-internal details this depends on (both asserted by
+// to-client-types.test.ts, which fails loudly if an upgrade changes them):
+//   1. `parseTransactionEffects` dereferences `effects.status.error` unguarded on
+//      the non-success path, so a minimal `status: { success: true }` is required.
+//   2. `getTransaction` returns a `{ $kind: 'Transaction', Transaction }` union.
+// See https://github.com/MystenLabs/ts-sdks/blob/8588da38e0a813f87b345c348e63486a7a766a61/packages/sui/src/grpc/core.ts#L1132
+export async function toSuiClientChangedObjects(rawChanges: any[]): Promise<SuiClientTypes.ChangedObject[]> {
+  if (rawChanges.length === 0) {
+    return []
+  }
+  const effects = GrpcTypes.TransactionEffects.fromJson(
+    { status: { success: true }, changedObjects: rawChanges },
+    { ignoreUnknownFields: true }
+  )
+  const core = new GrpcCoreClient({
+    client: { ledgerService: { getTransaction: async () => ({ response: { transaction: { digest: '', effects } } }) } }
+  } as any)
+  const res: any = await core.getTransaction({ digest: '', include: { effects: true } })
+  return (res.Transaction ?? res).effects.changedObjects
 }
 
 // protojson `sui.rpc.v2.Event` -> unified `SuiClientTypes.Event`. The
 // discriminating fields (`eventType`, `json`) already share names; only the
 // BCS payload is renamed (`contents` -> `bcs`).
+// Source: https://github.com/MystenLabs/ts-sdks/blob/8588da38e0a813f87b345c348e63486a7a766a61/packages/sui/src/grpc/core.ts#L1279
 export function toSuiClientEvent(e: any): SuiEventInput {
   return {
     packageId: e.packageId,