@sentio/sdk 2.11.6-rc.2 → 2.11.6-rc.3

package/lib/aptos/move-coder.js

@@ -12,16 +12,16 @@ export class MoveCoder extends AbstractMoveCoder {
         this.loadInternal(toInternalModule(module));
     }
     decodeEvent(event) {
-        return this.decodedInternal(event);
+        return this.decodedStruct(event);
     }
     filterAndDecodeEvents(typeQname, resources) {
-        return this.filterAndDecodeInternal(typeQname, resources);
+        return this.filterAndDecodeStruct(typeQname, resources);
     }
     decodeResource(res) {
-        return this.decodedInternal(res);
+        return this.decodedStruct(res);
     }
     filterAndDecodeResources(typeQname, resources) {
-        return this.filterAndDecodeInternal(typeQname, resources);
+        return this.filterAndDecodeStruct(typeQname, resources);
     }
     getMeaningfulFunctionParams(params) {
         return getMeaningfulFunctionParams(params);

package/lib/aptos/move-coder.js.map

@@ -1 +1 @@
-{"version":3,"file":"move-coder.js","sourceRoot":"","sources":["../../src/aptos/move-coder.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,gBAAgB,GAEjB,MAAM,iBAAiB,CAAA;AAGxB,OAAO,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAA;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAGlE,MAAM,OAAO,SAAU,SAAQ,iBAAuC;IACpE,IAAI,CAAC,MAA0B;QAC7B,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YACf,MAAM,KAAK,CAAC,oBAAoB,CAAC,CAAA;SAClC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACtD,OAAM;SACP;QACD,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAA;IAC7C,CAAC;IAED,WAAW,CAAI,KAAY;QACzB,OAAO,IAAI,CAAC,eAAe,CAAI,KAAK,CAA0B,CAAA;IAChE,CAAC;IACD,qBAAqB,CAAI,SAAiB,EAAE,SAAkB;QAC5D,OAAO,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,SAAS,CAA4B,CAAA;IACtF,CAAC;IACD,cAAc,CAAI,GAAiB;QACjC,OAAO,IAAI,CAAC,eAAe,CAAI,GAAG,CAAC,CAAA;IACrC,CAAC;IACD,wBAAwB,CAAI,SAAiB,EAAE,SAAyB;QACtE,OAAO,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;IAC3D,CAAC;IAED,2BAA2B,CAAC,MAAwB;QAClD,OAAO,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAC5C,CAAC;IAED,qBAAqB,CAAC,OAAgD;QACpE,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACnD,MAAM,MAAM,GAAG,2BAA2B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACvD,MAAM,gBAAgB,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QAEpE,OAAO;YACL,GAAG,OAAO;YACV,iBAAiB,EAAE,gBAAgB;SACP,CAAA;IAChC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,SAAS,EAAE,CAAA;AAEzC,MAAM,UAAU,gBAAgB;IAC9B,OAAO,UAAU,CAAA;AACnB,CAAC","sourcesContent":["import {\n  Event,\n  MoveModuleBytecode,\n  MoveResource,\n  toInternalModule,\n  TransactionPayload_EntryFunctionPayload,\n} from './move-types.js'\n\nimport { TypedEventInstance, TypedMoveResource, TypedFunctionPayload } from './models.js'\nimport { getMeaningfulFunctionParams } from './utils.js'\nimport { AbstractMoveCoder } from '../move/abstract-move-coder.js'\nimport { TypeDescriptor } from '../move/index.js'\n\nexport class MoveCoder extends AbstractMoveCoder<Event | MoveResource> {\n  load(module: MoveModuleBytecode) {\n    if (!module.abi) {\n      throw Error('Module without abi')\n    }\n    if (this.contains(module.abi.address, module.abi.name)) {\n      return\n    }\n    this.loadInternal(toInternalModule(module))\n  }\n\n  decodeEvent<T>(event: Event): TypedEventInstance<T> | undefined {\n    return this.decodedInternal<T>(event) as TypedEventInstance<T>\n  }\n  filterAndDecodeEvents<T>(typeQname: string, resources: Event[]): TypedEventInstance<T>[] {\n    return this.filterAndDecodeInternal(typeQname, resources) as TypedEventInstance<T>[]\n  }\n  decodeResource<T>(res: MoveResource): TypedMoveResource<T> | undefined {\n    return this.decodedInternal<T>(res)\n  }\n  filterAndDecodeResources<T>(typeQname: string, resources: MoveResource[]): TypedMoveResource<T>[] {\n    return this.filterAndDecodeInternal(typeQname, resources)\n  }\n\n  getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {\n    return getMeaningfulFunctionParams(params)\n  }\n\n  decodeFunctionPayload(payload: TransactionPayload_EntryFunctionPayload): TransactionPayload_EntryFunctionPayload {\n    const func = this.getMoveFunction(payload.function)\n    const params = getMeaningfulFunctionParams(func.params)\n    const argumentsDecoded = this.decodeArray(payload.arguments, params)\n\n    return {\n      ...payload,\n      arguments_decoded: argumentsDecoded,\n    } as TypedFunctionPayload<any>\n  }\n}\n\nexport const MOVE_CODER = new MoveCoder()\n\nexport function defaultMoveCoder(): MoveCoder {\n  return MOVE_CODER\n}\n"]}
+{"version":3,"file":"move-coder.js","sourceRoot":"","sources":["../../src/aptos/move-coder.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,gBAAgB,GAEjB,MAAM,iBAAiB,CAAA;AAGxB,OAAO,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAA;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAA;AAGlE,MAAM,OAAO,SAAU,SAAQ,iBAAuC;IACpE,IAAI,CAAC,MAA0B;QAC7B,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE;YACf,MAAM,KAAK,CAAC,oBAAoB,CAAC,CAAA;SAClC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACtD,OAAM;SACP;QACD,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAA;IAC7C,CAAC;IAED,WAAW,CAAI,KAAY;QACzB,OAAO,IAAI,CAAC,aAAa,CAAI,KAAK,CAA0B,CAAA;IAC9D,CAAC;IACD,qBAAqB,CAAI,SAAiB,EAAE,SAAkB;QAC5D,OAAO,IAAI,CAAC,qBAAqB,CAAC,SAAS,EAAE,SAAS,CAA4B,CAAA;IACpF,CAAC;IACD,cAAc,CAAI,GAAiB;QACjC,OAAO,IAAI,CAAC,aAAa,CAAI,GAAG,CAAC,CAAA;IACnC,CAAC;IACD,wBAAwB,CAAI,SAAiB,EAAE,SAAyB;QACtE,OAAO,IAAI,CAAC,qBAAqB,CAAC,SAAS,EAAE,SAAS,CAAQ,CAAA;IAChE,CAAC;IAED,2BAA2B,CAAC,MAAwB;QAClD,OAAO,2BAA2B,CAAC,MAAM,CAAC,CAAA;IAC5C,CAAC;IAED,qBAAqB,CAAC,OAAgD;QACpE,MAAM,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACnD,MAAM,MAAM,GAAG,2BAA2B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACvD,MAAM,gBAAgB,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QAEpE,OAAO;YACL,GAAG,OAAO;YACV,iBAAiB,EAAE,gBAAgB;SACP,CAAA;IAChC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,SAAS,EAAE,CAAA;AAEzC,MAAM,UAAU,gBAAgB;IAC9B,OAAO,UAAU,CAAA;AACnB,CAAC","sourcesContent":["import {\n  Event,\n  MoveModuleBytecode,\n  MoveResource,\n  toInternalModule,\n  TransactionPayload_EntryFunctionPayload,\n} from './move-types.js'\n\nimport { TypedEventInstance, TypedMoveResource, TypedFunctionPayload } from './models.js'\nimport { getMeaningfulFunctionParams } from './utils.js'\nimport { AbstractMoveCoder } from '../move/abstract-move-coder.js'\nimport { TypeDescriptor } from '../move/index.js'\n\nexport class MoveCoder extends AbstractMoveCoder<Event | MoveResource> {\n  load(module: MoveModuleBytecode) {\n    if (!module.abi) {\n      throw Error('Module without abi')\n    }\n    if (this.contains(module.abi.address, module.abi.name)) {\n      return\n    }\n    this.loadInternal(toInternalModule(module))\n  }\n\n  decodeEvent<T>(event: Event): TypedEventInstance<T> | undefined {\n    return this.decodedStruct<T>(event) as TypedEventInstance<T>\n  }\n  filterAndDecodeEvents<T>(typeQname: string, resources: Event[]): TypedEventInstance<T>[] {\n    return this.filterAndDecodeStruct(typeQname, resources) as TypedEventInstance<T>[]\n  }\n  decodeResource<T>(res: MoveResource): TypedMoveResource<T> | undefined {\n    return this.decodedStruct<T>(res)\n  }\n  filterAndDecodeResources<T>(typeQname: string, resources: MoveResource[]): TypedMoveResource<T>[] {\n    return this.filterAndDecodeStruct(typeQname, resources) as any\n  }\n\n  getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {\n    return getMeaningfulFunctionParams(params)\n  }\n\n  decodeFunctionPayload(payload: TransactionPayload_EntryFunctionPayload): TransactionPayload_EntryFunctionPayload {\n    const func = this.getMoveFunction(payload.function)\n    const params = getMeaningfulFunctionParams(func.params)\n    const argumentsDecoded = this.decodeArray(payload.arguments, params)\n\n    return {\n      ...payload,\n      arguments_decoded: argumentsDecoded,\n    } as TypedFunctionPayload<any>\n  }\n}\n\nexport const MOVE_CODER = new MoveCoder()\n\nexport function defaultMoveCoder(): MoveCoder {\n  return MOVE_CODER\n}\n"]}

package/lib/move/abstract-move-coder.d.ts

@@ -1,8 +1,8 @@
 import { TypeDescriptor } from './types.js';
 import { InternalMoveFunction, InternalMoveModule, InternalMoveStruct } from './internal-models.js';
-export type StructWithTag<Base> = Base & {
+export type StructWithTag<Base> = {
     type: string;
-    data: any;
+    data: Base;
 };
 export type DecodedStructWithTag<B, T> = StructWithTag<B> & {
     data_decoded: T;
@@ -14,6 +14,7 @@ export declare abstract class AbstractMoveCoder<StructType> {
     private funcMapping;
     contains(account: string, name: string): boolean;
     protected abstract getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[];
+    protected toStructWithTag(val: StructType): StructWithTag<StructType>;
     protected loadInternal(module: InternalMoveModule): void;
     protected decodeBigInt(data: any): bigint;
     protected encodeBigInt(data: bigint): any;
@@ -25,6 +26,8 @@ export declare abstract class AbstractMoveCoder<StructType> {
     encodeArray(entriesDecoded: any[], types: TypeDescriptor[]): any[];
     encodeCallArgs(args: any[], func: string): any[];
     decodeCallResult(res: any[], func: string): any[];
-    protected filterAndDecodeInternal<T>(typeQname: string, structs: StructWithTag<StructType>[]): DecodedStructWithTag<StructType, T>[];
-    protected decodedInternal<T>(typeStruct: StructWithTag<StructType>): DecodedStructWithTag<StructType, T> | undefined;
+    protected filterAndDecodeStruct(typeQname: string, structs: StructType[]): any;
+    private filterAndDecodeStructWithTags;
+    protected decodedStruct<T>(typeStruct: StructType): DecodedStructWithTag<StructType, T> | undefined;
+    private decodedStructWithTag;
 }

package/lib/move/abstract-move-coder.js

@@ -8,6 +8,9 @@ export class AbstractMoveCoder {
     contains(account, name) {
         return this.moduleMapping.has(account + '::' + name);
     }
+    toStructWithTag(val) {
+        return val;
+    }
     loadInternal(module) {
         if (this.contains(module.address, module.name)) {
             return;
@@ -198,12 +201,19 @@ export class AbstractMoveCoder {
         const f = this.getMoveFunction(func);
         return this.decodeArray(res, f.return);
     }
-    filterAndDecodeInternal(typeQname, structs) {
+    filterAndDecodeStruct(typeQname, structs) {
         if (!structs) {
             return [];
         }
+        const withTags = structs.map((s) => this.toStructWithTag(s));
+        return this.filterAndDecodeStructWithTags(typeQname, withTags);
+    }
+    filterAndDecodeStructWithTags(typeQname, structsWithTags) {
+        if (!structsWithTags) {
+            return [];
+        }
         const results = [];
-        for (const resource of structs) {
+        for (const resource of structsWithTags) {
             if (typeQname.includes('<')) {
                 if (resource.type !== typeQname) {
                     continue;
@@ -212,19 +222,22 @@ export class AbstractMoveCoder {
             else if (resource.type.split('<')[0] !== typeQname) {
                 continue;
             }
-            const result = this.decodedInternal(resource);
+            const result = this.decodedStructWithTag(resource);
             if (result) {
                 results.push(result);
             }
         }
         return results;
     }
-    decodedInternal(typeStruct) {
+    decodedStruct(typeStruct) {
+        return this.decodedStructWithTag(this.toStructWithTag(typeStruct));
+    }
+    decodedStructWithTag(typeStruct) {
         const typeDescriptor = parseMoveType(typeStruct.type);
         const typeArguments = typeDescriptor.typeArgs.map((t) => t.getSignature());
         let dataTyped = undefined;
         try {
-            dataTyped = this.decode(typeStruct.data, typeDescriptor);
+            dataTyped = this.decode(this.toStructWithTag(typeStruct.data), typeDescriptor);
         }
         catch (e) {
             console.error('Decoding error for ', JSON.stringify(typeStruct), e);

package/lib/move/abstract-move-coder.js.map

@@ -1 +1 @@
-{"version":3,"file":"abstract-move-coder.js","sourceRoot":"","sources":["../../src/move/abstract-move-coder.ts"],"names":[],"mappings":"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","sourcesContent":["import { moduleQname, SPLITTER, VECTOR_STR } from './utils.js'\nimport { parseMoveType, TypeDescriptor } from './types.js'\nimport { InternalMoveFunction, InternalMoveModule, InternalMoveStruct } from './internal-models.js'\nimport { bytesToBigInt } from '../utils/index.js'\n\nexport type StructWithTag<Base> = Base & {\n  type: string\n  data: any\n}\n\nexport type DecodedStructWithTag<B, T> = StructWithTag<B> & {\n  data_decoded: T\n  type_arguments: string[]\n}\n\nexport abstract class AbstractMoveCoder<StructType> {\n  private moduleMapping = new Map<string, InternalMoveModule>()\n  private typeMapping = new Map<string, InternalMoveStruct>()\n  private funcMapping = new Map<string, InternalMoveFunction>()\n\n  contains(account: string, name: string) {\n    return this.moduleMapping.has(account + '::' + name)\n  }\n\n  protected abstract getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[]\n\n  protected loadInternal(module: InternalMoveModule) {\n    if (this.contains(module.address, module.name)) {\n      return\n    }\n    this.moduleMapping.set(moduleQname(module), module)\n\n    for (const struct of module.structs) {\n      // TODO move to util\n      const key = [module.address, module.name, struct.name].join(SPLITTER)\n      this.typeMapping.set(key, struct)\n    }\n\n    for (const func of module.exposedFunctions) {\n      // if (!func.isEntry) {\n      //   continue\n      // }\n      const key = [module.address, module.name, func.name].join(SPLITTER)\n      this.funcMapping.set(key, func)\n    }\n  }\n\n  protected decodeBigInt(data: any): bigint {\n    if (Array.isArray(data)) {\n      // Only sui function need this, strange\n      const bytes = data as number[]\n      return bytesToBigInt(new Uint8Array(bytes.slice().reverse()))\n    } else {\n      return BigInt(data)\n    }\n  }\n\n  protected encodeBigInt(data: bigint): any {\n    return '0x' + data.toString(16)\n  }\n\n  getMoveStruct(type: string): InternalMoveStruct {\n    const struct = this.typeMapping.get(type)\n    if (!struct) {\n      throw new Error('Failed to load type' + type + ' type are not imported anywhere')\n    }\n    return struct\n  }\n\n  getMoveFunction(type: string): InternalMoveFunction {\n    const func = this.funcMapping.get(type)\n    if (!func) {\n      throw new Error('Failed to load function ' + type + ' type are not imported anywhere')\n    }\n    return func\n  }\n\n  decode(data: any, type: TypeDescriptor): any {\n    // process simple type\n    if (type.reference) {\n      return data\n    }\n    switch (type.qname) {\n      case 'signer': // TODO check this, aptos only\n      case 'address':\n      case 'Address':\n      case '0x1::string::String':\n      case 'bool':\n      case 'Bool':\n      case 'u8':\n      case 'U8':\n      case 'u16':\n      case 'U16':\n      case 'u32':\n      case 'U32':\n        return data\n      case 'u64':\n      case 'U64':\n      case 'u128':\n      case 'U128':\n        return this.decodeBigInt(data)\n    }\n\n    // process vector\n    if (type.qname === VECTOR_STR) {\n      // vector<u8> as hex string\n      if (type.typeArgs[0].qname === 'u8' || type.typeArgs[0].qname === 'U8') {\n        return data\n      }\n\n      const res = []\n      for (const entry of data) {\n        res.push(this.decode(entry, type.typeArgs[0]))\n      }\n      return res\n    }\n\n    // Process complex type\n    const struct = this.getMoveStruct(type.qname)\n\n    const typeCtx = new Map<string, TypeDescriptor>()\n    for (const [idx, typeArg] of type.typeArgs.entries()) {\n      typeCtx.set('T' + idx, typeArg)\n    }\n\n    const typedData: any = {}\n\n    for (const field of struct.fields) {\n      let filedType = field.type\n      filedType = filedType.applyTypeArgs(typeCtx)\n      const value = this.decode(data[field.name], filedType)\n      typedData[field.name] = value\n    }\n    return typedData\n  }\n\n  encode(data: any, type: TypeDescriptor): any {\n    // process simple type\n    if (type.reference) {\n      return data\n    }\n    switch (type.qname) {\n      case 'signer': // TODO check this, aptos only\n      case 'address':\n      case 'Address':\n      case '0x2::object::ID':\n      case '0x2::coin::Coin':\n      case '0x1::string::String':\n      case 'bool':\n      case 'Bool':\n      case 'u8':\n      case 'U8':\n      case 'u16':\n      case 'U16':\n      case 'u32':\n      case 'U32':\n        return data\n      case 'u64':\n      case 'U64':\n      case 'u128':\n      case 'U128':\n      case 'u256':\n      case 'U256':\n        return this.encodeBigInt(data)\n    }\n\n    // process vector\n    if (type.qname === VECTOR_STR) {\n      // vector<u8> as hex string\n      if (type.typeArgs[0].qname === 'u8' || type.typeArgs[0].qname === 'U8') {\n        return data\n      }\n\n      const res = []\n      for (const entry of data) {\n        res.push(this.encode(entry, type.typeArgs[0]))\n      }\n      return res\n    }\n\n    // Process complex type\n    const struct = this.getMoveStruct(type.qname)\n\n    const typeCtx = new Map<string, TypeDescriptor>()\n    for (const [idx, typeArg] of type.typeArgs.entries()) {\n      typeCtx.set('T' + idx, typeArg)\n    }\n\n    const typedData: any = {}\n\n    for (const field of struct.fields) {\n      let filedType = field.type\n      filedType = filedType.applyTypeArgs(typeCtx)\n      const value = this.encode(data[field.name], filedType)\n      typedData[field.name] = value\n    }\n    return typedData\n  }\n\n  decodeArray(entries: any[], types: TypeDescriptor[]): any[] {\n    const entriesDecoded: any[] = []\n    for (const [idx, arg] of entries.entries()) {\n      // TODO consider apply payload.type_arguments, but this might be hard since we don't code gen for them\n      const argType = types[idx]\n      try {\n        entriesDecoded.push(this.decode(arg, argType))\n      } catch (e) {\n        console.error(e, 'Decoding error for ', JSON.stringify(arg), 'using type', argType)\n        return entries\n      }\n    }\n    return entriesDecoded\n  }\n\n  encodeArray(entriesDecoded: any[], types: TypeDescriptor[]): any[] {\n    const entries: any[] = []\n    for (const [idx, arg] of entriesDecoded.entries()) {\n      // TODO consider apply payload.type_arguments, but this might be hard since we don't code gen for them\n      const argType = types[idx]\n      try {\n        entries.push(this.encode(arg, argType))\n      } catch (e) {\n        throw Error('Decoding error for ' + JSON.stringify(arg) + 'using type' + argType + e.toString())\n      }\n    }\n    return entries\n  }\n\n  encodeCallArgs(args: any[], func: string): any[] {\n    const f = this.getMoveFunction(func)\n    return this.encodeArray(args, this.getMeaningfulFunctionParams(f.params))\n  }\n\n  decodeCallResult(res: any[], func: string): any[] {\n    const f = this.getMoveFunction(func)\n    return this.decodeArray(res, f.return)\n  }\n\n  protected filterAndDecodeInternal<T>(\n    typeQname: string,\n    structs: StructWithTag<StructType>[]\n  ): DecodedStructWithTag<StructType, T>[] {\n    if (!structs) {\n      return []\n    }\n    const results: DecodedStructWithTag<StructType, T>[] = []\n    for (const resource of structs) {\n      if (typeQname.includes('<')) {\n        if (resource.type !== typeQname) {\n          continue\n        }\n      } else if (resource.type.split('<')[0] !== typeQname) {\n        continue\n      }\n      const result = this.decodedInternal(resource)\n      if (result) {\n        results.push(result as DecodedStructWithTag<StructType, T>)\n      }\n    }\n    return results\n  }\n\n  protected decodedInternal<T>(typeStruct: StructWithTag<StructType>): DecodedStructWithTag<StructType, T> | undefined {\n    const typeDescriptor = parseMoveType(typeStruct.type)\n    const typeArguments = typeDescriptor.typeArgs.map((t) => t.getSignature())\n\n    let dataTyped = undefined\n    try {\n      dataTyped = this.decode(typeStruct.data, typeDescriptor)\n    } catch (e) {\n      console.error('Decoding error for ', JSON.stringify(typeStruct), e)\n      return undefined\n    }\n    return {\n      ...typeStruct,\n      data_decoded: dataTyped,\n      type_arguments: typeArguments,\n    } as DecodedStructWithTag<StructType, T>\n  }\n}\n"]}
+{"version":3,"file":"abstract-move-coder.js","sourceRoot":"","sources":["../../src/move/abstract-move-coder.ts"],"names":[],"mappings":"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","sourcesContent":["import { moduleQname, SPLITTER, VECTOR_STR } from './utils.js'\nimport { parseMoveType, TypeDescriptor } from './types.js'\nimport { InternalMoveFunction, InternalMoveModule, InternalMoveStruct } from './internal-models.js'\nimport { bytesToBigInt } from '../utils/index.js'\n\nexport type StructWithTag<Base> = {\n  type: string\n  data: Base\n}\n\nexport type DecodedStructWithTag<B, T> = StructWithTag<B> & {\n  data_decoded: T\n  type_arguments: string[]\n}\n\nexport abstract class AbstractMoveCoder<StructType> {\n  private moduleMapping = new Map<string, InternalMoveModule>()\n  private typeMapping = new Map<string, InternalMoveStruct>()\n  private funcMapping = new Map<string, InternalMoveFunction>()\n\n  contains(account: string, name: string) {\n    return this.moduleMapping.has(account + '::' + name)\n  }\n\n  protected abstract getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[]\n\n  protected toStructWithTag(val: StructType): StructWithTag<StructType> {\n    return val as any\n  }\n\n  protected loadInternal(module: InternalMoveModule) {\n    if (this.contains(module.address, module.name)) {\n      return\n    }\n    this.moduleMapping.set(moduleQname(module), module)\n\n    for (const struct of module.structs) {\n      // TODO move to util\n      const key = [module.address, module.name, struct.name].join(SPLITTER)\n      this.typeMapping.set(key, struct)\n    }\n\n    for (const func of module.exposedFunctions) {\n      // if (!func.isEntry) {\n      //   continue\n      // }\n      const key = [module.address, module.name, func.name].join(SPLITTER)\n      this.funcMapping.set(key, func)\n    }\n  }\n\n  protected decodeBigInt(data: any): bigint {\n    if (Array.isArray(data)) {\n      // Only sui function need this, strange\n      const bytes = data as number[]\n      return bytesToBigInt(new Uint8Array(bytes.slice().reverse()))\n    } else {\n      return BigInt(data)\n    }\n  }\n\n  protected encodeBigInt(data: bigint): any {\n    return '0x' + data.toString(16)\n  }\n\n  getMoveStruct(type: string): InternalMoveStruct {\n    const struct = this.typeMapping.get(type)\n    if (!struct) {\n      throw new Error('Failed to load type' + type + ' type are not imported anywhere')\n    }\n    return struct\n  }\n\n  getMoveFunction(type: string): InternalMoveFunction {\n    const func = this.funcMapping.get(type)\n    if (!func) {\n      throw new Error('Failed to load function ' + type + ' type are not imported anywhere')\n    }\n    return func\n  }\n\n  decode(data: any, type: TypeDescriptor): any {\n    // process simple type\n    if (type.reference) {\n      return data\n    }\n    switch (type.qname) {\n      case 'signer': // TODO check this, aptos only\n      case 'address':\n      case 'Address':\n      case '0x1::string::String':\n      case 'bool':\n      case 'Bool':\n      case 'u8':\n      case 'U8':\n      case 'u16':\n      case 'U16':\n      case 'u32':\n      case 'U32':\n        return data\n      case 'u64':\n      case 'U64':\n      case 'u128':\n      case 'U128':\n        return this.decodeBigInt(data)\n    }\n\n    // process vector\n    if (type.qname === VECTOR_STR) {\n      // vector<u8> as hex string\n      if (type.typeArgs[0].qname === 'u8' || type.typeArgs[0].qname === 'U8') {\n        return data\n      }\n\n      const res = []\n      for (const entry of data) {\n        res.push(this.decode(entry, type.typeArgs[0]))\n      }\n      return res\n    }\n\n    // Process complex type\n    const struct = this.getMoveStruct(type.qname)\n\n    const typeCtx = new Map<string, TypeDescriptor>()\n    for (const [idx, typeArg] of type.typeArgs.entries()) {\n      typeCtx.set('T' + idx, typeArg)\n    }\n\n    const typedData: any = {}\n\n    for (const field of struct.fields) {\n      let filedType = field.type\n      filedType = filedType.applyTypeArgs(typeCtx)\n      const value = this.decode(data[field.name], filedType)\n      typedData[field.name] = value\n    }\n    return typedData\n  }\n\n  encode(data: any, type: TypeDescriptor): any {\n    // process simple type\n    if (type.reference) {\n      return data\n    }\n    switch (type.qname) {\n      case 'signer': // TODO check this, aptos only\n      case 'address':\n      case 'Address':\n      case '0x2::object::ID':\n      case '0x2::coin::Coin':\n      case '0x1::string::String':\n      case 'bool':\n      case 'Bool':\n      case 'u8':\n      case 'U8':\n      case 'u16':\n      case 'U16':\n      case 'u32':\n      case 'U32':\n        return data\n      case 'u64':\n      case 'U64':\n      case 'u128':\n      case 'U128':\n      case 'u256':\n      case 'U256':\n        return this.encodeBigInt(data)\n    }\n\n    // process vector\n    if (type.qname === VECTOR_STR) {\n      // vector<u8> as hex string\n      if (type.typeArgs[0].qname === 'u8' || type.typeArgs[0].qname === 'U8') {\n        return data\n      }\n\n      const res = []\n      for (const entry of data) {\n        res.push(this.encode(entry, type.typeArgs[0]))\n      }\n      return res\n    }\n\n    // Process complex type\n    const struct = this.getMoveStruct(type.qname)\n\n    const typeCtx = new Map<string, TypeDescriptor>()\n    for (const [idx, typeArg] of type.typeArgs.entries()) {\n      typeCtx.set('T' + idx, typeArg)\n    }\n\n    const typedData: any = {}\n\n    for (const field of struct.fields) {\n      let filedType = field.type\n      filedType = filedType.applyTypeArgs(typeCtx)\n      const value = this.encode(data[field.name], filedType)\n      typedData[field.name] = value\n    }\n    return typedData\n  }\n\n  decodeArray(entries: any[], types: TypeDescriptor[]): any[] {\n    const entriesDecoded: any[] = []\n    for (const [idx, arg] of entries.entries()) {\n      // TODO consider apply payload.type_arguments, but this might be hard since we don't code gen for them\n      const argType = types[idx]\n      try {\n        entriesDecoded.push(this.decode(arg, argType))\n      } catch (e) {\n        console.error(e, 'Decoding error for ', JSON.stringify(arg), 'using type', argType)\n        return entries\n      }\n    }\n    return entriesDecoded\n  }\n\n  encodeArray(entriesDecoded: any[], types: TypeDescriptor[]): any[] {\n    const entries: any[] = []\n    for (const [idx, arg] of entriesDecoded.entries()) {\n      // TODO consider apply payload.type_arguments, but this might be hard since we don't code gen for them\n      const argType = types[idx]\n      try {\n        entries.push(this.encode(arg, argType))\n      } catch (e) {\n        throw Error('Decoding error for ' + JSON.stringify(arg) + 'using type' + argType + e.toString())\n      }\n    }\n    return entries\n  }\n\n  encodeCallArgs(args: any[], func: string): any[] {\n    const f = this.getMoveFunction(func)\n    return this.encodeArray(args, this.getMeaningfulFunctionParams(f.params))\n  }\n\n  decodeCallResult(res: any[], func: string): any[] {\n    const f = this.getMoveFunction(func)\n    return this.decodeArray(res, f.return)\n  }\n\n  protected filterAndDecodeStruct(typeQname: string, structs: StructType[]): any {\n    if (!structs) {\n      return []\n    }\n    const withTags = structs.map((s) => this.toStructWithTag(s))\n    return this.filterAndDecodeStructWithTags(typeQname, withTags)\n  }\n\n  private filterAndDecodeStructWithTags<T>(\n    typeQname: string,\n    structsWithTags: StructWithTag<StructType>[]\n  ): DecodedStructWithTag<StructType, T>[] {\n    if (!structsWithTags) {\n      return []\n    }\n    const results: DecodedStructWithTag<StructType, T>[] = []\n    for (const resource of structsWithTags) {\n      if (typeQname.includes('<')) {\n        if (resource.type !== typeQname) {\n          continue\n        }\n      } else if (resource.type.split('<')[0] !== typeQname) {\n        continue\n      }\n      const result = this.decodedStructWithTag(resource)\n      if (result) {\n        results.push(result as DecodedStructWithTag<StructType, T>)\n      }\n    }\n    return results\n  }\n\n  protected decodedStruct<T>(typeStruct: StructType): DecodedStructWithTag<StructType, T> | undefined {\n    return this.decodedStructWithTag(this.toStructWithTag(typeStruct)) as any\n  }\n\n  private decodedStructWithTag<T>(\n    typeStruct: StructWithTag<StructType>\n  ): DecodedStructWithTag<StructType, T> | undefined {\n    const typeDescriptor = parseMoveType(typeStruct.type)\n    const typeArguments = typeDescriptor.typeArgs.map((t) => t.getSignature())\n\n    let dataTyped = undefined\n    try {\n      dataTyped = this.decode(this.toStructWithTag(typeStruct.data), typeDescriptor)\n    } catch (e) {\n      console.error('Decoding error for ', JSON.stringify(typeStruct), e)\n      return undefined\n    }\n    return {\n      ...typeStruct,\n      data_decoded: dataTyped,\n      type_arguments: typeArguments,\n    } as DecodedStructWithTag<StructType, T>\n  }\n}\n"]}

package/lib/sui/move-coder.d.ts

@@ -1,11 +1,12 @@
 import { TypedEventInstance, TypedSuiMoveObject } from './models.js';
-import { AbstractMoveCoder } from '../move/abstract-move-coder.js';
+import { AbstractMoveCoder, StructWithTag } from '../move/abstract-move-coder.js';
 import { MoveCallSuiTransaction, SuiEvent, SuiMoveNormalizedModule, SuiCallArg, SuiMoveObject } from '@mysten/sui.js';
 import { TypeDescriptor } from '../move/index.js';
 import { dynamic_field } from './builtin/0x2.js';
-export declare class MoveCoder extends AbstractMoveCoder<SuiEvent> {
+export declare class MoveCoder extends AbstractMoveCoder<SuiEvent | SuiMoveObject> {
     load(module: SuiMoveNormalizedModule): void;
     decode(data: any, type: TypeDescriptor): any;
+    toStructWithTag(val: SuiEvent | SuiMoveObject): StructWithTag<SuiEvent>;
     decodeEvent<T>(event: SuiEvent): TypedEventInstance<T> | undefined;
     filterAndDecodeEvents<T>(typeQname: string, resources: SuiEvent[]): TypedEventInstance<T>[];
     getObjectsFromDynamicFields<Name, Value>(objects: SuiMoveObject[]): dynamic_field.Field<Name, Value>[];

package/lib/sui/move-coder.js

@@ -1,4 +1,5 @@
 import { AbstractMoveCoder } from '../move/abstract-move-coder.js';
+import { SuiEvent, SuiRawData, } from '@mysten/sui.js';
 import { toInternalModule } from './move-types.js';
 import { SPLITTER } from '../move/index.js';
 import { getMeaningfulFunctionParams } from './utils.js';
@@ -20,33 +21,32 @@ export class MoveCoder extends AbstractMoveCoder {
                 return super.decode(data, type);
         }
     }
+    toStructWithTag(val) {
+        if (SuiEvent.is(val)) {
+            return {
+                ...val,
+                data: val.parsedJson,
+            };
+        }
+        if (SuiRawData.is(val)) {
+            return {
+                ...val,
+                data: val.fields,
+            };
+        }
+        return val;
+    }
     decodeEvent(event) {
-        const res = this.decodedInternal({ ...event, data: event.parsedJson });
-        return { ...event, data_decoded: res?.data_decoded, type_arguments: res?.type_arguments || [] };
+        return this.decodedStruct(event);
     }
     filterAndDecodeEvents(typeQname, resources) {
-        const resp = this.filterAndDecodeInternal(typeQname, resources.map((event) => {
-            return { ...event, data: event.parsedJson, type: event.type };
-        }));
-        return resp.map((res) => {
-            delete res.data;
-            const event = res;
-            return { ...event, data_decoded: res?.data_decoded, type_arguments: res?.type_arguments || [] };
-        });
+        return this.filterAndDecodeStruct(typeQname, resources);
     }
     getObjectsFromDynamicFields(objects) {
         return this.filterAndDecodeObjects(`0x2::dynamic_field::Field`, objects).map((o) => o.data_decoded);
     }
     filterAndDecodeObjects(typeQname, objects) {
-        const structs = objects.map((obj) => {
-            return { ...obj, data: obj.fields, type: obj.type };
-        });
-        const resp = this.filterAndDecodeInternal(typeQname, structs);
-        return resp.map((res) => {
-            delete res.data;
-            const event = res;
-            return { ...event, data_decoded: res?.data_decoded, type_arguments: res?.type_arguments || [] };
-        });
+        return this.filterAndDecodeStruct(typeQname, objects);
     }
     getMeaningfulFunctionParams(params) {
         return getMeaningfulFunctionParams(params);

package/lib/sui/move-coder.js.map

@@ -1 +1 @@
-{"version":3,"file":"move-coder.js","sourceRoot":"","sources":["../../src/sui/move-coder.ts"],"names":[],"mappings":"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","sourcesContent":["import { TypedEventInstance, TypedFunctionPayload, TypedSuiMoveObject } from './models.js'\nimport { AbstractMoveCoder, StructWithTag } from '../move/abstract-move-coder.js'\nimport { MoveCallSuiTransaction, SuiEvent, SuiMoveNormalizedModule, SuiCallArg, SuiMoveObject } from '@mysten/sui.js'\nimport { toInternalModule } from './move-types.js'\nimport { SPLITTER, TypeDescriptor } from '../move/index.js'\nimport { getMeaningfulFunctionParams } from './utils.js'\nimport { dynamic_field } from './builtin/0x2.js'\n\nexport class MoveCoder extends AbstractMoveCoder<SuiEvent> {\n  load(module: SuiMoveNormalizedModule) {\n    if (this.contains(module.address, module.name)) {\n      return\n    }\n    this.loadInternal(toInternalModule(module))\n  }\n\n  decode(data: any, type: TypeDescriptor): any {\n    switch (type.qname) {\n      case '0x2::object::ID':\n      case '0x2::coin::Coin':\n        return data\n      case '0x1::option::Option':\n        return this.decode(data, type.typeArgs[0])\n      default:\n        return super.decode(data, type)\n    }\n  }\n\n  decodeEvent<T>(event: SuiEvent): TypedEventInstance<T> | undefined {\n    const res = this.decodedInternal<T>({ ...event, data: event.parsedJson })\n    return { ...event, data_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }\n  }\n  filterAndDecodeEvents<T>(typeQname: string, resources: SuiEvent[]): TypedEventInstance<T>[] {\n    const resp = this.filterAndDecodeInternal(\n      typeQname,\n      resources.map((event) => {\n        return { ...event, data: event.parsedJson, type: event.type }\n      })\n    )\n    return resp.map((res) => {\n      delete res.data\n      const event = res as SuiEvent\n      return { ...event, data_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }\n    })\n  }\n\n  getObjectsFromDynamicFields<Name, Value>(objects: SuiMoveObject[]): dynamic_field.Field<Name, Value>[] {\n    return this.filterAndDecodeObjects(`0x2::dynamic_field::Field`, objects).map((o) => o.data_decoded) as any\n  }\n\n  filterAndDecodeObjects<T>(typeQname: string, objects: SuiMoveObject[]): TypedSuiMoveObject<T>[] {\n    const structs = objects.map((obj) => {\n      return { ...obj, data: obj.fields, type: obj.type }\n    }) as StructWithTag<any>\n    const resp = this.filterAndDecodeInternal(typeQname, structs)\n    return resp.map((res) => {\n      delete res.data\n      const event = res as any as SuiMoveObject\n      return { ...event, data_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }\n    })\n  }\n\n  getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {\n    return getMeaningfulFunctionParams(params)\n  }\n\n  decodeFunctionPayload(payload: MoveCallSuiTransaction, inputs: SuiCallArg[]): MoveCallSuiTransaction {\n    const functionType = [payload.package, payload.module, payload.function].join(SPLITTER)\n    const func = this.getMoveFunction(functionType)\n    const params = getMeaningfulFunctionParams(func.params)\n    const args = []\n    for (const value of payload.arguments || []) {\n      const argValue = value as any\n      if ('Input' in (argValue as any)) {\n        const idx = argValue.Input\n        const arg = inputs[idx]\n        if (arg.type === 'pure') {\n          args.push(arg.value)\n        } else if (arg.type === 'object') {\n          args.push(arg.objectId)\n        } else {\n          console.error('unexpected function arg value')\n          args.push(undefined)\n        }\n        // args.push(arg) // TODO check why ts not work using arg.push(arg)\n      } else {\n        args.push(undefined)\n      }\n    }\n\n    const argumentsTyped = this.decodeArray(args, params)\n    return {\n      ...payload,\n      arguments_decoded: argumentsTyped,\n    } as TypedFunctionPayload<any>\n  }\n}\n\nexport const MOVE_CODER = new MoveCoder()\n\nexport function defaultMoveCoder(): MoveCoder {\n  return MOVE_CODER\n}\n"]}
+{"version":3,"file":"move-coder.js","sourceRoot":"","sources":["../../src/sui/move-coder.ts"],"names":[],"mappings":"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","sourcesContent":["import { TypedEventInstance, TypedFunctionPayload, TypedSuiMoveObject } from './models.js'\nimport { AbstractMoveCoder, StructWithTag } from '../move/abstract-move-coder.js'\nimport {\n  MoveCallSuiTransaction,\n  SuiEvent,\n  SuiMoveNormalizedModule,\n  SuiCallArg,\n  SuiMoveObject,\n  SuiRawData,\n} from '@mysten/sui.js'\nimport { toInternalModule } from './move-types.js'\nimport { SPLITTER, TypeDescriptor } from '../move/index.js'\nimport { getMeaningfulFunctionParams } from './utils.js'\nimport { dynamic_field } from './builtin/0x2.js'\n\nexport class MoveCoder extends AbstractMoveCoder<SuiEvent | SuiMoveObject> {\n  load(module: SuiMoveNormalizedModule) {\n    if (this.contains(module.address, module.name)) {\n      return\n    }\n    this.loadInternal(toInternalModule(module))\n  }\n\n  decode(data: any, type: TypeDescriptor): any {\n    switch (type.qname) {\n      case '0x2::object::ID':\n      case '0x2::coin::Coin':\n        return data\n      case '0x1::option::Option':\n        return this.decode(data, type.typeArgs[0])\n      default:\n        return super.decode(data, type)\n    }\n  }\n\n  toStructWithTag(val: SuiEvent | SuiMoveObject): StructWithTag<SuiEvent> {\n    if (SuiEvent.is(val)) {\n      return {\n        ...val,\n        data: val.parsedJson as any,\n      }\n    }\n    if (SuiRawData.is(val)) {\n      return {\n        ...val,\n        data: val.fields as any,\n      }\n    }\n    return val as any\n  }\n\n  decodeEvent<T>(event: SuiEvent): TypedEventInstance<T> | undefined {\n    return this.decodedStruct<T>(event) as any\n  }\n  filterAndDecodeEvents<T>(typeQname: string, resources: SuiEvent[]): TypedEventInstance<T>[] {\n    return this.filterAndDecodeStruct(typeQname, resources)\n  }\n\n  getObjectsFromDynamicFields<Name, Value>(objects: SuiMoveObject[]): dynamic_field.Field<Name, Value>[] {\n    return this.filterAndDecodeObjects(`0x2::dynamic_field::Field`, objects).map((o) => o.data_decoded) as any\n  }\n\n  filterAndDecodeObjects<T>(typeQname: string, objects: SuiMoveObject[]): TypedSuiMoveObject<T>[] {\n    return this.filterAndDecodeStruct(typeQname, objects)\n  }\n\n  getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {\n    return getMeaningfulFunctionParams(params)\n  }\n\n  decodeFunctionPayload(payload: MoveCallSuiTransaction, inputs: SuiCallArg[]): MoveCallSuiTransaction {\n    const functionType = [payload.package, payload.module, payload.function].join(SPLITTER)\n    const func = this.getMoveFunction(functionType)\n    const params = getMeaningfulFunctionParams(func.params)\n    const args = []\n    for (const value of payload.arguments || []) {\n      const argValue = value as any\n      if ('Input' in (argValue as any)) {\n        const idx = argValue.Input\n        const arg = inputs[idx]\n        if (arg.type === 'pure') {\n          args.push(arg.value)\n        } else if (arg.type === 'object') {\n          args.push(arg.objectId)\n        } else {\n          console.error('unexpected function arg value')\n          args.push(undefined)\n        }\n        // args.push(arg) // TODO check why ts not work using arg.push(arg)\n      } else {\n        args.push(undefined)\n      }\n    }\n\n    const argumentsTyped = this.decodeArray(args, params)\n    return {\n      ...payload,\n      arguments_decoded: argumentsTyped,\n    } as TypedFunctionPayload<any>\n  }\n}\n\nexport const MOVE_CODER = new MoveCoder()\n\nexport function defaultMoveCoder(): MoveCoder {\n  return MOVE_CODER\n}\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentio/sdk",
   "license": "Apache-2.0",
-  "version": "2.11.6-rc.2",
+  "version": "2.11.6-rc.3",
   "type": "module",
   "scripts": {
     "compile": "tsc && cp src/utils/*.csv lib/utils && cp src/tsup.config.ts lib",
@@ -23,8 +23,8 @@
     "@project-serum/anchor": "^0.26.0",
     "@sentio/bigdecimal": "^9.1.1-patch.3",
     "@sentio/ethers-v6": "^1.0.28",
-    "@sentio/protos": "^2.11.6-rc.2",
-    "@sentio/runtime": "^2.11.6-rc.2",
+    "@sentio/protos": "^2.11.6-rc.3",
+    "@sentio/runtime": "^2.11.6-rc.3",
     "@solana/web3.js": "^1.74.0",
     "@types/prettier": "^2.7.2",
     "aptos-sdk": "npm:aptos@^1.7.2",
@@ -87,5 +87,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "00032f65df12d3e50ac446bc9e5c865a110264ba"
+  "gitHead": "8e1193e39095aa024d21bf517f808f4e1e20c080"
 }

package/src/aptos/move-coder.ts

@@ -23,16 +23,16 @@ export class MoveCoder extends AbstractMoveCoder<Event | MoveResource> {
   }
 
   decodeEvent<T>(event: Event): TypedEventInstance<T> | undefined {
-    return this.decodedInternal<T>(event) as TypedEventInstance<T>
+    return this.decodedStruct<T>(event) as TypedEventInstance<T>
   }
   filterAndDecodeEvents<T>(typeQname: string, resources: Event[]): TypedEventInstance<T>[] {
-    return this.filterAndDecodeInternal(typeQname, resources) as TypedEventInstance<T>[]
+    return this.filterAndDecodeStruct(typeQname, resources) as TypedEventInstance<T>[]
   }
   decodeResource<T>(res: MoveResource): TypedMoveResource<T> | undefined {
-    return this.decodedInternal<T>(res)
+    return this.decodedStruct<T>(res)
   }
   filterAndDecodeResources<T>(typeQname: string, resources: MoveResource[]): TypedMoveResource<T>[] {
-    return this.filterAndDecodeInternal(typeQname, resources)
+    return this.filterAndDecodeStruct(typeQname, resources) as any
   }
 
   getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {

package/src/move/abstract-move-coder.ts

@@ -3,9 +3,9 @@ import { parseMoveType, TypeDescriptor } from './types.js'
 import { InternalMoveFunction, InternalMoveModule, InternalMoveStruct } from './internal-models.js'
 import { bytesToBigInt } from '../utils/index.js'
 
-export type StructWithTag<Base> = Base & {
+export type StructWithTag<Base> = {
   type: string
-  data: any
+  data: Base
 }
 
 export type DecodedStructWithTag<B, T> = StructWithTag<B> & {
@@ -24,6 +24,10 @@ export abstract class AbstractMoveCoder<StructType> {
 
   protected abstract getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[]
 
+  protected toStructWithTag(val: StructType): StructWithTag<StructType> {
+    return val as any
+  }
+
   protected loadInternal(module: InternalMoveModule) {
     if (this.contains(module.address, module.name)) {
       return
@@ -236,15 +240,23 @@ export abstract class AbstractMoveCoder<StructType> {
     return this.decodeArray(res, f.return)
   }
 
-  protected filterAndDecodeInternal<T>(
+  protected filterAndDecodeStruct(typeQname: string, structs: StructType[]): any {
+    if (!structs) {
+      return []
+    }
+    const withTags = structs.map((s) => this.toStructWithTag(s))
+    return this.filterAndDecodeStructWithTags(typeQname, withTags)
+  }
+
+  private filterAndDecodeStructWithTags<T>(
     typeQname: string,
-    structs: StructWithTag<StructType>[]
+    structsWithTags: StructWithTag<StructType>[]
   ): DecodedStructWithTag<StructType, T>[] {
-    if (!structs) {
+    if (!structsWithTags) {
       return []
     }
     const results: DecodedStructWithTag<StructType, T>[] = []
-    for (const resource of structs) {
+    for (const resource of structsWithTags) {
       if (typeQname.includes('<')) {
         if (resource.type !== typeQname) {
           continue
@@ -252,7 +264,7 @@ export abstract class AbstractMoveCoder<StructType> {
       } else if (resource.type.split('<')[0] !== typeQname) {
         continue
       }
-      const result = this.decodedInternal(resource)
+      const result = this.decodedStructWithTag(resource)
       if (result) {
         results.push(result as DecodedStructWithTag<StructType, T>)
       }
@@ -260,13 +272,19 @@ export abstract class AbstractMoveCoder<StructType> {
     return results
   }
 
-  protected decodedInternal<T>(typeStruct: StructWithTag<StructType>): DecodedStructWithTag<StructType, T> | undefined {
+  protected decodedStruct<T>(typeStruct: StructType): DecodedStructWithTag<StructType, T> | undefined {
+    return this.decodedStructWithTag(this.toStructWithTag(typeStruct)) as any
+  }
+
+  private decodedStructWithTag<T>(
+    typeStruct: StructWithTag<StructType>
+  ): DecodedStructWithTag<StructType, T> | undefined {
     const typeDescriptor = parseMoveType(typeStruct.type)
     const typeArguments = typeDescriptor.typeArgs.map((t) => t.getSignature())
 
     let dataTyped = undefined
     try {
-      dataTyped = this.decode(typeStruct.data, typeDescriptor)
+      dataTyped = this.decode(this.toStructWithTag(typeStruct.data), typeDescriptor)
     } catch (e) {
       console.error('Decoding error for ', JSON.stringify(typeStruct), e)
       return undefined

package/src/sui/move-coder.ts

@@ -1,12 +1,19 @@
 import { TypedEventInstance, TypedFunctionPayload, TypedSuiMoveObject } from './models.js'
 import { AbstractMoveCoder, StructWithTag } from '../move/abstract-move-coder.js'
-import { MoveCallSuiTransaction, SuiEvent, SuiMoveNormalizedModule, SuiCallArg, SuiMoveObject } from '@mysten/sui.js'
+import {
+  MoveCallSuiTransaction,
+  SuiEvent,
+  SuiMoveNormalizedModule,
+  SuiCallArg,
+  SuiMoveObject,
+  SuiRawData,
+} from '@mysten/sui.js'
 import { toInternalModule } from './move-types.js'
 import { SPLITTER, TypeDescriptor } from '../move/index.js'
 import { getMeaningfulFunctionParams } from './utils.js'
 import { dynamic_field } from './builtin/0x2.js'
 
-export class MoveCoder extends AbstractMoveCoder<SuiEvent> {
+export class MoveCoder extends AbstractMoveCoder<SuiEvent | SuiMoveObject> {
   load(module: SuiMoveNormalizedModule) {
     if (this.contains(module.address, module.name)) {
       return
@@ -26,22 +33,27 @@ export class MoveCoder extends AbstractMoveCoder<SuiEvent> {
     }
   }
 
+  toStructWithTag(val: SuiEvent | SuiMoveObject): StructWithTag<SuiEvent> {
+    if (SuiEvent.is(val)) {
+      return {
+        ...val,
+        data: val.parsedJson as any,
+      }
+    }
+    if (SuiRawData.is(val)) {
+      return {
+        ...val,
+        data: val.fields as any,
+      }
+    }
+    return val as any
+  }
+
   decodeEvent<T>(event: SuiEvent): TypedEventInstance<T> | undefined {
-    const res = this.decodedInternal<T>({ ...event, data: event.parsedJson })
-    return { ...event, data_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }
+    return this.decodedStruct<T>(event) as any
   }
   filterAndDecodeEvents<T>(typeQname: string, resources: SuiEvent[]): TypedEventInstance<T>[] {
-    const resp = this.filterAndDecodeInternal(
-      typeQname,
-      resources.map((event) => {
-        return { ...event, data: event.parsedJson, type: event.type }
-      })
-    )
-    return resp.map((res) => {
-      delete res.data
-      const event = res as SuiEvent
-      return { ...event, data_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }
-    })
+    return this.filterAndDecodeStruct(typeQname, resources)
   }
 
   getObjectsFromDynamicFields<Name, Value>(objects: SuiMoveObject[]): dynamic_field.Field<Name, Value>[] {
@@ -49,15 +61,7 @@ export class MoveCoder extends AbstractMoveCoder<SuiEvent> {
   }
 
   filterAndDecodeObjects<T>(typeQname: string, objects: SuiMoveObject[]): TypedSuiMoveObject<T>[] {
-    const structs = objects.map((obj) => {
-      return { ...obj, data: obj.fields, type: obj.type }
-    }) as StructWithTag<any>
-    const resp = this.filterAndDecodeInternal(typeQname, structs)
-    return resp.map((res) => {
-      delete res.data
-      const event = res as any as SuiMoveObject
-      return { ...event, data_decoded: res?.data_decoded as T, type_arguments: res?.type_arguments || [] }
-    })
+    return this.filterAndDecodeStruct(typeQname, objects)
   }
 
   getMeaningfulFunctionParams(params: TypeDescriptor[]): TypeDescriptor[] {