@sentio/sdk 2.44.3-rc.1 → 2.44.3-rc.11

package/src/aptos/aptos-processor.ts

@@ -2,11 +2,9 @@ import { defaultMoveCoder, MoveCoder } from './index.js'
 
 import {
   Event,
-  WriteSetChangeWriteResource,
   MoveResource,
   UserTransactionResponse,
   EntryFunctionPayloadResponse,
-  WriteSetChangeDeleteResource,
   MultisigPayloadResponse
 } from '@aptos-labs/ts-sdk'
 
@@ -33,6 +31,8 @@ import {
   ResourceChangeHandler
 } from '../move/index.js'
 import { Labels, PromiseOrVoid } from '../core/index.js'
+import { TypeDescriptor } from '@typemove/move'
+import { decodeResourceChange, ResourceChange } from '@typemove/aptos'
 
 const DEFAULT_FETCH_CONFIG: MoveFetchConfig = {
   resourceChanges: false,
@@ -46,8 +46,6 @@ export const DEFAULT_RESOURCE_FETCH_CONFIG: MoveAccountFetchConfig = {
   owned: true
 }
 
-export type ResourceChange = WriteSetChangeWriteResource | WriteSetChangeDeleteResource
-
 type IndexConfigure = {
   address: string
   network: AptosNetwork
@@ -231,19 +229,21 @@ export class AptosBaseProcessor {
     return this
   }
 
-  public onResourceChange(
-    handler: (changes: ResourceChange[], ctx: AptosResourcesContext) => PromiseOrVoid,
-    type: string
+  public onResourceChange<T>(
+    handler: (changes: ResourceChange<T>[], ctx: AptosResourcesContext) => PromiseOrVoid,
+    typeDesc: TypeDescriptor<T> | string
   ): this {
+    if (typeof typeDesc === 'string') {
+      typeDesc = parseMoveType(typeDesc)
+    }
+
     const processor = this
     this.resourceHandlers.push({
       handler: async function (data) {
         if (!data.resources || !data.version) {
           throw new ServerError(Status.INVALID_ARGUMENT, 'resource is null')
         }
-        const resources = data.resources as ResourceChange[]
         const timestamp = Number(data.timestampMicros)
-
         const ctx = new AptosResourcesContext(
           processor.config.network,
           processor.config.address,
@@ -251,10 +251,11 @@ export class AptosBaseProcessor {
           timestamp,
           processor.config.baseLabels
         )
+        const resources = await decodeResourceChange<T>(data.resources, ctx.coder)
         await handler(resources, ctx)
         return ctx.stopAndGetResult()
       },
-      type
+      type: typeDesc.qname
     })
     return this
   }
@@ -364,10 +365,14 @@ export class AptosResourcesProcessor {
     )
   }
 
-  public onResourceChange(
-    handler: (changes: ResourceChange[], ctx: AptosResourcesContext) => PromiseOrVoid,
-    typeOrPrefix: string
+  public onResourceChange<T>(
+    handler: (changes: ResourceChange<T>[], ctx: AptosResourcesContext) => PromiseOrVoid,
+    typeDesc: TypeDescriptor<T> | string
   ): this {
+    if (typeof typeDesc === 'string') {
+      typeDesc = parseMoveType(typeDesc)
+    }
+
     const processor = this
     this.resourcesHandlers.push({
       fetchConfig: DEFAULT_RESOURCE_FETCH_CONFIG,
@@ -377,7 +382,6 @@ export class AptosResourcesProcessor {
         if (!data.resources || !data.version) {
           throw new ServerError(Status.INVALID_ARGUMENT, 'resource is null')
         }
-        const resources = data.resources as ResourceChange[]
         const ctx = new AptosResourcesContext(
           processor.config.network,
           processor.config.address,
@@ -385,10 +389,12 @@ export class AptosResourcesProcessor {
           timestamp,
           processor.config.baseLabels
         )
+
+        const resources = (await decodeResourceChange(data.resources, ctx.coder)) as ResourceChange<T>[]
         await handler(resources, ctx)
         return ctx.stopAndGetResult()
       },
-      type: typeOrPrefix
+      type: typeDesc.qname
     })
     return this
   }