Fix LEAF_VERSION_TAPSCRIPT

CATProtocol · Jan 11, 2025 · d02dca8 · d02dca8
1 parent e39a107
commit d02dca8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cat-protocol/cat-sdk",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "CAT protocol SDK.",
   "author": "catprotocol.org",
   "main": "./dist/cjs/index.js",

diff --git a/packages/sdk/src/lib/covenant.ts b/packages/sdk/src/lib/covenant.ts
@@ -1,6 +1,6 @@
 import { ByteString, FixedArray, hash160, SmartContract, UTXO } from 'scrypt-ts'
 import { Tap } from '@cmdcode/tapscript' // Requires node >= 19
-import { btc } from './btc'
+import { btc, LEAF_VERSION_TAPSCRIPT } from './btc'
 import { SupportedNetwork, TAPROOT_ONLY_SCRIPT_SPENT_KEY } from './constants'
 import { TapLeafSmartContract } from './tapLeafSmartContract'
 import { Optional, p2trLockingScriptToAddr } from './utils'
@@ -51,13 +51,15 @@ export abstract class Covenant<StateT = undefined> {
       }
       const [tpubkey] = Tap.getPubKey(TAPROOT_ONLY_SCRIPT_SPENT_KEY, {
           tree: tapTree,
+          version: LEAF_VERSION_TAPSCRIPT
       })
 
       for (const cK of subContracts.map(c => c.alias || 'default')) {
           const taprootContract = tapLeafContracts[cK]
           const [, cblock] = Tap.getPubKey(TAPROOT_ONLY_SCRIPT_SPENT_KEY, {
               target: taprootContract.tapScript,
               tree: tapTree,
+              version: LEAF_VERSION_TAPSCRIPT
           })
           taprootContract.tpubkey = tpubkey
           taprootContract.cblock = cblock

diff --git a/packages/sdk/src/lib/tapLeafSmartContract.ts b/packages/sdk/src/lib/tapLeafSmartContract.ts
@@ -1,6 +1,6 @@
 import { hash160, int2ByteString, SmartContract } from 'scrypt-ts'
 import { Tap } from '@cmdcode/tapscript' // Requires node >= 19
-import { bitcoinjs, btc } from './btc'
+import { bitcoinjs, btc, LEAF_VERSION_TAPSCRIPT } from './btc'
 import { TAPROOT_ONLY_SCRIPT_SPENT_KEY } from './constants'
 import { unlockingScriptToWitness } from './txTools'
 import { ABICoder, Arguments } from 'scryptlib/dist/abi'
@@ -20,6 +20,7 @@ export class TapLeafSmartContract {
       const tapScript = Tap.encodeScript(contractScript.toBuffer())
       const [tpubkey, cblock] = Tap.getPubKey(TAPROOT_ONLY_SCRIPT_SPENT_KEY, {
           target: tapScript,
+          version: LEAF_VERSION_TAPSCRIPT
       })
       this.contract = contract
       this.contractScriptHash = hash160(

diff --git a/packages/sdk/src/lib/utils.ts b/packages/sdk/src/lib/utils.ts
@@ -1,6 +1,6 @@
 import { Tap } from "@cmdcode/tapscript";
 import { TxOutpoint } from "../contracts/utils/txUtil";
-import { bitcoinjs, btc } from "./btc";
+import { LEAF_VERSION_TAPSCRIPT, bitcoinjs, btc } from "./btc";
 import { SupportedNetwork, TAPROOT_ONLY_SCRIPT_SPENT_KEY } from "./constants";
 import * as btcSigner from '@scure/btc-signer';
 import { Network, networks, payments, Psbt, TxInput } from "bitcoinjs-lib";
@@ -37,6 +37,7 @@ export function scriptToP2tr(script: Buffer): {
   const tapScript = Tap.encodeScript(script)
   const [tpubkey, cblock] = Tap.getPubKey(TAPROOT_ONLY_SCRIPT_SPENT_KEY, {
     target: tapScript,
+    version: LEAF_VERSION_TAPSCRIPT
   })
   return {
     p2trLockingScript: xPubkeyToP2trLockingScript(tpubkey).toHex(),