@sentio/sdk 3.8.0-rc.3 → 3.9.0-rc.3

package/src/sui/codegen/codegen.ts

@@ -1,9 +1,8 @@
-import { SuiMoveNormalizedModule, SuiEvent, SuiMoveObject } from '@mysten/sui/jsonRpc'
-
 import * as fs from 'fs'
 import chalk from 'chalk'
 import { InternalMoveModule, InternalMoveStruct, structQname } from '@typemove/move'
 import { SuiCodegen as BaseSuiCodegen } from '@typemove/sui/codegen'
+import type { ModuleWithAddress, SuiEventInput, SuiMoveObjectInput } from '@typemove/sui'
 import path, { join } from 'path'
 import { SharedNetworkCodegen } from '../../move/shared-network-codegen.js'
 import { getRpcEndpoint, SuiNetwork } from '../network.js'
@@ -24,7 +23,7 @@ export async function codegen(
 }
 
 class SuiNetworkCodegen extends BaseSuiCodegen {
-  moduleGenerator: SharedNetworkCodegen<SuiNetwork, SuiMoveNormalizedModule, SuiEvent | SuiMoveObject>
+  moduleGenerator: SharedNetworkCodegen<SuiNetwork, ModuleWithAddress, SuiEventInput | SuiMoveObjectInput>
   SYSTEM_PACKAGE = '@sentio/sdk/sui'
 
   constructor(network: SuiNetwork) {
@@ -33,8 +32,8 @@ class SuiNetworkCodegen extends BaseSuiCodegen {
     const generator = this
     this.moduleGenerator = new (class extends SharedNetworkCodegen<
       SuiNetwork,
-      SuiMoveNormalizedModule,
-      SuiEvent | SuiMoveObject
+      ModuleWithAddress,
+      SuiEventInput | SuiMoveObjectInput
     > {
       ADDRESS_TYPE = 'string'
       PREFIX = 'Sui'

package/src/sui/context.ts

@@ -1,22 +1,17 @@
 import { RecordMetaData } from '@sentio/protos'
 import { type Labels, normalizeLabels } from '../index.js'
 import { getClient, SuiNetwork } from './network.js'
-import {
-  SuiTransactionBlockResponse,
-  SuiEvent,
-  SuiMoveNormalizedModule,
-  SuiMoveObject,
-  SuiJsonRpcClient
-} from '@mysten/sui/jsonRpc'
+import type { GrpcTypes, SuiGrpcClient } from '@mysten/sui/grpc'
+import type { ModuleWithAddress, SuiEventInput, SuiMoveObjectInput } from '@typemove/sui'
 import { MoveCoder } from './index.js'
 import { defaultMoveCoder } from './move-coder.js'
 import { MoveAccountContext, MoveContext } from '../move/index.js'
 
-export class SuiContext extends MoveContext<SuiNetwork, SuiMoveNormalizedModule, SuiEvent | SuiMoveObject> {
+export class SuiContext extends MoveContext<SuiNetwork, ModuleWithAddress, SuiEventInput | SuiMoveObjectInput> {
   moduleName: string
   timestamp: Date
   checkpoint: bigint
-  transaction: SuiTransactionBlockResponse
+  transaction: GrpcTypes.ExecutedTransaction
   eventIndex: number
   coder: MoveCoder
 
@@ -26,7 +21,7 @@ export class SuiContext extends MoveContext<SuiNetwork, SuiMoveNormalizedModule,
     address: string,
     timestamp: Date,
     checkpoint: bigint,
-    transaction: SuiTransactionBlockResponse,
+    transaction: GrpcTypes.ExecutedTransaction,
     eventIndex: number,
     baseLabels: Labels | undefined
   ) {
@@ -65,12 +60,16 @@ export class SuiContext extends MoveContext<SuiNetwork, SuiMoveNormalizedModule,
     }
   }
 
-  get client(): SuiJsonRpcClient {
+  get client(): SuiGrpcClient {
     return getClient(this.network)
   }
 }
 
-export class SuiObjectChangeContext extends MoveContext<SuiNetwork, SuiMoveNormalizedModule, SuiEvent | SuiMoveObject> {
+export class SuiObjectChangeContext extends MoveContext<
+  SuiNetwork,
+  ModuleWithAddress,
+  SuiEventInput | SuiMoveObjectInput
+> {
   timestamp: Date
   checkpoint: bigint
   coder: MoveCoder
@@ -115,7 +114,7 @@ export class SuiObjectChangeContext extends MoveContext<SuiNetwork, SuiMoveNorma
     }
   }
 
-  get client(): SuiJsonRpcClient {
+  get client(): SuiGrpcClient {
     return getClient(this.network)
   }
 }
@@ -123,8 +122,8 @@ export class SuiObjectChangeContext extends MoveContext<SuiNetwork, SuiMoveNorma
 // TODO address handler should use this context
 export class SuiAddressContext extends MoveAccountContext<
   SuiNetwork,
-  SuiMoveNormalizedModule,
-  SuiEvent | SuiMoveObject
+  ModuleWithAddress,
+  SuiEventInput | SuiMoveObjectInput
 > {
   address: string
   network: SuiNetwork
@@ -167,7 +166,7 @@ export class SuiAddressContext extends MoveAccountContext<
     }
   }
 
-  get client(): SuiJsonRpcClient {
+  get client(): SuiGrpcClient {
     return getClient(this.network)
   }
 

package/src/sui/ext/coin.ts

@@ -5,7 +5,9 @@ import { getPriceByType } from '../../utils/index.js'
 import { SuiChainId } from '@sentio/chain'
 // import { validateAndNormalizeAddress } from '../utils.js'
 import { getClient, SuiNetwork } from '../network.js'
-import { CoinMetadata } from '@mysten/sui/jsonRpc'
+import type { SuiClientTypes } from '@mysten/sui/client'
+
+type CoinMetadata = SuiClientTypes.CoinMetadata
 
 const WHITELISTED_COINS = new Map<string, BaseCoinInfo>()
 
@@ -96,7 +98,7 @@ export async function getCoinInfoWithFallback(type: string, network?: SuiNetwork
     let promise = COIN_METADATA_CACHE.get(key)
     if (!promise) {
       const client = getClient(network)
-      promise = client.getCoinMetadata({ coinType: type })
+      promise = client.getCoinMetadata({ coinType: type }).then((r) => r.coinMetadata)
       COIN_METADATA_CACHE.set(key, promise)
     }
     const meta = await promise

package/src/sui/ext/move-dex.ts

@@ -1,11 +1,11 @@
 import { BigDecimal } from '@sentio/bigdecimal'
 import { calculateValueInUsd, getCoinInfo, whitelistCoins, whiteListed } from './coin.js'
 import { MoveCoinList, MoveDex, moveGetPairValue, MovePoolAdaptor, BaseCoinInfo } from '../../move/ext/index.js'
-import { SuiEvent, SuiMoveNormalizedModule, SuiMoveObject } from '@mysten/sui/jsonRpc'
+import type { ModuleWithAddress, SuiEventInput, SuiMoveObjectInput } from '@typemove/sui'
 import { SuiNetwork } from '../network.js'
 import { SuiContext, SuiObjectContext } from '../context.js'
 
-export type PoolAdaptor<T> = MovePoolAdaptor<SuiMoveObject, T>
+export type PoolAdaptor<T> = MovePoolAdaptor<SuiMoveObjectInput, T>
 
 export class CoinList implements MoveCoinList<BaseCoinInfo, SuiNetwork> {
   calculateValueInUsd(amount: bigint, coinInfo: BaseCoinInfo, timestamp: number): Promise<BigDecimal> {
@@ -30,9 +30,9 @@ export const SuiCoinList = new CoinList()
 export class SuiDex<T> extends MoveDex<
   BaseCoinInfo,
   SuiNetwork,
-  SuiMoveNormalizedModule,
-  SuiMoveObject,
-  SuiEvent,
+  ModuleWithAddress,
+  SuiMoveObjectInput,
+  SuiEventInput,
   SuiContext,
   SuiObjectContext,
   T

package/src/sui/models.ts

@@ -1,10 +1,11 @@
-import type { SuiEvent, MoveCallSuiTransaction, SuiMoveObject } from '@mysten/sui/jsonRpc'
+import type { GrpcTypes } from '@mysten/sui/grpc'
+import type { SuiEventInput, SuiMoveObjectInput } from '@typemove/sui'
 import { DecodedStruct } from '@typemove/move'
 
-export type TypedEventInstance<T> = DecodedStruct<SuiEvent, T>
-export type TypedSuiMoveObject<T> = DecodedStruct<SuiMoveObject, T>
+export type TypedEventInstance<T> = DecodedStruct<SuiEventInput, T>
+export type TypedSuiMoveObject<T> = DecodedStruct<SuiMoveObjectInput, T>
 
-export type TypedFunctionPayload<T extends Array<any>> = MoveCallSuiTransaction & {
+export type TypedFunctionPayload<T extends Array<any>> = GrpcTypes.MoveCall & {
   /**
    * decoded argument data using ABI, undefined if there is decoding error, usually because the ABI/data mismatch
    */

package/src/sui/move-coder.ts

@@ -7,6 +7,7 @@ const CODERS = new Map<SuiNetwork, MoveCoder>()
 export function defaultMoveCoder(network: SuiNetwork = SuiNetwork.MAIN_NET): MoveCoder {
   let coder = CODERS.get(network)
   if (!coder) {
+    // @typemove/sui v2 MoveCoder is gRPC-backed.
     coder = new MoveCoder(getClient(network))
     CODERS.set(network, coder)
   }

package/src/sui/network.ts

@@ -1,7 +1,6 @@
 import { SuiChainId } from '@sentio/chain'
 import { Endpoints } from '@sentio/runtime'
-// import { ServerError, Status } from 'nice-grpc'
-import { SuiJsonRpcClient } from '@mysten/sui/jsonRpc'
+import { SuiGrpcClient } from '@mysten/sui/grpc'
 
 export type SuiNetwork = SuiChainId
 export const SuiNetwork = <const>{
@@ -17,13 +16,15 @@ function inferNetworkFromUrl(url: string): string {
   return 'custom'
 }
 
-export function getClient(network: SuiNetwork): SuiJsonRpcClient {
-  let chainServer = Endpoints.INSTANCE.chainServer.get(network)
-  if (!chainServer) {
-    chainServer = getRpcEndpoint(network)
-    // throw new ServerError(Status.INTERNAL, 'RPC endpoint not provided')
-  }
-  return new SuiJsonRpcClient({ url: chainServer, network: inferNetworkFromUrl(chainServer) })
+function endpointFor(network: SuiNetwork): string {
+  return Endpoints.INSTANCE.chainServer.get(network) ?? getRpcEndpoint(network)
+}
+
+// gRPC client used for the MoveCoder, generated view functions, and exposed to
+// processor handlers via `ctx.client`. @typemove/sui v2 is gRPC-only.
+export function getClient(network: SuiNetwork): SuiGrpcClient {
+  const chainServer = endpointFor(network)
+  return new SuiGrpcClient({ network: inferNetworkFromUrl(chainServer) as any, baseUrl: chainServer })
 }
 
 export function getRpcEndpoint(network: SuiNetwork): string {

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

@@ -1,7 +1,8 @@
 import { HandleInterval, MoveAccountFetchConfig, MoveFetchConfig, TemplateInstance } from '@sentio/protos'
 import { ListStateStorage, processMetrics } from '@sentio/runtime'
 import { SuiAddressContext, SuiContext, SuiObjectContext } from './context.js'
-import { SuiMoveObject, SuiTransactionBlockResponse } from '@mysten/sui/jsonRpc'
+import type { GrpcTypes } from '@mysten/sui/grpc'
+import type { SuiMoveObjectInput } from '@typemove/sui'
 import { PromiseOrVoid } from '../core/index.js'
 import {
   DEFAULT_ACCOUNT_FETCH_CONFIG,
@@ -233,13 +234,13 @@ export abstract class SuiObjectOrAddressProcessorTemplate<
 }
 
 class AddressTransactionHandler {
-  handler: (transaction: SuiTransactionBlockResponse, ctx: SuiContext) => void
+  handler: (transaction: GrpcTypes.ExecutedTransaction, ctx: SuiContext) => void
   filter?: TransactionFilter
   fetchConfig?: Partial<MoveFetchConfig>
 }
 
 export class SuiAddressProcessorTemplate extends SuiObjectOrAddressProcessorTemplate<
-  (objects: SuiMoveObject[], ctx: SuiAddressContext) => PromiseOrVoid,
+  (objects: SuiMoveObjectInput[], ctx: SuiAddressContext) => PromiseOrVoid,
   SuiBindOptions,
   SuiAddressProcessor
 > {
@@ -255,7 +256,7 @@ export class SuiAddressProcessorTemplate extends SuiObjectOrAddressProcessorTemp
   }
 
   onTransactionBlock(
-    handler: (transaction: SuiTransactionBlockResponse, ctx: SuiContext) => void,
+    handler: (transaction: GrpcTypes.ExecutedTransaction, ctx: SuiContext) => void,
     filter?: TransactionFilter,
     fetchConfig?: Partial<MoveFetchConfig>
   ): this {
@@ -269,7 +270,7 @@ export class SuiAddressProcessorTemplate extends SuiObjectOrAddressProcessorTemp
 }
 
 export class SuiObjectProcessorTemplate extends SuiObjectOrAddressProcessorTemplate<
-  (self: SuiMoveObject, dynamicFieldObjects: SuiMoveObject[], ctx: SuiObjectContext) => PromiseOrVoid,
+  (self: SuiMoveObjectInput, dynamicFieldObjects: SuiMoveObjectInput[], ctx: SuiObjectContext) => PromiseOrVoid,
   SuiObjectBindOptions,
   SuiObjectProcessor
 > {
@@ -281,7 +282,7 @@ export class SuiObjectProcessorTemplate extends SuiObjectOrAddressProcessorTempl
 }
 
 export class SuiWrappedObjectProcessorTemplate extends SuiObjectOrAddressProcessorTemplate<
-  (dynamicFieldObjects: SuiMoveObject[], ctx: SuiObjectContext) => PromiseOrVoid,
+  (dynamicFieldObjects: SuiMoveObjectInput[], ctx: SuiObjectContext) => PromiseOrVoid,
   SuiObjectBindOptions,
   SuiWrappedObjectProcessor
 > {

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

@@ -11,7 +11,9 @@ import {
 import { ListStateStorage } from '@sentio/runtime'
 import { SuiNetwork } from './network.js'
 import { SuiAddressContext, SuiContext, SuiObjectChangeContext, SuiObjectContext } from './context.js'
-import { SuiMoveObject, SuiObjectChange, SuiTransactionBlockResponse } from '@mysten/sui/jsonRpc'
+import type { SuiObjectChange } from '@mysten/sui/jsonRpc'
+import type { GrpcTypes } from '@mysten/sui/grpc'
+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'
 import { CallHandler, TransactionFilter, accountTypeString, ObjectChangeHandler } from '../move/index.js'
@@ -91,12 +93,12 @@ export abstract class SuiBaseObjectOrAddressProcessor<HandlerType> {
     return this.config.network
   }
 
-  // protected abstract transformObjects(objects: SuiMoveObject[]): SuiMoveObject[]
+  // protected abstract transformObjects(objects: SuiMoveObjectInput[]): SuiMoveObjectInput[]
 
   protected abstract doHandle(handler: HandlerType, data: Data_SuiObject, ctx: SuiObjectContext): Promise<any>
 
   public onInterval(
-    handler: HandlerType, //(resources: SuiMoveObject[], ctx: SuiObjectsContext) => PromiseOrVoid,
+    handler: HandlerType, //(resources: SuiMoveObjectInput[], ctx: SuiObjectsContext) => PromiseOrVoid,
     timeInterval: HandleInterval | undefined,
     checkpointInterval: HandleInterval | undefined,
     type: string | undefined,
@@ -167,7 +169,7 @@ abstract class SuiBaseObjectOrAddressProcessorInternal<
 }
 
 export class SuiAddressProcessor extends SuiBaseObjectOrAddressProcessorInternal<
-  (objects: SuiMoveObject[], ctx: SuiAddressContext) => PromiseOrVoid
+  (objects: SuiMoveObjectInput[], ctx: SuiAddressContext) => PromiseOrVoid
 > {
   callHandlers: CallHandler<Data_SuiCall>[] = []
 
@@ -176,15 +178,15 @@ export class SuiAddressProcessor extends SuiBaseObjectOrAddressProcessorInternal
   }
 
   protected async doHandle(
-    handler: (objects: SuiMoveObject[], ctx: SuiObjectContext) => PromiseOrVoid,
+    handler: (objects: SuiMoveObjectInput[], ctx: SuiObjectContext) => PromiseOrVoid,
     data: Data_SuiObject,
     ctx: SuiObjectContext
   ) {
-    return handler(data.rawObjects.map((o) => JSON.parse(o)) as SuiMoveObject[], ctx)
+    return handler(data.rawObjects.map((o) => JSON.parse(o)) as SuiMoveObjectInput[], ctx)
   }
 
   onTransactionBlock(
-    handler: (transaction: SuiTransactionBlockResponse, ctx: SuiContext) => PromiseOrVoid,
+    handler: (transaction: GrpcTypes.ExecutedTransaction, ctx: SuiContext) => PromiseOrVoid,
     filter?: TransactionFilter,
     fetchConfig?: Partial<MoveFetchConfig>
   ) {
@@ -205,7 +207,7 @@ export class SuiAddressProcessor extends SuiBaseObjectOrAddressProcessorInternal
         if (!data.rawTransaction) {
           throw new ServerError(Status.INVALID_ARGUMENT, 'transaction is null')
         }
-        const tx = JSON.parse(data.rawTransaction) as SuiTransactionBlockResponse
+        const tx = JSON.parse(data.rawTransaction) as GrpcTypes.ExecutedTransaction
 
         const ctx = new SuiContext(
           'object',
@@ -230,7 +232,7 @@ export class SuiAddressProcessor extends SuiBaseObjectOrAddressProcessorInternal
 }
 
 export class SuiObjectProcessor extends SuiBaseObjectOrAddressProcessorInternal<
-  (self: SuiMoveObject, dynamicFieldObjects: SuiMoveObject[], ctx: SuiObjectContext) => PromiseOrVoid
+  (self: SuiMoveObjectInput, dynamicFieldObjects: SuiMoveObjectInput[], ctx: SuiObjectContext) => PromiseOrVoid
 > {
   static bind(options: SuiObjectBindOptions): SuiObjectProcessor {
     return new SuiObjectProcessor({
@@ -244,7 +246,11 @@ export class SuiObjectProcessor extends SuiBaseObjectOrAddressProcessorInternal<
   }
 
   protected async doHandle(
-    handler: (self: SuiMoveObject, dynamicFieldObjects: SuiMoveObject[], ctx: SuiObjectContext) => PromiseOrVoid,
+    handler: (
+      self: SuiMoveObjectInput,
+      dynamicFieldObjects: SuiMoveObjectInput[],
+      ctx: SuiObjectContext
+    ) => PromiseOrVoid,
     data: Data_SuiObject,
     ctx: SuiObjectContext
   ) {
@@ -253,15 +259,15 @@ export class SuiObjectProcessor extends SuiBaseObjectOrAddressProcessorInternal<
       return
     }
     return handler(
-      JSON.parse(data.rawSelf) as SuiMoveObject,
-      data.rawObjects.map((o) => JSON.parse(o)) as SuiMoveObject[],
+      JSON.parse(data.rawSelf) as SuiMoveObjectInput,
+      data.rawObjects.map((o) => JSON.parse(o)) as SuiMoveObjectInput[],
       ctx
     )
   }
 }
 
 export class SuiObjectTypeProcessor<T> extends SuiBaseObjectOrAddressProcessor<
-  (self: TypedSuiMoveObject<T>, dynamicFieldObjects: SuiMoveObject[], ctx: SuiObjectContext) => PromiseOrVoid
+  (self: TypedSuiMoveObject<T>, dynamicFieldObjects: SuiMoveObjectInput[], ctx: SuiObjectContext) => PromiseOrVoid
 > {
   objectType: TypeDescriptor<T>
 
@@ -281,7 +287,7 @@ export class SuiObjectTypeProcessor<T> extends SuiBaseObjectOrAddressProcessor<
   protected async doHandle(
     handler: (
       self: TypedSuiMoveObject<T>,
-      dynamicFieldObjects: SuiMoveObject[],
+      dynamicFieldObjects: SuiMoveObjectInput[],
       ctx: SuiObjectContext
     ) => PromiseOrVoid,
     data: Data_SuiObject,
@@ -291,8 +297,10 @@ export class SuiObjectTypeProcessor<T> extends SuiBaseObjectOrAddressProcessor<
       console.log(`Sui object not existed in ${ctx.checkpoint}, please specific a start time`)
       return
     }
-    const object = await ctx.coder.filterAndDecodeObjects(this.objectType, [JSON.parse(data.rawSelf) as SuiMoveObject])
-    return handler(object[0], data.rawObjects.map((o) => JSON.parse(o)) as SuiMoveObject[], ctx)
+    const object = await ctx.coder.filterAndDecodeObjects(this.objectType, [
+      JSON.parse(data.rawSelf) as SuiMoveObjectInput
+    ])
+    return handler(object[0], data.rawObjects.map((o) => JSON.parse(o)) as SuiMoveObjectInput[], ctx)
   }
 
   public onObjectChange(handler: (changes: SuiObjectChange[], ctx: SuiObjectChangeContext) => PromiseOrVoid): this {
@@ -323,7 +331,7 @@ export class SuiObjectTypeProcessor<T> extends SuiBaseObjectOrAddressProcessor<
   public onTimeInterval(
     handler: (
       self: TypedSuiMoveObject<T>,
-      dynamicFieldObjects: SuiMoveObject[],
+      dynamicFieldObjects: SuiMoveObjectInput[],
       ctx: SuiObjectContext
     ) => PromiseOrVoid,
     timeIntervalInMinutes = 60,
@@ -345,7 +353,7 @@ export class SuiObjectTypeProcessor<T> extends SuiBaseObjectOrAddressProcessor<
   public onCheckpointInterval(
     handler: (
       self: TypedSuiMoveObject<T>,
-      dynamicFieldObjects: SuiMoveObject[],
+      dynamicFieldObjects: SuiMoveObjectInput[],
       ctx: SuiObjectContext
     ) => PromiseOrVoid,
     checkpointInterval = 100000,
@@ -363,7 +371,7 @@ export class SuiObjectTypeProcessor<T> extends SuiBaseObjectOrAddressProcessor<
 }
 
 export class SuiWrappedObjectProcessor extends SuiBaseObjectOrAddressProcessorInternal<
-  (dynamicFieldObjects: SuiMoveObject[], ctx: SuiObjectContext) => PromiseOrVoid
+  (dynamicFieldObjects: SuiMoveObjectInput[], ctx: SuiObjectContext) => PromiseOrVoid
 > {
   static bind(options: SuiObjectBindOptions): SuiWrappedObjectProcessor {
     return new SuiWrappedObjectProcessor({
@@ -377,10 +385,10 @@ export class SuiWrappedObjectProcessor extends SuiBaseObjectOrAddressProcessorIn
   }
 
   protected async doHandle(
-    handler: (dynamicFieldObjects: SuiMoveObject[], ctx: SuiObjectContext) => PromiseOrVoid,
+    handler: (dynamicFieldObjects: SuiMoveObjectInput[], ctx: SuiObjectContext) => PromiseOrVoid,
     data: Data_SuiObject,
     ctx: SuiObjectContext
   ) {
-    return handler(data.rawObjects.map((o) => JSON.parse(o)) as SuiMoveObject[], ctx)
+    return handler(data.rawObjects.map((o) => JSON.parse(o)) as SuiMoveObjectInput[], ctx)
   }
 }

package/src/sui/sui-processor.ts

@@ -3,7 +3,9 @@ import { ListStateStorage } from '@sentio/runtime'
 import { SuiNetwork } from './network.js'
 import { ServerError, Status } from 'nice-grpc'
 import { SuiContext, SuiObjectChangeContext } from './context.js'
-import { MoveCallSuiTransaction, SuiEvent, SuiTransactionBlockResponse, SuiObjectChange } from '@mysten/sui/jsonRpc'
+import type { SuiObjectChange } from '@mysten/sui/jsonRpc'
+import type { GrpcTypes } from '@mysten/sui/grpc'
+import type { SuiEventInput } from '@typemove/sui'
 import {
   accountAddressString,
   CallHandler,
@@ -14,7 +16,7 @@ import {
   SPLITTER,
   TransactionFilter
 } from '../move/index.js'
-import { getMoveCalls } from './utils.js'
+import { getMoveCalls, getProgrammableTransaction } from './utils.js'
 import { defaultMoveCoder, MoveCoder } from './index.js'
 import { ALL_ADDRESS, Labels, PromiseOrVoid } from '../core/index.js'
 import { Required } from 'utility-types'
@@ -75,9 +77,9 @@ export class SuiBaseProcessor {
   }
 
   protected onMoveEvent(
-    handler: (event: SuiEvent, ctx: SuiContext) => PromiseOrVoid,
+    handler: (event: SuiEventInput, ctx: SuiContext) => PromiseOrVoid,
     filter: EventFilter | EventFilter[],
-    handlerOptions?: HandlerOptions<MoveFetchConfig, SuiEvent>
+    handlerOptions?: HandlerOptions<MoveFetchConfig, SuiEventInput>
   ): SuiBaseProcessor {
     let _filters: EventFilter[] = []
     const _fetchConfig = MoveFetchConfig.fromPartial({ ...DEFAULT_FETCH_CONFIG, ...handlerOptions })
@@ -99,13 +101,11 @@ export class SuiBaseProcessor {
         if (!data.rawTransaction) {
           throw new ServerError(Status.INVALID_ARGUMENT, 'event is null')
         }
-        const txn = JSON.parse(data.rawTransaction) as SuiTransactionBlockResponse
-        if (txn.events == null) {
-          txn.events = []
-        }
+        const txn = JSON.parse(data.rawTransaction) as GrpcTypes.ExecutedTransaction
 
-        const evt = JSON.parse(data.rawEvent) as SuiEvent
-        const idx = Number(evt.id.eventSeq) || 0
+        const evt = JSON.parse(data.rawEvent) as SuiEventInput
+        // gRPC events carry no sequence; index is resolved by the runtime.
+        const idx = 0
 
         const ctx = new SuiContext(
           processor.moduleName,
@@ -129,7 +129,7 @@ export class SuiBaseProcessor {
         const p = handlerOptions?.partitionKey
         if (!p) return undefined
         if (typeof p === 'function') {
-          const evt = JSON.parse(data.rawEvent) as SuiEvent
+          const evt = JSON.parse(data.rawEvent) as SuiEventInput
           const decoded = await processor.coder.decodeEvent<any>(evt)
           return p(decoded || evt)
         }
@@ -140,9 +140,9 @@ export class SuiBaseProcessor {
   }
 
   protected onEntryFunctionCall(
-    handler: (call: MoveCallSuiTransaction, ctx: SuiContext) => PromiseOrVoid,
+    handler: (call: GrpcTypes.MoveCall, ctx: SuiContext) => PromiseOrVoid,
     filter: FunctionNameAndCallFilter | FunctionNameAndCallFilter[],
-    handlerOptions?: HandlerOptions<MoveFetchConfig, MoveCallSuiTransaction>
+    handlerOptions?: HandlerOptions<MoveFetchConfig, GrpcTypes.MoveCall>
   ): SuiBaseProcessor {
     let _filters: FunctionNameAndCallFilter[] = []
     const _fetchConfig = MoveFetchConfig.fromPartial({ ...DEFAULT_FETCH_CONFIG, ...handlerOptions })
@@ -162,7 +162,7 @@ export class SuiBaseProcessor {
         if (!data.rawTransaction) {
           throw new ServerError(Status.INVALID_ARGUMENT, 'call is null')
         }
-        const tx = JSON.parse(data.rawTransaction) as SuiTransactionBlockResponse
+        const tx = JSON.parse(data.rawTransaction) as GrpcTypes.ExecutedTransaction
 
         const ctx = new SuiContext(
           processor.moduleName,
@@ -175,15 +175,12 @@ export class SuiBaseProcessor {
           processor.config.baseLabels
         )
         if (tx) {
-          const calls: MoveCallSuiTransaction[] = getMoveCalls(tx)
-          const txKind = tx.transaction?.data?.transaction
-          if (!txKind) {
+          const calls = getMoveCalls(tx)
+          const programmableTx = getProgrammableTransaction(tx)
+          if (!programmableTx) {
             throw new ServerError(Status.INVALID_ARGUMENT, 'Unexpected getTransactionKind get empty')
           }
 
-          // getProgrammableTransaction(txKind)
-          const programmableTx = txKind.kind === 'ProgrammableTransaction' ? txKind : undefined
-
           // TODO potential pass index
           for (const call of calls) {
             const functionType = [call.module, call.function].join(SPLITTER)
@@ -192,7 +189,7 @@ export class SuiBaseProcessor {
             }
 
             // TODO maybe do in parallel
-            const decoded = await processor.coder.decodeFunctionPayload(call, programmableTx?.inputs || [])
+            const decoded = await processor.coder.decodeFunctionPayload(call, programmableTx.inputs)
             await handler(decoded, ctx)
           }
         }
@@ -204,8 +201,8 @@ export class SuiBaseProcessor {
         const p = handlerOptions?.partitionKey
         if (!p) return undefined
         if (typeof p === 'function') {
-          const tx = JSON.parse(data.rawTransaction) as SuiTransactionBlockResponse
-          const calls: MoveCallSuiTransaction[] = getMoveCalls(tx)
+          const tx = JSON.parse(data.rawTransaction) as GrpcTypes.ExecutedTransaction
+          const calls = getMoveCalls(tx)
           // For simplicity, use the first call for partitioning
           if (calls.length > 0) {
             return p(calls[0])
@@ -219,17 +216,17 @@ export class SuiBaseProcessor {
   }
 
   onEvent(
-    handler: (event: SuiEvent, ctx: SuiContext) => void,
-    handlerOptions?: HandlerOptions<MoveFetchConfig, SuiEvent>
+    handler: (event: SuiEventInput, ctx: SuiContext) => void,
+    handlerOptions?: HandlerOptions<MoveFetchConfig, SuiEventInput>
   ): this {
     this.onMoveEvent(handler, { type: '' }, handlerOptions)
     return this
   }
 
   onTransactionBlock(
-    handler: (transaction: SuiTransactionBlockResponse, ctx: SuiContext) => PromiseOrVoid,
+    handler: (transaction: GrpcTypes.ExecutedTransaction, ctx: SuiContext) => PromiseOrVoid,
     filter?: TransactionFilter,
-    handlerOptions?: HandlerOptions<MoveFetchConfig, SuiTransactionBlockResponse>
+    handlerOptions?: HandlerOptions<MoveFetchConfig, GrpcTypes.ExecutedTransaction>
   ): this {
     const _fetchConfig = MoveFetchConfig.fromPartial({ ...DEFAULT_FETCH_CONFIG, ...handlerOptions })
 
@@ -241,7 +238,7 @@ export class SuiBaseProcessor {
         if (!data.rawTransaction) {
           throw new ServerError(Status.INVALID_ARGUMENT, 'transaction is null')
         }
-        const tx = JSON.parse(data.rawTransaction) as SuiTransactionBlockResponse
+        const tx = JSON.parse(data.rawTransaction) as GrpcTypes.ExecutedTransaction
 
         const ctx = new SuiContext(
           processor.moduleName,
@@ -264,7 +261,7 @@ export class SuiBaseProcessor {
         const p = handlerOptions?.partitionKey
         if (!p) return undefined
         if (typeof p === 'function') {
-          const tx = JSON.parse(data.rawTransaction) as SuiTransactionBlockResponse
+          const tx = JSON.parse(data.rawTransaction) as GrpcTypes.ExecutedTransaction
           return p(tx)
         }
         return p
@@ -313,7 +310,7 @@ export class SuiGlobalProcessor extends SuiBaseProcessor {
     return new SuiGlobalProcessor(ALL_ADDRESS, { ...options, address: ALL_ADDRESS })
   }
   onTransactionBlock(
-    handler: (transaction: SuiTransactionBlockResponse, ctx: SuiContext) => void,
+    handler: (transaction: GrpcTypes.ExecutedTransaction, ctx: SuiContext) => void,
     filter: TransactionFilter,
     fetchConfig?: Partial<MoveFetchConfig>
   ): this {

package/src/sui/utils.ts

@@ -1,26 +1,23 @@
-import {
-  SuiTransactionBlockResponse,
-  MoveCallSuiTransaction,
-  ProgrammableTransaction,
-  SuiTransaction
-} from '@mysten/sui/jsonRpc'
+import type { GrpcTypes } from '@mysten/sui/grpc'
 import { accountTypeString } from '@typemove/move'
 
-export function getMoveCalls(txBlock: SuiTransactionBlockResponse) {
-  const txKind = txBlock.transaction?.data.transaction
-  if (!txKind) {
-    return []
-  }
-  const programmableTx: ProgrammableTransaction | undefined =
-    txKind.kind === 'ProgrammableTransaction' ? txKind : undefined
+export function getProgrammableTransaction(
+  txBlock: GrpcTypes.ExecutedTransaction
+): GrpcTypes.ProgrammableTransaction | undefined {
+  const data = txBlock.transaction?.kind?.data
+  return data?.oneofKind === 'programmableTransaction' ? data.programmableTransaction : undefined
+}
+
+export function getMoveCalls(txBlock: GrpcTypes.ExecutedTransaction): GrpcTypes.MoveCall[] {
+  const programmableTx = getProgrammableTransaction(txBlock)
   if (!programmableTx) {
     return []
   }
 
-  return programmableTx.transactions.flatMap((tx: SuiTransaction) => {
-    if ('MoveCall' in tx) {
-      const call = tx.MoveCall as MoveCallSuiTransaction
-      call.package = accountTypeString(call.package)
+  return programmableTx.commands.flatMap((cmd) => {
+    if (cmd.command.oneofKind === 'moveCall') {
+      const call = cmd.command.moveCall
+      call.package = accountTypeString(call.package ?? '')
 
       return [call]
     }