@ckb-ccc/core 1.8.1 → 1.9.1

package/dist.commonjs/molecule/entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../src/molecule/entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAW,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC;;;GAGG;AACH,8BAAsB,MAAM;IAC1B;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,WAAW;QA6D1C;;;;WAIG;mBACQ,KAAK;QAMhB;;;;WAIG;iBACM,OAAO;QAMhB;;;;;WAKG;kBACO,WAAW,GAAG,OAAO;QAe/B;;;;WAIG;gBACK,GAAG;;QA3GX;;;;WAIG;qBACiB,MAAM;QAC1B;;;;;;;WAOG;kBACc,WAAW,GAAG,KAAK;QAKpC;;;;;;;WAOG;kBACc,SAAS,GAAG,OAAO;QAMpC;;;;;;;WAOG;0BACsB,SAAS,GAAG,OAAO;QAM5C;;;;;;;WAOG;gBACY,WAAW,GAAG,OAAO;;IA4DxC,QAAQ,CAAC,OAAO,IAAI,KAAK;IACzB,QAAQ,CAAC,IAAI,IAAI,GAAG;IACpB,QAAQ,CAAC,KAAK,IAAI,MAAM;CACzB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,KAAK,CACnB,SAAS,EACT,QAAQ,SAAS,SAAS,EAC1B,OAAO,SAAS,QAAQ,EACxB,IAAI,SAAS,MAAM,GAAG,QAAQ,EAC9B,eAAe,SAAS,WAAW,CAAC,IAAI,CAAC,GAAG;IAC1C,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,SAAS,EAAE,QAAQ,GAAG,KAAK,CAAC;IACnC,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,QAAQ,CAAC;IACvC,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;CACnC,EACD,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,iBACF,eAAe;;;sBAGhB,QAAQ,GAAG,KAAK;sBAGhB,SAAS,GAAG,IAAI;qBAIjB,SAAS,GAAG,IAAI;kBAjB5B,QAAQ,GAAG,IAAI;oBAsBhC"}
+{"version":3,"file":"entity.d.ts","sourceRoot":"","sources":["../../src/molecule/entity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAW,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9D,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC;;;GAGG;AACH,8BAAsB,MAAM;IAC1B;;;;OAIG;IACH,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,WAAW;QA6D1C;;;;WAIG;mBACQ,KAAK;QAMhB;;;;WAIG;iBACM,OAAO;QAMhB;;;;;WAKG;kBACO,WAAW,GAAG,OAAO;QAe/B;;;;WAIG;gBACK,GAAG;;QA3GX;;;;WAIG;qBACiB,MAAM;QAC1B;;;;;;;WAOG;kBACc,WAAW,GAAG,KAAK;QAKpC;;;;;;;WAOG;kBACc,SAAS,GAAG,OAAO;QAMpC;;;;;;;WAOG;0BACsB,SAAS,GAAG,OAAO;QAM5C;;;;;;;WAOG;gBACY,WAAW,GAAG,OAAO;;IA4DxC,QAAQ,CAAC,OAAO,IAAI,KAAK;IACzB,QAAQ,CAAC,IAAI,IAAI,GAAG;IACpB,QAAQ,CAAC,KAAK,IAAI,MAAM;CACzB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,KAAK,CACnB,SAAS,EACT,QAAQ,SAAS,SAAS,EAC1B,OAAO,SAAS,QAAQ,EACxB,IAAI,SAAS,MAAM,GAAG,QAAQ,EAC9B,eAAe,SAAS,WAAW,CAAC,IAAI,CAAC,GAAG;IAC1C,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,SAAS,EAAE,QAAQ,GAAG,KAAK,CAAC;IACnC,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,QAAQ,CAAC;IACvC,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;CACnC,EACD,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,iBACF,eAAe,qBAc9C"}

package/dist.commonjs/molecule/entity.js

@@ -121,19 +121,16 @@ exports.Entity = Entity;
  */
 function codec(codec) {
     return function (Constructor) {
-        var _a;
-        return _a = class Extended extends Constructor {
-                static encode(encodable) {
-                    return codec.encode(encodable);
-                }
-                static decode(bytesLike) {
-                    return Constructor.from(codec.decode(bytesLike));
-                }
-                static fromBytes(bytes) {
-                    return Constructor.from(codec.decode(bytes));
-                }
-            },
-            _a.byteLength = codec.byteLength,
-            _a;
+        Constructor.byteLength = codec.byteLength;
+        Constructor.encode = function (encodable) {
+            return codec.encode(encodable);
+        };
+        Constructor.decode = function (bytesLike) {
+            return Constructor.from(codec.decode(bytesLike));
+        };
+        Constructor.fromBytes = function (bytes) {
+            return Constructor.from(codec.decode(bytes));
+        };
+        return Constructor;
     };
 }

package/dist.commonjs/signer/nostr/signerNostrPrivateKey.d.ts

@@ -2,6 +2,10 @@ import { Client } from "../../client/index.js";
 import { HexLike } from "../../hex/index.js";
 import { NostrEvent } from "./signerNostr.js";
 import { SignerNostrPublicKeyReadonly } from "./signerNostrPublicKeyReadonly.js";
+/**
+ * Signer from Nostr private key
+ * Support nsec and hex format
+ */
 export declare class SignerNostrPrivateKey extends SignerNostrPublicKeyReadonly {
     private readonly privateKey;
     constructor(client: Client, privateKeyLike: HexLike);

package/dist.commonjs/signer/nostr/signerNostrPrivateKey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signerNostrPrivateKey.d.ts","sourceRoot":"","sources":["../../../src/signer/nostr/signerNostrPrivateKey.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAgB,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAGjF,qBAAa,qBAAsB,SAAQ,4BAA4B;IACrE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAM;gBAErB,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO;IAO7C,cAAc,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;CAYvE"}
+{"version":3,"file":"signerNostrPrivateKey.d.ts","sourceRoot":"","sources":["../../../src/signer/nostr/signerNostrPrivateKey.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAgB,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAGjF;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,4BAA4B;IACrE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAM;gBAErB,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO;IAkB7C,cAAc,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;CAYvE"}

package/dist.commonjs/signer/nostr/signerNostrPrivateKey.js

@@ -2,12 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SignerNostrPrivateKey = void 0;
 const secp256k1_1 = require("@noble/curves/secp256k1");
+const bech32_1 = require("bech32");
 const index_js_1 = require("../../hex/index.js");
 const signerNostrPublicKeyReadonly_js_1 = require("./signerNostrPublicKeyReadonly.js");
 const verify_js_1 = require("./verify.js");
+/**
+ * Signer from Nostr private key
+ * Support nsec and hex format
+ */
 class SignerNostrPrivateKey extends signerNostrPublicKeyReadonly_js_1.SignerNostrPublicKeyReadonly {
     constructor(client, privateKeyLike) {
-        const privateKey = (0, index_js_1.hexFrom)(privateKeyLike);
+        const privateKey = (() => {
+            if (typeof privateKeyLike === "string" &&
+                privateKeyLike.startsWith("nsec")) {
+                const { words } = bech32_1.bech32.decode(privateKeyLike);
+                return (0, index_js_1.hexFrom)(bech32_1.bech32.fromWords(words));
+            }
+            return (0, index_js_1.hexFrom)(privateKeyLike);
+        })();
         super(client, secp256k1_1.schnorr.getPublicKey(privateKey.slice(2)));
         this.privateKey = privateKey;
     }

package/dist.commonjs/signer/nostr/signerNostrPublicKeyReadonly.d.ts

@@ -1,6 +1,10 @@
 import { Client } from "../../client/index.js";
 import { Hex, HexLike } from "../../hex/index.js";
 import { SignerNostr } from "./signerNostr.js";
+/**
+ * Signer from Nostr public key
+ * Support npub and hex format
+ */
 export declare class SignerNostrPublicKeyReadonly extends SignerNostr {
     readonly publicKey: Hex;
     constructor(client: Client, publicKey: HexLike);

package/dist.commonjs/signer/nostr/signerNostrPublicKeyReadonly.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signerNostrPublicKeyReadonly.d.ts","sourceRoot":"","sources":["../../../src/signer/nostr/signerNostrPublicKeyReadonly.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,GAAG,EAAW,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,4BAA6B,SAAQ,WAAW;IAC3D,SAAgB,SAAS,EAAE,GAAG,CAAC;gBAEnB,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO;IAWxC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAExB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAI/B,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC;CAGxC"}
+{"version":3,"file":"signerNostrPublicKeyReadonly.d.ts","sourceRoot":"","sources":["../../../src/signer/nostr/signerNostrPublicKeyReadonly.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,GAAG,EAAW,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;GAGG;AACH,qBAAa,4BAA6B,SAAQ,WAAW;IAC3D,SAAgB,SAAS,EAAE,GAAG,CAAC;gBAEnB,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO;IAWxC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAExB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAI/B,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC;CAGxC"}

package/dist.commonjs/signer/nostr/signerNostrPublicKeyReadonly.js

@@ -4,6 +4,10 @@ exports.SignerNostrPublicKeyReadonly = void 0;
 const bech32_1 = require("bech32");
 const index_js_1 = require("../../hex/index.js");
 const signerNostr_js_1 = require("./signerNostr.js");
+/**
+ * Signer from Nostr public key
+ * Support npub and hex format
+ */
 class SignerNostrPublicKeyReadonly extends signerNostr_js_1.SignerNostr {
     constructor(client, publicKey) {
         super(client);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/core",
-  "version": "1.8.1",
+  "version": "1.9.1",
   "description": "Core of CCC - CKBer's Codebase",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -38,20 +38,18 @@
   "devDependencies": {
     "@eslint/js": "^9.1.1",
     "@types/blake2b": "^2.1.3",
-    "@types/jest": "^29.5.12",
     "@types/ws": "^8.5.12",
     "copyfiles": "^2.4.1",
     "eslint": "^9.1.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "jest": "^29.7.0",
-    "prettier": "^3.2.5",
-    "prettier-plugin-organize-imports": "^3.2.4",
+    "eslint-config-prettier": "^10.1.5",
+    "eslint-plugin-prettier": "^5.4.1",
+    "prettier": "^3.5.3",
+    "prettier-plugin-organize-imports": "^4.1.0",
     "rimraf": "^5.0.5",
     "ts-essentials": "^9.4.2",
-    "ts-jest": "^29.1.4",
     "typescript": "^5.4.5",
-    "typescript-eslint": "^7.7.0"
+    "typescript-eslint": "^7.7.0",
+    "vitest": "^3.2.2"
   },
   "publishConfig": {
     "access": "public"
@@ -72,7 +70,8 @@
     "ws": "^8.18.0"
   },
   "scripts": {
-    "test": "jest",
+    "test": "vitest",
+    "test:ci": "vitest run",
     "build": "rimraf ./dist && rimraf ./dist.commonjs && tsc && tsc --project tsconfig.commonjs.json && copyfiles -u 2 misc/basedirs/**/* .",
     "lint": "eslint ./src",
     "format": "prettier --write . && eslint --fix ./src"

package/prettier.config.mjs

@@ -0,0 +1,13 @@
+// prettier.config.js, .prettierrc.js, prettier.config.mjs, or .prettierrc.mjs
+
+/**
+ * @see https://prettier.io/docs/configuration
+ * @type {import("prettier").Config}
+ */
+const config = {
+  singleQuote: false,
+  trailingComma: "all",
+  plugins: [import.meta.resolve("prettier-plugin-organize-imports")],
+};
+
+export default config;

package/src/bytes/index.ts

@@ -5,6 +5,10 @@ import { BytesFromEncoding } from "./advanced.js";
  * @public
  */
 export type Bytes = Uint8Array;
+/**
+ * @public
+ */
+export const Bytes = Uint8Array;
 /**
  * @public
  */

package/src/ckb/transaction.ts

@@ -1673,10 +1673,10 @@ export class Transaction extends mol.Entity.Base<
     capacityTweak?: NumLike,
     filter?: ClientCollectableSearchKeyFilterLike,
   ): Promise<number> {
-    const exceptedCapacity =
+    const expectedCapacity =
       this.getOutputsCapacity() + numFrom(capacityTweak ?? 0);
     const inputsCapacity = await this.getInputsCapacity(from.client);
-    if (inputsCapacity >= exceptedCapacity) {
+    if (inputsCapacity >= expectedCapacity) {
       return 0;
     }
 
@@ -1688,7 +1688,7 @@ export class Transaction extends mol.Entity.Base<
       },
       (acc, { cellOutput: { capacity } }) => {
         const sum = acc + capacity;
-        return sum >= exceptedCapacity ? undefined : sum;
+        return sum >= expectedCapacity ? undefined : sum;
       },
       inputsCapacity,
     );
@@ -1698,7 +1698,7 @@ export class Transaction extends mol.Entity.Base<
     }
 
     throw new Error(
-      `Insufficient CKB, need ${fixedPointToString(exceptedCapacity - accumulated)} extra CKB`,
+      `Insufficient CKB, need ${fixedPointToString(expectedCapacity - accumulated)} extra CKB`,
     );
   }
 
@@ -1719,15 +1719,45 @@ export class Transaction extends mol.Entity.Base<
     return addedCount;
   }
 
+  /**
+   * Complete inputs by UDT balance
+   *
+   * This method succeeds only if enough balance is collected.
+   *
+   * It will try to collect at least two inputs, even when the first input already contains enough balance, to avoid extra occupation fees introduced by the change cell. An edge case: If the first cell has the same amount as the output, a new cell is not needed.
+   * @param from - The signer to complete the inputs.
+   * @param type - The type script of the UDT.
+   * @param balanceTweak - The tweak of the balance.
+   * @returns A promise that resolves to the number of inputs added.
+   */
   async completeInputsByUdt(
     from: Signer,
     type: ScriptLike,
     balanceTweak?: NumLike,
   ): Promise<number> {
-    const exceptedBalance =
+    const expectedBalance =
       this.getOutputsUdtBalance(type) + numFrom(balanceTweak ?? 0);
-    const inputsBalance = await this.getInputsUdtBalance(from.client, type);
-    if (inputsBalance >= exceptedBalance) {
+    if (expectedBalance === numFrom(0)) {
+      return 0;
+    }
+
+    const [inputsBalance, inputsCount] = await reduceAsync(
+      this.inputs,
+      async ([balanceAcc, countAcc], input) => {
+        const { cellOutput, outputData } = await input.getCell(from.client);
+        if (!cellOutput.type?.eq(type)) {
+          return;
+        }
+
+        return [balanceAcc + udtBalanceFrom(outputData), countAcc + 1];
+      },
+      [numFrom(0), 0],
+    );
+
+    if (
+      inputsBalance === expectedBalance ||
+      (inputsBalance >= expectedBalance && inputsCount >= 2)
+    ) {
       return 0;
     }
 
@@ -1737,20 +1767,23 @@ export class Transaction extends mol.Entity.Base<
         script: type,
         outputDataLenRange: [16, numFrom("0xffffffff")],
       },
-      (acc, { outputData }) => {
+      (acc, { outputData }, _i, collected) => {
         const balance = udtBalanceFrom(outputData);
         const sum = acc + balance;
-        return sum >= exceptedBalance ? undefined : sum;
+        return sum === expectedBalance ||
+          (sum >= expectedBalance && inputsCount + collected.length >= 2)
+          ? undefined
+          : sum;
       },
       inputsBalance,
     );
 
-    if (accumulated === undefined) {
+    if (accumulated === undefined || accumulated >= expectedBalance) {
       return addedCount;
     }
 
     throw new Error(
-      `Insufficient coin, need ${exceptedBalance - accumulated} extra coin`,
+      `Insufficient coin, need ${expectedBalance - accumulated} extra coin`,
     );
   }
 

package/src/client/clientPublicMainnet.advanced.ts

@@ -54,6 +54,23 @@ export const MAINNET_SCRIPTS: Record<KnownScript, ScriptInfoLike | undefined> =
         },
       ],
     },
+    [KnownScript.Secp256k1MultisigV2]: {
+      codeHash:
+        "0x36c971b8d41fbd94aabca77dc75e826729ac98447b46f91e00796155dddb0d29",
+      hashType: "data1",
+      cellDeps: [
+        {
+          cellDep: {
+            outPoint: {
+              txHash:
+                "0x6888aa39ab30c570c2c30d9d5684d3769bf77265a7973211a3c087fe8efbf738",
+              index: 0,
+            },
+            depType: "depGroup",
+          },
+        },
+      ],
+    },
     [KnownScript.AnyoneCanPay]: {
       codeHash:
         "0xd369597ff47f29fbc0d47d2e3775370d1250b85140c670e4718af712983a2354",

package/src/client/clientPublicTestnet.advanced.ts

@@ -54,6 +54,23 @@ export const TESTNET_SCRIPTS: Record<KnownScript, ScriptInfoLike> =
         },
       ],
     },
+    [KnownScript.Secp256k1MultisigV2]: {
+      codeHash:
+        "0x36c971b8d41fbd94aabca77dc75e826729ac98447b46f91e00796155dddb0d29",
+      hashType: "data1",
+      cellDeps: [
+        {
+          cellDep: {
+            outPoint: {
+              txHash:
+                "0x2eefdeb21f3a3edf697c28a52601b4419806ed60bb427420455cc29a090b26d5",
+              index: 0,
+            },
+            depType: "depGroup",
+          },
+        },
+      ],
+    },
     [KnownScript.AnyoneCanPay]: {
       codeHash:
         "0x3419a1c09eb2567f6552ee7a8ecffd64155cffe0f1796e6e61ec088d740c1356",
@@ -109,7 +126,7 @@ export const TESTNET_SCRIPTS: Record<KnownScript, ScriptInfoLike> =
           cellDep: {
             outPoint: {
               txHash:
-                "0x4dcf3f3b09efac8995d6cbee87c5345e812d310094651e0c3d9a730f32dc9263",
+                "0x759f281588c96979764cb21c196478cf8e13ea81fede7f4ba26d1ff29dbc6a81",
               index: 0,
             },
             depType: "depGroup",

package/src/client/clientTypes.ts

@@ -555,7 +555,7 @@ export class ErrorClientMaxFeeRateExceeded extends ErrorClientBase {
     const limit = numFrom(limitLike).toString();
     const actual = numFrom(actualLike).toString();
     super({
-      message: `Max fee rate exceeded limit ${limit}, actual ${actual}. Developer might forgot to complete transaction fee before sending. See https://docs.ckbccc.com/classes/_ckb_ccc_core.index.ccc.Transaction.html#completeFeeBy.`,
+      message: `Max fee rate exceeded limit ${limit}, actual ${actual}. Developer might forgot to complete transaction fee before sending. See https://api.ckbccc.com/classes/_ckb_ccc_core.index.ccc.Transaction.html#completeFeeBy.`,
       data: JSON.stringify({ limit, actual }),
     });
   }

package/src/client/knownScript.ts

@@ -5,6 +5,7 @@ export enum KnownScript {
   NervosDao = "NervosDao",
   Secp256k1Blake160 = "Secp256k1Blake160",
   Secp256k1Multisig = "Secp256k1Multisig",
+  Secp256k1MultisigV2 = "Secp256k1MultisigV2", // Enhanced since handling (https://github.com/nervosnetwork/ckb-system-scripts/pull/99)
   AnyoneCanPay = "AnyoneCanPay",
   TypeId = "TypeId",
   XUdt = "XUdt",

package/src/molecule/codec.ts

@@ -18,13 +18,19 @@ import {
 
 export type CodecLike<Encodable, Decoded = Encodable> = {
   readonly encode: (encodable: Encodable) => Bytes;
-  readonly decode: (decodable: BytesLike) => Decoded;
+  readonly decode: (
+    decodable: BytesLike,
+    config?: { isExtraFieldIgnored?: boolean },
+  ) => Decoded;
   readonly byteLength?: number;
 };
 export class Codec<Encodable, Decoded = Encodable> {
   constructor(
     public readonly encode: (encodable: Encodable) => Bytes,
-    public readonly decode: (decodable: BytesLike) => Decoded,
+    public readonly decode: (
+      decodable: BytesLike,
+      config?: { isExtraFieldIgnored?: boolean }, // This is equivalent to "compatible" in the Rust implementation of Molecule.
+    ) => Decoded,
     public readonly byteLength?: number, // if provided, treat codec as fixed length
   ) {}
 
@@ -43,7 +49,7 @@ export class Codec<Encodable, Decoded = Encodable> {
         }
         return encoded;
       },
-      (decodable) => {
+      (decodable, config) => {
         const decodableBytes = bytesFrom(decodable);
         if (
           byteLength !== undefined &&
@@ -53,7 +59,7 @@ export class Codec<Encodable, Decoded = Encodable> {
             `Codec.decode: expected byte length ${byteLength}, got ${decodableBytes.byteLength}`,
           );
         }
-        return decode(decodable);
+        return decode(decodable, config);
       },
       byteLength,
     );
@@ -69,10 +75,10 @@ export class Codec<Encodable, Decoded = Encodable> {
     return new Codec(
       (encodable) =>
         this.encode((inMap ? inMap(encodable) : encodable) as Encodable),
-      (buffer) =>
+      (buffer, config) =>
         (outMap
-          ? outMap(this.decode(buffer))
-          : this.decode(buffer)) as NewDecoded,
+          ? outMap(this.decode(buffer, config))
+          : this.decode(buffer, config)) as NewDecoded,
       this.byteLength,
     );
   }
@@ -128,7 +134,7 @@ export function fixedItemVec<Encodable, Decoded>(
         throw new Error(`fixedItemVec(${e?.toString()})`);
       }
     },
-    decode(buffer) {
+    decode(buffer, config) {
       const value = bytesFrom(buffer);
       if (value.byteLength < 4) {
         throw new Error(
@@ -147,7 +153,10 @@ export function fixedItemVec<Encodable, Decoded>(
         const decodedArray: Array<Decoded> = [];
         for (let offset = 4; offset < byteLength; offset += itemByteLength) {
           decodedArray.push(
-            itemCodec.decode(value.slice(offset, offset + itemByteLength)),
+            itemCodec.decode(
+              value.slice(offset, offset + itemByteLength),
+              config,
+            ),
           );
         }
         return decodedArray;
@@ -185,7 +194,7 @@ export function dynItemVec<Encodable, Decoded>(
         throw new Error(`dynItemVec(${e?.toString()})`);
       }
     },
-    decode(buffer) {
+    decode(buffer, config) {
       const value = bytesFrom(buffer);
       if (value.byteLength < 4) {
         throw new Error(
@@ -215,7 +224,7 @@ export function dynItemVec<Encodable, Decoded>(
           const start = offsets[index];
           const end = offsets[index + 1];
           const itemBuffer = value.slice(start, end);
-          decodedArray.push(itemCodec.decode(itemBuffer));
+          decodedArray.push(itemCodec.decode(itemBuffer, config));
         }
         return decodedArray;
       } catch (e) {
@@ -259,13 +268,13 @@ export function option<Encodable, Decoded>(
         throw new Error(`option(${e?.toString()})`);
       }
     },
-    decode(buffer) {
+    decode(buffer, config) {
       const value = bytesFrom(buffer);
       if (value.byteLength === 0) {
         return undefined;
       }
       try {
-        return innerCodec.decode(buffer);
+        return innerCodec.decode(buffer, config);
       } catch (e) {
         throw new Error(`option(${e?.toString()})`);
       }
@@ -290,7 +299,7 @@ export function byteVec<Encodable, Decoded>(
         throw new Error(`byteVec(${e?.toString()})`);
       }
     },
-    decode(buffer) {
+    decode(buffer, config) {
       const value = bytesFrom(buffer);
       if (value.byteLength < 4) {
         throw new Error(
@@ -304,7 +313,7 @@ export function byteVec<Encodable, Decoded>(
         );
       }
       try {
-        return codec.decode(value.slice(4));
+        return codec.decode(value.slice(4), config);
       } catch (e: unknown) {
         throw new Error(`byteVec(${e?.toString()})`);
       }
@@ -371,7 +380,7 @@ export function table<
       const packedTotalSize = uint32To(header.length + body.length + 4);
       return bytesConcat(packedTotalSize, header, body);
     },
-    decode(buffer) {
+    decode(buffer, config) {
       const value = bytesFrom(buffer);
       if (value.byteLength < 4) {
         throw new Error(
@@ -379,15 +388,38 @@ export function table<
         );
       }
       const byteLength = uint32From(value.slice(0, 4));
+      const headerLength = uint32From(value.slice(4, 8));
+      const actualFieldCount = (headerLength - 4) / 4;
+
       if (byteLength !== value.byteLength) {
         throw new Error(
           `table: invalid buffer size, expected ${byteLength}, but got ${value.byteLength}`,
         );
       }
+
+      if (actualFieldCount < keys.length) {
+        throw new Error(
+          `table: invalid field count, expected ${keys.length}, but got ${actualFieldCount}`,
+        );
+      }
+
+      if (actualFieldCount > keys.length && !config?.isExtraFieldIgnored) {
+        throw new Error(
+          `table: invalid field count, expected ${keys.length}, but got ${actualFieldCount}, and extra fields are not allowed in the current configuration. If you want to ignore extra fields, set isExtraFieldIgnored to true.`,
+        );
+      }
       const offsets = keys.map((_, index) =>
         uint32From(value.slice(4 + index * 4, 8 + index * 4)),
       );
-      offsets.push(byteLength);
+      // If there are extra fields, add the last offset to the offsets array
+      if (actualFieldCount > keys.length) {
+        offsets.push(
+          uint32From(value.slice(4 + keys.length * 4, 8 + keys.length * 4)),
+        );
+      } else {
+        // If there are no extra fields, add the byte length to the offsets array
+        offsets.push(byteLength);
+      }
       const object = {};
       for (let i = 0; i < offsets.length - 1; i++) {
         const start = offsets[i];
@@ -397,7 +429,7 @@ export function table<
         const payload = value.slice(start, end);
         try {
           // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-          Object.assign(object, { [field]: codec.decode(payload) });
+          Object.assign(object, { [field]: codec.decode(payload, config) });
         } catch (e: unknown) {
           throw new Error(`table.${field}(${e?.toString()})`);
         }
@@ -466,7 +498,7 @@ export function union<T extends Record<string, CodecLike<any, any>>>(
         throw new Error(`union.(${typeStr})(${e?.toString()})`);
       }
     },
-    decode(buffer) {
+    decode(buffer, config) {
       const value = bytesFrom(buffer);
       const fieldIndex = uint32From(value.slice(0, 4));
       const keys = Object.keys(codecLayout);
@@ -496,7 +528,7 @@ export function union<T extends Record<string, CodecLike<any, any>>>(
       return {
         type: field,
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        value: codecLayout[field].decode(value.slice(4)),
+        value: codecLayout[field].decode(value.slice(4), config),
       } as UnionDecoded<T>;
     },
   });
@@ -535,7 +567,7 @@ export function struct<
 
       return bytesFrom(bytes);
     },
-    decode(buffer) {
+    decode(buffer, config) {
       const value = bytesFrom(buffer);
       const object = {};
       let offset = 0;
@@ -543,7 +575,7 @@ export function struct<
         const payload = value.slice(offset, offset + codec.byteLength!);
         try {
           // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-          Object.assign(object, { [key]: codec.decode(payload) });
+          Object.assign(object, { [key]: codec.decode(payload, config) });
         } catch (e: unknown) {
           throw new Error(`struct.${key}(${(e as Error).toString()})`);
         }
@@ -583,7 +615,7 @@ export function array<Encodable, Decoded>(
         throw new Error(`array(${e?.toString()})`);
       }
     },
-    decode(buffer) {
+    decode(buffer, config) {
       const value = bytesFrom(buffer);
       if (value.byteLength != byteLength) {
         throw new Error(
@@ -594,7 +626,7 @@ export function array<Encodable, Decoded>(
         const result: Array<Decoded> = [];
         for (let i = 0; i < value.byteLength; i += itemCodec.byteLength!) {
           result.push(
-            itemCodec.decode(value.slice(i, i + itemCodec.byteLength!)),
+            itemCodec.decode(value.slice(i, i + itemCodec.byteLength!), config),
           );
         }
         return result;

package/src/molecule/entity.ts

@@ -166,18 +166,17 @@ export function codec<
   },
 >(codec: Codec<Encodable, Decoded>) {
   return function (Constructor: ConstructorType) {
-    return class Extended extends Constructor {
-      static byteLength = codec.byteLength;
-      static encode(encodable: TypeLike): Bytes {
-        return codec.encode(encodable);
-      }
-      static decode(bytesLike: BytesLike): Type {
-        return Constructor.from(codec.decode(bytesLike));
-      }
-
-      static fromBytes(bytes: BytesLike): Type {
-        return Constructor.from(codec.decode(bytes));
-      }
+    Constructor.byteLength = codec.byteLength;
+    Constructor.encode = function (encodable: TypeLike) {
+      return codec.encode(encodable);
     };
+    Constructor.decode = function (bytesLike: BytesLike) {
+      return Constructor.from(codec.decode(bytesLike));
+    };
+    Constructor.fromBytes = function (bytes: BytesLike) {
+      return Constructor.from(codec.decode(bytes));
+    };
+
+    return Constructor;
   };
 }