From 73b06c006709680071c332e62e71e2008de52f6c Mon Sep 17 00:00:00 2001 From: Chris Stewart Date: Thu, 6 Mar 2025 17:20:02 -0600 Subject: [PATCH] Fix bug with serializing leaf version --- .../scala/org/bitcoins/core/protocol/script/ControlBlock.scala | 2 +- .../scala/org/bitcoins/core/protocol/script/LeafVersion.scala | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/src/main/scala/org/bitcoins/core/protocol/script/ControlBlock.scala b/core/src/main/scala/org/bitcoins/core/protocol/script/ControlBlock.scala index e8187798eb..4b201287b8 100644 --- a/core/src/main/scala/org/bitcoins/core/protocol/script/ControlBlock.scala +++ b/core/src/main/scala/org/bitcoins/core/protocol/script/ControlBlock.scala @@ -99,7 +99,7 @@ object TapscriptControlBlock extends Factory[TapscriptControlBlock] { internalKey: XOnlyPubKey, leafHashes: Vector[Sha256Digest]): TapscriptControlBlock = { val bytes = - (leafVersion.toByte +: internalKey.bytes) ++ ByteVector + ((leafVersion.toByte | 0x1).toByte +: internalKey.bytes) ++ ByteVector .concat(leafHashes.map(_.bytes)) TapscriptControlBlock(bytes) } diff --git a/core/src/main/scala/org/bitcoins/core/protocol/script/LeafVersion.scala b/core/src/main/scala/org/bitcoins/core/protocol/script/LeafVersion.scala index bc76d3a1c3..2b69f05bb1 100644 --- a/core/src/main/scala/org/bitcoins/core/protocol/script/LeafVersion.scala +++ b/core/src/main/scala/org/bitcoins/core/protocol/script/LeafVersion.scala @@ -18,8 +18,7 @@ object LeafVersion { case class UnknownLeafVersion(toByte: Byte) extends LeafVersion - val knownLeafVersions: Vector[LeafVersion] = Vector( - Tapscript /*, 0xc1.toByte*/ ) + val knownLeafVersions: Vector[LeafVersion] = Vector(Tapscript) final val TAPROOT_LEAF_MASK: Byte = 0xfe.toByte