@ckbfs/api 1.2.1 → 1.2.4

package/ABC.LOGS

@@ -0,0 +1 @@
+MINT,TO:ckt1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdpallzwnhe64rqnqmev7hf98yrmh4yzucgdw7qwGIVE_NAME,NEW_NAME:NERVAPE_COOKIE

package/dist/utils/transaction.js

@@ -168,10 +168,12 @@ async function createAppendTransaction(signer, options) {
     // cumulative nature as required by Rule 11 in the RFC
     const contentChecksum = await (0, checksum_1.updateChecksum)(data.checksum, combinedContent);
     console.log(`Updated checksum from ${data.checksum} to ${contentChecksum} for appended content`);
+    // Get the recommended address to ensure lock script cell deps are included
+    const address = await signer.getRecommendedAddressObj();
     // Calculate the actual witness indices where our content is placed
-    // Index 0 is reserved for the secp256k1 witness for signing
-    // So our CKBFS data starts at index 1
-    const contentStartIndex = 1;
+    // CKBFS data starts at index 1 if signer's lock script is the same as ckbfs's lock script
+    // else CKBFS data starts at index 0
+    const contentStartIndex = address.script.hash() === lock.hash() ? 1 : 0;
     const witnessIndices = Array.from({ length: contentChunks.length }, (_, i) => contentStartIndex + i);
     // Create backlink for the current state based on version
     let newBackLink;
@@ -254,10 +256,6 @@ async function createAppendTransaction(signer, options) {
                 capacity: outputCapacity,
             }
         ],
-        witnesses: [
-            [], // Empty secp witness for signing
-            ...ckbfsWitnesses.map(w => `0x${Buffer.from(w).toString('hex')}`),
-        ],
         outputsData: [
             outputData,
         ]
@@ -270,16 +268,28 @@ async function createAppendTransaction(signer, options) {
         },
         depType: "depGroup"
     });
-    // Get the recommended address to ensure lock script cell deps are included
-    const address = await signer.getRecommendedAddressObj();
+    const inputsBefore = tx.inputs.length;
     // If we need more capacity than the original cell had, add additional inputs
     if (outputCapacity > capacity) {
         console.log(`Need additional capacity: ${outputCapacity - capacity} shannons`);
         // Add more inputs to cover the increased capacity
         await tx.completeInputsByCapacity(signer);
     }
+    const witnesses = [];
+    // add empty witness for signer if ckbfs's lock is the same as signer's lock
+    if (address.script.hash() === lock.hash()) {
+        witnesses.push('0x');
+    }
+    // add ckbfs witnesses
+    witnesses.push(...ckbfsWitnesses.map(w => `0x${Buffer.from(w).toString('hex')}`));
+    // Add empty witnesses for signer's input
+    // This is to ensure that the transaction is valid and can be signed
+    for (let i = inputsBefore; i < tx.inputs.length; i++) {
+        witnesses.push('0x');
+    }
+    tx.witnesses = witnesses;
     // Complete fee
-    await tx.completeFeeChangeToLock(signer, lock || address.script, feeRate || 2000);
+    await tx.completeFeeChangeToLock(signer, address.script, feeRate || 2000);
     return tx;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckbfs/api",
-  "version": "1.2.1",
+  "version": "1.2.4",
   "description": "SDK for CKBFS protocol on CKB",
   "license": "MIT",
   "author": "Code Monad<code@lab-11.org>",

package/src/utils/transaction.ts

@@ -280,10 +280,13 @@ export async function createAppendTransaction(
   const contentChecksum = await updateChecksum(data.checksum, combinedContent);
   console.log(`Updated checksum from ${data.checksum} to ${contentChecksum} for appended content`);
   
+  // Get the recommended address to ensure lock script cell deps are included
+  const address = await signer.getRecommendedAddressObj();
+
   // Calculate the actual witness indices where our content is placed
-  // Index 0 is reserved for the secp256k1 witness for signing
-  // So our CKBFS data starts at index 1
-  const contentStartIndex = 1;
+  // CKBFS data starts at index 1 if signer's lock script is the same as ckbfs's lock script
+  // else CKBFS data starts at index 0
+  const contentStartIndex = address.script.hash() === lock.hash() ? 1 : 0;
   const witnessIndices = Array.from(
     { length: contentChunks.length }, 
     (_, i) => contentStartIndex + i
@@ -378,15 +381,12 @@ export async function createAppendTransaction(
         capacity: outputCapacity,
       }
     ],
-    witnesses: [
-      [], // Empty secp witness for signing
-      ...ckbfsWitnesses.map(w => `0x${Buffer.from(w).toString('hex')}`),
-    ],
     outputsData: [
       outputData,
     ]
   });
-  
+
+
   // Add the CKBFS dep group cell dependency
   tx.addCellDeps({
     outPoint: {
@@ -396,18 +396,31 @@ export async function createAppendTransaction(
     depType: "depGroup"
   });
   
-  // Get the recommended address to ensure lock script cell deps are included
-  const address = await signer.getRecommendedAddressObj();
-  
+  const inputsBefore = tx.inputs.length;
   // If we need more capacity than the original cell had, add additional inputs
   if (outputCapacity > capacity) {
     console.log(`Need additional capacity: ${outputCapacity - capacity} shannons`);
     // Add more inputs to cover the increased capacity
     await tx.completeInputsByCapacity(signer);
   }
-  
+
+  const witnesses: any = []
+  // add empty witness for signer if ckbfs's lock is the same as signer's lock
+  if(address.script.hash() === lock.hash()) {
+    witnesses.push('0x')
+  }
+  // add ckbfs witnesses
+  witnesses.push(...ckbfsWitnesses.map(w => `0x${Buffer.from(w).toString('hex')}`))
+
+  // Add empty witnesses for signer's input
+  // This is to ensure that the transaction is valid and can be signed
+  for(let i = inputsBefore; i < tx.inputs.length; i++) {
+    witnesses.push('0x')
+  }
+  tx.witnesses = witnesses
+
   // Complete fee
-  await tx.completeFeeChangeToLock(signer, lock || address.script, feeRate || 2000);
+  await tx.completeFeeChangeToLock(signer, address.script, feeRate || 2000);
   
   return tx;
 }