@sentio/sdk 2.13.0-rc.1 → 2.13.0-rc.2

package/src/aptos/builtin/0x3.ts

@@ -201,7 +201,7 @@ export class token extends AptosBaseProcessor {
       event: token.CreateCollectionEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token {
     this.onMoveEvent(
       func,
@@ -218,7 +218,7 @@ export class token extends AptosBaseProcessor {
       event: token.CreateTokenDataEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token {
     this.onMoveEvent(
       func,
@@ -232,7 +232,7 @@ export class token extends AptosBaseProcessor {
 
   onEventMintTokenEvent(
     func: (event: token.MintTokenEventInstance, ctx: AptosContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token {
     this.onMoveEvent(
       func,
@@ -246,7 +246,7 @@ export class token extends AptosBaseProcessor {
 
   onEventDepositEvent(
     func: (event: token.DepositEventInstance, ctx: AptosContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token {
     this.onMoveEvent(
       func,
@@ -260,7 +260,7 @@ export class token extends AptosBaseProcessor {
 
   onEventWithdrawEvent(
     func: (event: token.WithdrawEventInstance, ctx: AptosContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token {
     this.onMoveEvent(
       func,
@@ -274,7 +274,7 @@ export class token extends AptosBaseProcessor {
 
   onEventBurnTokenEvent(
     func: (event: token.BurnTokenEventInstance, ctx: AptosContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token {
     this.onMoveEvent(
       func,
@@ -291,7 +291,7 @@ export class token extends AptosBaseProcessor {
       event: token.MutateTokenPropertyMapEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token {
     this.onMoveEvent(
       func,
@@ -668,7 +668,7 @@ export class token_coin_swap extends AptosBaseProcessor {
       event: token_coin_swap.TokenListingEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token_coin_swap {
     this.onMoveEvent(
       func,
@@ -685,7 +685,7 @@ export class token_coin_swap extends AptosBaseProcessor {
       event: token_coin_swap.TokenSwapEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token_coin_swap {
     this.onMoveEvent(
       func,
@@ -845,7 +845,7 @@ export class token_transfers extends AptosBaseProcessor {
       event: token_transfers.TokenOfferEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token_transfers {
     this.onMoveEvent(
       func,
@@ -862,7 +862,7 @@ export class token_transfers extends AptosBaseProcessor {
       event: token_transfers.TokenCancelOfferEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token_transfers {
     this.onMoveEvent(
       func,
@@ -879,7 +879,7 @@ export class token_transfers extends AptosBaseProcessor {
       event: token_transfers.TokenClaimEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token_transfers {
     this.onMoveEvent(
       func,
@@ -1000,7 +1000,7 @@ export class token_event_store extends AptosBaseProcessor {
       event: token_event_store.CollectionUriMutateEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token_event_store {
     this.onMoveEvent(
       func,
@@ -1017,7 +1017,7 @@ export class token_event_store extends AptosBaseProcessor {
       event: token_event_store.CollectionMaxiumMutateEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token_event_store {
     this.onMoveEvent(
       func,
@@ -1034,7 +1034,7 @@ export class token_event_store extends AptosBaseProcessor {
       event: token_event_store.CollectionDescriptionMutateEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token_event_store {
     this.onMoveEvent(
       func,
@@ -1051,7 +1051,7 @@ export class token_event_store extends AptosBaseProcessor {
       event: token_event_store.OptInTransferEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token_event_store {
     this.onMoveEvent(
       func,
@@ -1068,7 +1068,7 @@ export class token_event_store extends AptosBaseProcessor {
       event: token_event_store.UriMutationEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token_event_store {
     this.onMoveEvent(
       func,
@@ -1085,7 +1085,7 @@ export class token_event_store extends AptosBaseProcessor {
       event: token_event_store.DefaultPropertyMutateEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token_event_store {
     this.onMoveEvent(
       func,
@@ -1102,7 +1102,7 @@ export class token_event_store extends AptosBaseProcessor {
       event: token_event_store.DescriptionMutateEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token_event_store {
     this.onMoveEvent(
       func,
@@ -1119,7 +1119,7 @@ export class token_event_store extends AptosBaseProcessor {
       event: token_event_store.RoyaltyMutateEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token_event_store {
     this.onMoveEvent(
       func,
@@ -1136,7 +1136,7 @@ export class token_event_store extends AptosBaseProcessor {
       event: token_event_store.MaxiumMutateEventInstance,
       ctx: AptosContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): token_event_store {
     this.onMoveEvent(
       func,

package/src/move/abstract-codegen.ts

@@ -359,7 +359,7 @@ export abstract class AbstractCodegen<ModuleTypes, NetworkType> {
     const source = `
   onEvent${struct.name}(func: (event: ${moduleName}.${normalizeToJSName(struct.name)}Instance, ctx: ${
       this.PREFIX
-    }Context) => void, fetchConfig?: MoveFetchConfig): ${moduleName} {
+    }Context) => void, fetchConfig?: Partial<MoveFetchConfig>): ${moduleName} {
     this.onMoveEvent(func, {
       type: '${module.name}::${struct.name}'
     },

package/src/sui/builtin/0x1.ts

@@ -35,7 +35,7 @@ export class ascii extends SuiBaseProcessor {
 
   onEventChar(
     func: (event: ascii.CharInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): ascii {
     this.onMoveEvent(
       func,
@@ -49,7 +49,7 @@ export class ascii extends SuiBaseProcessor {
 
   onEventString(
     func: (event: ascii.StringInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): ascii {
     this.onMoveEvent(
       func,
@@ -101,7 +101,7 @@ export class bit_vector extends SuiBaseProcessor {
 
   onEventBitVector(
     func: (event: bit_vector.BitVectorInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): bit_vector {
     this.onMoveEvent(
       func,
@@ -144,7 +144,7 @@ export class fixed_point32 extends SuiBaseProcessor {
 
   onEventFixedPoint32(
     func: (event: fixed_point32.FixedPoint32Instance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): fixed_point32 {
     this.onMoveEvent(
       func,
@@ -191,7 +191,7 @@ export class string_ extends SuiBaseProcessor {
 
   onEventString(
     func: (event: string_.StringInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): string_ {
     this.onMoveEvent(
       func,
@@ -231,7 +231,7 @@ export class type_name extends SuiBaseProcessor {
 
   onEventTypeName(
     func: (event: type_name.TypeNameInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): type_name {
     this.onMoveEvent(
       func,

package/src/sui/builtin/0x2.ts

@@ -57,7 +57,7 @@ export class bcs extends SuiBaseProcessor {
 
   onEventBCS(
     func: (event: bcs.BCSInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): bcs {
     this.onMoveEvent(
       func,
@@ -233,7 +233,7 @@ export class coin extends SuiBaseProcessor {
 
   onEventCurrencyCreated(
     func: (event: coin.CurrencyCreatedInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): coin {
     this.onMoveEvent(
       func,
@@ -444,7 +444,7 @@ export class display extends SuiBaseProcessor {
 
   onEventDisplayCreated(
     func: (event: display.DisplayCreatedInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): display {
     this.onMoveEvent(
       func,
@@ -458,7 +458,7 @@ export class display extends SuiBaseProcessor {
 
   onEventVersionUpdated(
     func: (event: display.VersionUpdatedInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): display {
     this.onMoveEvent(
       func,
@@ -572,7 +572,7 @@ export class dynamic_object_field extends SuiBaseProcessor {
       event: dynamic_object_field.WrapperInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): dynamic_object_field {
     this.onMoveEvent(
       func,
@@ -622,7 +622,7 @@ export class groth16 extends SuiBaseProcessor {
 
   onEventCurve(
     func: (event: groth16.CurveInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): groth16 {
     this.onMoveEvent(
       func,
@@ -639,7 +639,7 @@ export class groth16 extends SuiBaseProcessor {
       event: groth16.PreparedVerifyingKeyInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): groth16 {
     this.onMoveEvent(
       func,
@@ -653,7 +653,7 @@ export class groth16 extends SuiBaseProcessor {
 
   onEventProofPoints(
     func: (event: groth16.ProofPointsInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): groth16 {
     this.onMoveEvent(
       func,
@@ -667,7 +667,7 @@ export class groth16 extends SuiBaseProcessor {
 
   onEventPublicProofInputs(
     func: (event: groth16.PublicProofInputsInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): groth16 {
     this.onMoveEvent(
       func,
@@ -748,7 +748,7 @@ export class kiosk extends SuiBaseProcessor {
 
   onEventItem(
     func: (event: kiosk.ItemInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): kiosk {
     this.onMoveEvent(
       func,
@@ -762,7 +762,7 @@ export class kiosk extends SuiBaseProcessor {
 
   onEventItemListed(
     func: (event: kiosk.ItemListedInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): kiosk {
     this.onMoveEvent(
       func,
@@ -776,7 +776,7 @@ export class kiosk extends SuiBaseProcessor {
 
   onEventListing(
     func: (event: kiosk.ListingInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): kiosk {
     this.onMoveEvent(
       func,
@@ -790,7 +790,7 @@ export class kiosk extends SuiBaseProcessor {
 
   onEventLock(
     func: (event: kiosk.LockInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): kiosk {
     this.onMoveEvent(
       func,
@@ -1296,7 +1296,7 @@ export class transfer_policy extends SuiBaseProcessor {
 
   onEventRuleKey(
     func: (event: transfer_policy.RuleKeyInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): transfer_policy {
     this.onMoveEvent(
       func,
@@ -1313,7 +1313,7 @@ export class transfer_policy extends SuiBaseProcessor {
       event: transfer_policy.TransferPolicyCreatedInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): transfer_policy {
     this.onMoveEvent(
       func,
@@ -1398,7 +1398,7 @@ export class url extends SuiBaseProcessor {
 
   onEventUrl(
     func: (event: url.UrlInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): url {
     this.onMoveEvent(
       func,
@@ -1438,7 +1438,7 @@ export class vec_map extends SuiBaseProcessor {
 
   onEventEntry(
     func: (event: vec_map.EntryInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): vec_map {
     this.onMoveEvent(
       func,
@@ -1452,7 +1452,7 @@ export class vec_map extends SuiBaseProcessor {
 
   onEventVecMap(
     func: (event: vec_map.VecMapInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): vec_map {
     this.onMoveEvent(
       func,
@@ -1503,7 +1503,7 @@ export class vec_set extends SuiBaseProcessor {
 
   onEventVecSet(
     func: (event: vec_set.VecSetInstance, ctx: SuiContext) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): vec_set {
     this.onMoveEvent(
       func,

package/src/sui/builtin/0x3.ts

@@ -39,7 +39,7 @@ export class genesis extends SuiBaseProcessor {
       event: genesis.GenesisChainParametersInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): genesis {
     this.onMoveEvent(
       func,
@@ -56,7 +56,7 @@ export class genesis extends SuiBaseProcessor {
       event: genesis.GenesisValidatorMetadataInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): genesis {
     this.onMoveEvent(
       func,
@@ -193,7 +193,7 @@ export class staking_pool extends SuiBaseProcessor {
       event: staking_pool.PoolTokenExchangeRateInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): staking_pool {
     this.onMoveEvent(
       func,
@@ -1210,7 +1210,7 @@ export class sui_system_state_inner extends SuiBaseProcessor {
       event: sui_system_state_inner.SystemEpochInfoEventInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): sui_system_state_inner {
     this.onMoveEvent(
       func,
@@ -1300,7 +1300,7 @@ export class validator extends SuiBaseProcessor {
       event: validator.StakingRequestEventInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): validator {
     this.onMoveEvent(
       func,
@@ -1317,7 +1317,7 @@ export class validator extends SuiBaseProcessor {
       event: validator.UnstakingRequestEventInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): validator {
     this.onMoveEvent(
       func,
@@ -1435,7 +1435,7 @@ export class validator_set extends SuiBaseProcessor {
       event: validator_set.ValidatorEpochInfoEventInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): validator_set {
     this.onMoveEvent(
       func,
@@ -1452,7 +1452,7 @@ export class validator_set extends SuiBaseProcessor {
       event: validator_set.ValidatorJoinEventInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): validator_set {
     this.onMoveEvent(
       func,
@@ -1469,7 +1469,7 @@ export class validator_set extends SuiBaseProcessor {
       event: validator_set.ValidatorLeaveEventInstance,
       ctx: SuiContext
     ) => void,
-    fetchConfig?: MoveFetchConfig
+    fetchConfig?: Partial<MoveFetchConfig>
   ): validator_set {
     this.onMoveEvent(
       func,

package/src/sui/context.ts

@@ -10,6 +10,7 @@ export class SuiContext extends BaseContext {
   timestamp: Date
   slot: bigint
   transaction: SuiTransactionBlockResponse
+  eventIndex: number
 
   constructor(
     moduleName: string,
@@ -17,7 +18,8 @@ export class SuiContext extends BaseContext {
     address: string,
     timestamp: Date,
     slot: bigint,
-    transaction?: SuiTransactionBlockResponse
+    transaction: SuiTransactionBlockResponse,
+    eventIndex: number
   ) {
     super()
     this.address = address.toLowerCase()
@@ -25,6 +27,7 @@ export class SuiContext extends BaseContext {
     this.moduleName = moduleName
     this.timestamp = timestamp
     this.slot = slot
+    this.eventIndex = eventIndex
     if (transaction) {
       this.transaction = transaction
     }

package/src/sui/sui-processor.ts

@@ -7,7 +7,7 @@ import {
   MoveOnIntervalConfig_OwnerType,
   ProcessResult,
 } from '@sentio/protos'
-import { ListStateStorage } from '@sentio/runtime'
+import { ListStateStorage, mergeProcessResults } from '@sentio/runtime'
 import { getChainId, SuiNetwork } from './network.js'
 import { ServerError, Status } from 'nice-grpc'
 import { SuiContext, SuiObjectsContext } from './context.js'
@@ -19,7 +19,7 @@ import {
   SuiMoveObject,
   SuiTransactionBlockResponse,
 } from '@mysten/sui.js'
-import { CallHandler, EventFilter, EventHandler, FunctionNameAndCallFilter } from '../move/index.js'
+import { CallHandler, EventFilter, EventHandler, FunctionNameAndCallFilter, parseMoveType } from '../move/index.js'
 import { getMoveCalls } from './utils.js'
 import { defaultMoveCoder } from './move-coder.js'
 // import { dynamic_field } from './builtin/0x2.js'
@@ -81,6 +81,7 @@ export class SuiBaseProcessor {
     // const moduleName = this.moduleName
 
     const processor = this
+    const allEventType = new Set(_filters.map((f) => processor.config.address + '::' + f.type))
 
     this.eventHandlers.push({
       handler: async function (data) {
@@ -92,26 +93,29 @@ export class SuiBaseProcessor {
           throw new ServerError(Status.INVALID_ARGUMENT, 'no event in the transactions')
         }
 
-        const ctx = new SuiContext(
-          processor.moduleName,
-          processor.config.network,
-          processor.config.address,
-          data.timestamp || new Date(0),
-          data.slot,
-          txn
-        )
+        const processResults = []
+        for (const [idx, evt] of (txn.events as SuiEvent[]).entries()) {
+          const typeQname = parseMoveType(evt.type).qname
+          if (!allEventType.has(typeQname)) {
+            continue
+          }
+
+          const ctx = new SuiContext(
+            processor.moduleName,
+            processor.config.network,
+            processor.config.address,
+            data.timestamp || new Date(0),
+            data.slot,
+            txn,
+            idx
+          )
 
-        const events = txn.events
-        txn.events = []
-        for (const evt of events) {
-          // if ('moveEvent' in evt) {
-          //   const eventInstance = evt.moveEvent as SuiEvent
           const decoded = defaultMoveCoder().decodeEvent<any>(evt)
           await handler(decoded || evt, ctx)
-          // }
+          processResults.push(ctx.getProcessResult())
         }
 
-        return ctx.getProcessResult()
+        return mergeProcessResults(processResults)
       },
       filters: _filters,
       fetchConfig: _fetchConfig,
@@ -150,7 +154,8 @@ export class SuiBaseProcessor {
           processor.config.address,
           data.timestamp || new Date(0),
           data.slot,
-          tx
+          tx,
+          0
         )
         if (tx) {
           const calls: MoveCallSuiTransaction[] = getMoveCalls(tx)

package/src/testing/sui-facet.ts

@@ -1,4 +1,4 @@
-import { SuiEvent, SuiTransactionBlockResponse, MoveCallSuiTransaction } from '@mysten/sui.js'
+import { SuiTransactionBlockResponse, MoveCallSuiTransaction } from '@mysten/sui.js'
 import { DataBinding, HandlerType } from '@sentio/protos'
 import { getChainId } from '../sui/network.js'
 import { TestProcessorServer } from './test-processor-server.js'
@@ -66,19 +66,8 @@ export class SuiFacet {
     return undefined
   }
 
-  testEvent(
-    transaction: SuiTransactionBlockResponse,
-    event: number | SuiEvent,
-    network: SuiNetwork = SuiNetwork.MAIN_NET
-  ) {
-    if (typeof event !== 'number') {
-      const transaction2: SuiTransactionBlockResponse = {} as any
-      Object.assign(transaction2, transaction)
-      transaction = transaction2
-      transaction.events = [event]
-      event = 0
-    }
-    const binding = this.buildEventBinding(transaction, event, network)
+  testEvent(transaction: SuiTransactionBlockResponse, network: SuiNetwork = SuiNetwork.MAIN_NET) {
+    const binding = this.buildEventBinding(transaction, network)
     if (!binding) {
       throw Error('Invalid test event: ' + JSON.stringify(transaction))
     }
@@ -87,14 +76,9 @@ export class SuiFacet {
 
   private buildEventBinding(
     transaction: SuiTransactionBlockResponse,
-    eventIdx: number,
     network: SuiNetwork = SuiNetwork.MAIN_NET
   ): DataBinding | undefined {
     // const allEvents = new Set(transaction.events.map(e => e.type))
-    const event = transaction.events?.[eventIdx]
-    if (!event) {
-      throw Error('Invaild test transaction, no event located')
-    }
 
     for (const config of this.server.contractConfigs) {
       if (config.contract?.chainId !== getChainId(network)) {
@@ -102,18 +86,19 @@ export class SuiFacet {
       }
       for (const eventConfig of config.moveEventConfigs) {
         for (const eventFilter of eventConfig.filters) {
-          if (config.contract.address + '::' + eventFilter.type === parseMoveType(event.type).qname) {
-            transaction.events = [event]
-            return {
-              data: {
-                suiEvent: {
-                  transaction,
-                  timestamp: new Date(transaction.timestampMs || 0),
-                  slot: 10000n,
+          for (const event of transaction.events || []) {
+            if (config.contract.address + '::' + eventFilter.type === parseMoveType(event.type).qname) {
+              return {
+                data: {
+                  suiEvent: {
+                    transaction,
+                    timestamp: new Date(transaction.timestampMs || 0),
+                    slot: 10000n,
+                  },
                 },
-              },
-              handlerIds: [eventConfig.handlerId],
-              handlerType: HandlerType.SUI_EVENT,
+                handlerIds: [eventConfig.handlerId],
+                handlerType: HandlerType.SUI_EVENT,
+              }
             }
           }
         }