@sentio/sdk 2.12.3 → 2.13.0-rc.10

package/src/testing/aptos-facet.ts

@@ -2,7 +2,7 @@ import { Transaction_UserTransaction, TransactionPayload_EntryFunctionPayload }
 import { DataBinding, HandlerType } from '@sentio/protos'
 import { getChainId } from '../aptos/network.js'
 import { TestProcessorServer } from './test-processor-server.js'
-import { AptosNetwork, Event } from '@sentio/sdk/aptos'
+import { AptosNetwork } from '@sentio/sdk/aptos'
 import { parseMoveType } from '../move/types.js'
 
 export class AptosFacet {
@@ -57,19 +57,8 @@ export class AptosFacet {
     return undefined
   }
 
-  testEvent(
-    transaction: Transaction_UserTransaction,
-    event: number | Event,
-    network: AptosNetwork = AptosNetwork.MAIN_NET
-  ) {
-    if (typeof event !== 'number') {
-      const transaction2: Transaction_UserTransaction = {} as any
-      Object.assign(transaction2, transaction)
-      transaction = transaction2
-      transaction.events = [event]
-      event = 0
-    }
-    const binding = this.buildEventBinding(transaction, event, network)
+  testEvent(transaction: Transaction_UserTransaction, network: AptosNetwork = AptosNetwork.MAIN_NET) {
+    const binding = this.buildEventBinding(transaction, network)
     if (!binding) {
       throw Error('Invalid test event: ' + JSON.stringify(transaction))
     }
@@ -78,7 +67,6 @@ export class AptosFacet {
 
   private buildEventBinding(
     transaction: Transaction_UserTransaction,
-    eventIdx: number,
     network: AptosNetwork = AptosNetwork.MAIN_NET
   ): DataBinding | undefined {
     // const allEvents = new Set(transaction.events.map(e => e.type))
@@ -88,19 +76,17 @@ export class AptosFacet {
       }
       for (const eventConfig of config.moveEventConfigs) {
         for (const eventFilter of eventConfig.filters) {
-          if (
-            config.contract.address + '::' + eventFilter.type ===
-            parseMoveType(transaction.events[eventIdx].type).qname
-          ) {
-            transaction.events = [transaction.events[eventIdx]]
-            return {
-              data: {
-                aptEvent: {
-                  transaction,
+          for (const event of transaction.events) {
+            if (config.contract.address + '::' + eventFilter.type === parseMoveType(event.type).qname) {
+              return {
+                data: {
+                  aptEvent: {
+                    transaction,
+                  },
                 },
-              },
-              handlerIds: [eventConfig.handlerId],
-              handlerType: HandlerType.APT_EVENT,
+                handlerIds: [eventConfig.handlerId],
+                handlerType: HandlerType.APT_EVENT,
+              }
             }
           }
         }

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,
+              }
             }
           }
         }

package/lib/aptos/utils.d.ts

@@ -1,2 +0,0 @@
-import { TypeDescriptor } from '../move/index.js';
-export declare function getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[];

package/lib/aptos/utils.js

@@ -1,10 +0,0 @@
-export function getMeaningfulFunctionParams(params) {
-    if (params.length === 0) {
-        return params;
-    }
-    if (params[0].qname === 'signer' && params[0].reference) {
-        params = params.slice(1);
-    }
-    return params;
-}
-//# sourceMappingURL=utils.js.map

package/lib/aptos/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/aptos/utils.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,2BAA2B,CAAC,MAAwB;IAClE,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACvB,OAAO,MAAM,CAAA;KACd;IACD,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE;QACvD,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;KACzB;IACD,OAAO,MAAM,CAAA;AACf,CAAC","sourcesContent":["import { TypeDescriptor } from '../move/index.js'\n\nexport function getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {\n  if (params.length === 0) {\n    return params\n  }\n  if (params[0].qname === 'signer' && params[0].reference) {\n    params = params.slice(1)\n  }\n  return params\n}\n"]}

package/src/aptos/utils.ts

@@ -1,11 +0,0 @@
-import { TypeDescriptor } from '../move/index.js'
-
-export function getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {
-  if (params.length === 0) {
-    return params
-  }
-  if (params[0].qname === 'signer' && params[0].reference) {
-    params = params.slice(1)
-  }
-  return params
-}