@kontor/kontor-sdk 1.0.0-alpha.7 → 1.0.0-alpha.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontor/kontor-sdk",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.9",
   "author": "Unspendable Labs <dev@unspendablelabs.com>",
   "description": "The official SDK to the Kontor Bitcoin metaprotocol",
   "repository": {

package/src/sdk/actions/kontor/wallet/sign-reveal.ts

@@ -55,28 +55,25 @@ export async function signReveal<
   for (let i = 0; i < params.parcipantScripts.length; i++) {
     const { commit_tap_leaf_script } = params.parcipantScripts[i]!;
 
-    // 1. Raw tapscript from compose (no version byte)
     const scriptBytes = hex.decode(commit_tap_leaf_script.script);
-
-    // 2. Control block from compose (contains version + internal key + path)
     const controlBlockBytes = hex.decode(commit_tap_leaf_script.controlBlock);
-    const controlBlock = TaprootControlBlock.decode(controlBlockBytes);
-
-    // Optional sanity check:
-    const versionFromCB = controlBlock.version & 0xfe;
-    if (
-      commit_tap_leaf_script.leafVersion !== undefined &&
-      commit_tap_leaf_script.leafVersion !== versionFromCB
-    ) {
-      console.warn(
-        "LeafVersion mismatch between ParticipantScripts and controlBlock",
-      );
-    }
-
-    // 3. PSBT encoding: [controlBlock, scriptBytes]
-    tx.updateInput(i, {
-      tapLeafScript: [[controlBlock, scriptBytes]],
-    });
+    const leafVersion = commit_tap_leaf_script.leafVersion;
+
+    // scure expects script || leafVersion as one buffer
+    const scriptWithVersion = u.concatBytes(
+      scriptBytes,
+      new Uint8Array([leafVersion ?? 0xc0]), // default 0xc0 if needed
+    );
+
+    const controlBlockStruct = TaprootControlBlock.decode(controlBlockBytes);
+
+    tx.updateInput(
+      i,
+      {
+        tapLeafScript: [[controlBlockStruct, scriptWithVersion]],
+      },
+      true,
+    );
   }
 
   const signInputs = Array.from(
@@ -112,18 +109,23 @@ export async function signReveal<
 
   // this is technically unnecessary as scure/btc-signer
   // will product this witness by default
-  for (let i = 0; i < params.parcipantScripts.length; i++) {
-    const input = signedTx.getInput(i);
-    const p = params.parcipantScripts[i]!;
-    console.log({ input, tapscriptsig: input.tapScriptSig });
-    signedTx.updateInput(i, {
-      finalScriptWitness: [
-        input.tapScriptSig![0]![1],
-        hex.decode(p.commit_tap_leaf_script.script),
-        hex.decode(p.commit_tap_leaf_script.controlBlock),
-      ],
-    });
-  }
+  // for (let i = 0; i < params.parcipantScripts.length; i++) {
+  //   const input = signedTx.getInput(i);
+  //   const p = params.parcipantScripts[i]!;
+  //   console.log({ input, tapscriptsig: input.tapScriptSig });
+  //
+  //   signedTx.updateInput(i, {
+  //     finalScriptWitness: [
+  //       input.tapScriptSig![0]![1],
+  //       hex.decode(p.commit_tap_leaf_script.script),
+  //       hex.decode(p.commit_tap_leaf_script.controlBlock),
+  //     ],
+  //   });
+  //
+  //   delete input.tapScriptSig;
+  //   delete input.tapKeySig;
+  //   delete input.tapLeafScript;
+  // }
 
   return signedTx;
 }