fix: molecule dynVec for empty vector

ckb-devrel · Dec 20, 2024 · 7118921 · 7118921
1 parent 13c66d3
commit 7118921
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/packages/core/src/molecule/codec.ts b/packages/core/src/molecule/codec.ts
@@ -102,7 +102,7 @@ export function fixedItemVec<Encodable, Decoded>(
 
       try {
         const decodedArray: Array<Decoded> = [];
-        for (let offset = 0; offset < byteLength; offset += itemByteLength) {
+        for (let offset = 4; offset < byteLength; offset += itemByteLength) {
           decodedArray.push(
             itemCodec.decode(value.slice(offset, offset + itemByteLength)),
           );
@@ -151,16 +151,20 @@ export function dynItemVec<Encodable, Decoded>(
     },
     decode(buffer) {
       const value = bytesFrom(buffer);
+      if (value.byteLength < 4) {
+        throw new Error(
+          `dynItemVec: too short buffer, expected at least 4 bytes, but got ${value.byteLength}`,
+        );
+      }
       const byteLength = uint32From(value.slice(0, 4));
       if (byteLength !== value.byteLength) {
         throw new Error(
           `dynItemVec: invalid buffer size, expected ${byteLength}, but got ${value.byteLength}`,
         );
       }
-      if (value.byteLength < 4) {
-        throw new Error(
-          `fixedItemVec: too short buffer, expected at least 4 bytes, but got ${value.byteLength}`,
-        );
+
+      if (byteLength === 4) {
+        return [];
       }
 
       const offset = uint32From(value.slice(4, 8));

diff --git a/packages/core/src/molecule/predefined.ts b/packages/core/src/molecule/predefined.ts
@@ -103,12 +103,25 @@ export const CellDep: Codec<ckb.CellDepLike, ckb.CellDep> = struct({
 }).map({ outMap: ckb.CellDep.from });
 export const CellDepVec = vector(CellDep);
 
-export const Transaction: Codec<ckb.TransactionLike, ckb.Transaction> = table({
+export const RawTransaction = table({
   version: Uint32,
   cellDeps: CellDepVec,
   headerDeps: Byte32Vec,
   inputs: CellInputVec,
   outputs: CellOutputVec,
   outputsData: BytesVec,
-  witnesses: BytesVec,
 }).map({ outMap: ckb.Transaction.from });
+
+export const Transaction: Codec<ckb.TransactionLike, ckb.Transaction> = table({
+  raw: RawTransaction,
+  witnesses: BytesVec,
+}).map({
+  inMap: (txLike: ckb.TransactionLike) => {
+    const tx = ckb.Transaction.from(txLike);
+    return {
+      raw: tx,
+      witnesses: tx.witnesses,
+    };
+  },
+  outMap: (tx) => ckb.Transaction.from({ ...tx.raw, witnesses: tx.witnesses }),
+});