mpc: require MerkleBlock to contain a non-empty cross-section

LNP-BP · Feb 28, 2024 · 8b5f9a0 · 8b5f9a0
1 parent 5ae480c
commit 8b5f9a0
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 34 deletions.
diff --git a/commit_verify/src/mpc/block.rs b/commit_verify/src/mpc/block.rs
@@ -24,7 +24,7 @@
 use std::cmp::Ordering;
 use std::collections::{BTreeMap, BTreeSet};
 
-use amplify::confinement::{Confined, LargeVec};
+use amplify::confinement::{Confined, NonEmptyVec, U32 as U32MAX};
 use amplify::num::u5;
 use strict_encoding::{StrictDeserialize, StrictDumb, StrictEncode, StrictSerialize};
 
@@ -148,7 +148,7 @@ pub struct MerkleBlock {
 
     /// Tree cross-section.
     #[getter(skip)]
-    cross_section: LargeVec<TreeNode>,
+    cross_section: NonEmptyVec<TreeNode, U32MAX>,
 
     /// Entropy used for placeholders. May be unknown if the message is provided
     /// by a third party, wishing to conceal that information.
@@ -161,7 +161,7 @@ impl StrictDumb for MerkleBlock {
         MerkleBlock {
             depth: u5::ONE,
             cofactor: 0,
-            cross_section: confined_vec![TreeNode::strict_dumb()],
+            cross_section: NonEmptyVec::with(TreeNode::strict_dumb()),
             entropy: Some(8845),
         }
     }
@@ -188,7 +188,7 @@ impl From<&MerkleTree> for MerkleBlock {
                 })
         });
         let cross_section =
-            LargeVec::try_from_iter(iter).expect("tree width guarantees are broken");
+            NonEmptyVec::try_from_iter(iter).expect("tree width guarantees are broken");
 
         MerkleBlock {
             depth: tree.depth,
@@ -248,7 +248,7 @@ impl MerkleBlock {
         });
         cross_section.extend(rev.into_iter().rev());
         let cross_section =
-            LargeVec::try_from(cross_section).expect("tree width guarantees are broken");
+            NonEmptyVec::try_from(cross_section).expect("tree width guarantees are broken");
 
         Ok(MerkleBlock {
             depth: u5::with(path.len() as u8),
@@ -482,7 +482,7 @@ impl MerkleBlock {
         cross_section.extend(b);
 
         self.cross_section =
-            LargeVec::try_from(cross_section).expect("tree width guarantees are broken");
+            NonEmptyVec::try_from(cross_section).expect("tree width guarantees are broken");
 
         assert_eq!(
             self.cross_section

diff --git a/commit_verify/src/stl.rs b/commit_verify/src/stl.rs
@@ -24,7 +24,7 @@ use strict_types::{CompileError, LibBuilder, TypeLib};
 use crate::{mpc, MerkleHash, MerkleNode, StrictHash, LIB_NAME_COMMIT_VERIFY};
 
 pub const LIB_ID_COMMIT_VERIFY: &str =
-    "urn:ubideco:stl:57sPvZcwQaziec3ux249XoCMhziQpKB8Yw99U5oRwfqW#deluxe-safari-random";
+    "urn:ubideco:stl:7qvjR4HCwJKF3mxE5GqsAaADces5JDRwb8ajAse9mkz3#exhibit-karate-ritual";
 
 fn _commit_verify_stl() -> Result<TypeLib, CompileError> {
     LibBuilder::new(libname!(LIB_NAME_COMMIT_VERIFY), tiny_bset! {
@@ -33,6 +33,7 @@ fn _commit_verify_stl() -> Result<TypeLib, CompileError> {
     .transpile::<mpc::MerkleTree>()
     .transpile::<mpc::MerkleBlock>()
     .transpile::<mpc::MerkleProof>()
+    .transpile::<mpc::Leaf>()
     .transpile::<mpc::Commitment>()
     .transpile::<MerkleNode>()
     .transpile::<MerkleHash>()

diff --git a/stl/[email protected] b/stl/[email protected]
@@ -1,33 +1,36 @@
 -----BEGIN STRICT TYPE LIB-----
-Id: 57sPvZcwQaziec3ux249XoCMhziQpKB8Yw99U5oRwfqW#deluxe-safari-random
+Id: 7qvjR4HCwJKF3mxE5GqsAaADces5JDRwb8ajAse9mkz3#exhibit-karate-ritual
 Name: CommitVerify
 Dependencies: 
   DzTvt9gGhPUKD8Dkkjk9PDBhkJ4gtWxXWQjxnmUYLNrs#voyage-kimono-disco
 
 3`1{iZE18?WpZg|c>%!$%tl@;WNu_lcw-g2$nLVb<*lb*ENIx0;35YAw}=B%bYuY
-oQ*>kj0A^Tl*p6J$36SYb7g#;qpQBTpwL(~+!(f@;t~vt?k^)sV3jhj3Z*6U9bZu
-pBbOiwb2LJ#-AOH(ZWpZn5WkPIkV`~Nk1!QG#bZ7#>1k6TWEM#tEO?YD!yU6acy5
-+5>Uo2?YlHei-0Jn%{Sa8^mT+s=T=}Z?`J=~w8Q=GLzSfImTncuED0}GM}V{c|*V
-{~tF0006EV{&hEb5mtwbZKvH00;rtwYiq_Rlwao{(T?aUNqayF^88E^#IUpx^^~;
-)zDV}0000000030|Ns9000007Wo~qGZ*X}41OfmAZf|a7000011aog~WdH>M000O
-IO=WUxY-LDcb7%zt00#g7Kp+4LO=WUxY-LVwWMu{g31V_#ZewU^Zf60zOl}Js;Lv
-V7e1xlC`fl^8AoO?D+|y;s#+-J4VoSmWWMy!4XaE2K1$Sv=bZ7toAO&u3WMwe{IG
-#g>Clv)aMjKgwAH@`bu1x<7g|G$};xvA~n-$_S1#WL-WikOco<oKw6$Lm(8(DuJ#
-T0?AO#cjpum%_6G=9FD72-1sO=WUxY-Lb#Z*OJ>0|Rhxa{vGY2xD(%VPkY}asU7V
-1aM(=XaEQSIG#g>Clv)aMjKgwAH@`bu1x<7g|G$};xvA~n-$_S0000000000AOHX
-W000003Qc8lYiwmya%E)(1qEbfaCB$_!34}kUMys8WKDQu6}!mpvbyE1r(Y~+*pl
-EP2LQK-W>|38j$F|Rkm*bpSUudIqf?x<LRg@~V42^pIs*%m2W4(_a&K^X000OGV{
-c|*V{~tF0006AZDn(FVP|D?015#xm44<OVKiC01qkHfuRUrZzt;Qv9WjEZdF4fP;
-8w8#H8-hI70Bv^+*0?ef%0)>Q3WPbltNdpi4*91)SI!>0000000000|Ns9000000
-18re&015yA1ONpB0Wg(*<{e=)S-S-Y<l(P9Y9YVY`}-X+f~R@qMRed+u>mzVsZkZ
-k>V@1=_p5>Oab-~jCR3C`SFec^=zG+gvC{wm0000000960{{R30000L~Wpi_3XJr
-Ke00#g7Kp+4OPH$voLULhlV`yn^X9EKSc5i8900whuZf9&|0S01nVQyn+0t!%aZ*
-*^CZ){0q1pxpD002NB018uda%p39NMUnm1pxpD002NB00>laWo1rpWMu>b01abrZ
-ewL(Y-MClZ)9Zv1_A|SWpH$80>K2#MqVsrZe&e(V->r|?y|b&t*2isXxNhAA_oAs
-h-O%D*p6J$36SYb7g#;qpQBTpwL(~+!(f@;t~vt?k_2dBb7%oLo<oKw6$Lm(8(Du
-J#T0?AO#cjpum%_6G=9FD72-1i4r6a^ZE19EWo~p#WnpFj1_BCja&L5RV{dFpWC1
-Xhe&!uvG+Da^2;||fJ!&Dp*8BS%F@mRg<wbPhR<Q?dWpi_3XJr93H>pt-$m)gMQu
-nKY@^NKR1twFJLRYVe6X<)?o3Ya
+oQ*>kj0A^Tl*p6J$36SYb7g#;qpQBTpwL(~+!(f@;t~vt?k^)sV3;+s4Z*6U9bZu
+pBbOiwb2LJ#-AOHkRWnpFn0uTvlZfId*X>?^|00sgGaB^>SZ)0z40Wg(*<{e=)S-
+S-Y<l(P9Y9YVY`}-X+f~R@qMRed+u?KBsb8}&5WdSuesZkZk>V@1=_p5>Oab-~jC
+R3C`SFec^=zG+gvC|O;Wo~qGZ*X}41_B3VZgg^QaCra#2m^3$a{vGY3r%HmYiwmg
+Y;R+01_T9UWpH$80>K2#MqVsrZe&e(V->r|?y|b&t*2isXxNhAA_oAsh-O%D*p6J
+$36SYb7g#;qpQBTpwL(~+!(f@;t~vt?k_cmOW?^G=Z*l+t0t{nvZ*y}~Wn*+{Z*B
+kx0ob*<mh)A>-9G+(AKhLw+s!eDmlO2>&}_PPHjCBJR{;P3000000RR90{{R3000
+(7mbaHQSc>n|g00eGtZe;)f009JZZ*64&1pxp62ntPQa%*g5NMUnm1pxpD002NB0
+18cIa%*g5PH$vo1_cRXa$#;`XlZU|0lQ3Y3mf3jZajR1t6%zV^Qs{9ch%g}Wy;2!
+c7I|^!UbeyaCB$@009MeX=HS0001BbZf|5|F#$N9Lxv|61vo|<S$`kJ6oIZx{|tq
+&1{dNqe!iO(;xh$qZ)9aM0XUvRh9?yTI7S;;e;>sZfv!yd427@;7veO2zMB=|GYd
+^+a%*g5P;zf?W(ETTaBp(}00anQZ)Ra*bZ>G100IPXVRUE!2mv^rLxv|61vo|<S$
+`kJ6oIZx{|tq&1{dNqe!iO(;xhmM00000001BW00000000V2WpZn5WmIxyWd;QWW
+My!4Xad0m%tl@;WNu_lcw-g2$nLVb<*lb*ENIx0;35YAw}@s~aM+Gq(Fu_0Ocz)^
++@GUUoV7w&pu=F9->y0X3z7$AZgg^QaCra#2nb_uW?^G=Z*l+t0tjtob8}&5Wpe-
+u0Wg(*<{e=)S-S-Y<l(P9Y9YVY`}-X+f~R@qMRed+u>mzVsZkZk>V@1=_p5>Oab-
+~jCR3C`SFec^=zG+gvC{wm0000000960{{R30000ARVQ>Hn000C41p)yum44<OVK
+iC01qkHfuRUrZzt;Qv9WjEZdF4fP;8w8#H8-hI70Bv^+*0?ef%0)>Q3WPbltNdpi
+4*91)SI!>0000000000|Ns90000002Tf&jb75y?1pxpD002NB01ZxWWMx8fVQyn+
+X>Ml&0|a(&X=DHfb7^j8Y-IrkVsc?_V`u^jP;zf{Z)0z4Nn`~900#g7Kp+4LQ*?4
+^V{}Mib7%zt00#g7Kp+4JRB~lyPH$vo1OfmJV{dL_WnpY(WKM5nWdH^O1!QG#bZ7
+#>1k6TWEM#tEO?YD!yU6acy5+5>Uo2?YlHei-0Jn%{Sa8^mT+s=T=}Z?`J=~w8Q=
+GLzSfImTncuED0}GM_Xkl|`0XUvRh9?yTI7S;;e;>sZfv!yd427@;7veO2zMB=|G
+XV}`Z*6U9bZupBbWCMoW&j2P3UG37bZ=vCY)NDRFqMAh9bq(Cy9Eg3;jcYvA-~r9
+`yDZYr+MW?bl_I82W@3@b75y?0W~+NQ5DGQh1^p2tAX-yWl;qtQ<OqiuZa`rd(@k
+;(*
 
 -----END STRICT TYPE LIB-----
 
diff --git a/stl/[email protected] b/stl/[email protected]
diff --git a/stl/[email protected] b/stl/[email protected]
@@ -1,5 +1,5 @@
 {-
-  Id: urn:ubideco:stl:57sPvZcwQaziec3ux249XoCMhziQpKB8Yw99U5oRwfqW#deluxe-safari-random
+  Id: urn:ubideco:stl:7qvjR4HCwJKF3mxE5GqsAaADces5JDRwb8ajAse9mkz3#exhibit-karate-ritual
   Name: CommitVerify
   Version: 0.1.0
   Description: Client-side-validation deterministic commitments
@@ -18,10 +18,14 @@ import Std#DzTvt9gGhPUKD8Dkkjk9PDBhkJ4gtWxXWQjxnmUYLNrs#voyage-kimono-disco
 @mnemonic(ventura-equal-think)
 data Commitment        : [Byte ^ 32]
 
-@mnemonic(iris-explore-script)
+@mnemonic(pony-audio-mozart)
+data Leaf              : inhabited#16 (protocol ProtocolId, message Message)
+                       | entropy (entropy U64, pos U32)
+
+@mnemonic(owner-albert-lexicon)
 data MerkleBlock       : depth Std.U5#nitro-george-nebula
                        , cofactor U16
-                       , crossSection [TreeNode ^ ..0xffffffff]
+                       , crossSection [TreeNode ^ 1..0xffffffff]
                        , entropy U64?
 
 @mnemonic(culture-metro-modular)