primitives: make TapMerklePath max size match consensus rule

BP-WG · Oct 5, 2023 · 64a77f3 · 64a77f3
1 parent 2bf569e
commit 64a77f3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/primitives/src/taproot.rs b/primitives/src/taproot.rs
@@ -25,7 +25,7 @@ use std::borrow::Borrow;
 use std::fmt::{self, Formatter, LowerHex, UpperHex};
 use std::{cmp, io};
 
-use amplify::confinement::{Confined, TinyVec, U32};
+use amplify::confinement::{Confined, U32};
 use amplify::{Bytes32, Wrapper};
 use commit_verify::{DigestExt, Sha256};
 use secp256k1::{Scalar, XOnlyPublicKey};
@@ -221,7 +221,7 @@ impl IntoTapHash for TapNodeHash {
     derive(Serialize, Deserialize),
     serde(crate = "serde_crate", transparent)
 )]
-pub struct TapMerklePath(TinyVec<TapBranchHash>);
+pub struct TapMerklePath(Confined<Vec<TapBranchHash>, 0, 128>);
 
 /// Taproot annex prefix.
 pub const TAPROOT_ANNEX_PREFIX: u8 = 0x50;

diff --git a/stl/[email protected] b/stl/[email protected]
@@ -5,7 +5,7 @@ Dependencies:
   urn:ubideco:stl:9KALDYR8Nyjq4FdMW6kYoL7vdkWnqPqNuFnmE9qHpNjZ
 
 B0JpdGNvaW4Be4SAPJ764hElp3wsObxw0v3o+UOuDf2c9OaC7cdmynADU3RkAQNT
-dGQBAGGGItF7rvBmAt/ndcmA4LNrbrroCQ2AdfdRO+xLk/ZNBEJvb2wpAAlCaXAz
+dGQBAGGGItF7rvBmAt/ndcmA4LNrbrroCQ2AdfdRO+xLk/ZNBEJvb2wrAAlCaXAz
 NDBTaWcGAgNzaWcABwAAQEAADHNpZ2hhc2hfdHlwZQAEAgAEbm9uZQAAAAEEc29t
 ZQAFAQHbF2Q+dwkTJ+gEmSSB1dxgFSMIlVM55Yszn9RMT3JIKglCbG9ja0hhc2gF
 AQAHAABAIAALQmxvY2tIZWFkZXIGBgd2ZXJzaW9uAABEDXByZXZCbG9ja0hhc2gB

diff --git a/stl/[email protected] b/stl/[email protected]
@@ -78,8 +78,8 @@ data TapCode          :: pushBytes32:32 | pushData1:76 | pushData2:77 | pushData
 
 -- urn:ubideco:semid:FHWiTycy1JvN5CvVJ3ibyAhtXfr21t3BDNuLFnqYPQ2j#middle-jazz-basket
 data TapLeafHash      :: [Byte ^ 32]
--- urn:ubideco:semid:5YrqoQi4fLCLqzBE1ZKb623WC311FGRgjcivLPXadnEN#gossip-protein-orion
-data TapMerklePath    :: [TapBranchHash ^ ..0xff]
+-- urn:ubideco:semid:2Cy61crHEVHKfCSix5WhmS9ms6J4FFE9wCC6pLsyondh#dublin-chemist-version
+data TapMerklePath    :: [TapBranchHash ^ ..0x80]
 -- urn:ubideco:semid:4M8xyvABKKKJseN6Pme5eKrAuusMNMXoY5s6ifsEcreC#crash-culture-jamaica
 data TapNodeHash      :: [Byte ^ 32]
 -- urn:ubideco:semid:71AxyLFsoRG6hJ1c11gxad65nEbWfzkQBjWCPPrgCyjX#telecom-quest-helium