From b02cd48f7c51106a959abfbfd5ad42d4c08e47c9 Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Mon, 26 Feb 2024 18:48:19 +0100 Subject: [PATCH] chore: update vesper files --- stl/Anchor.MerkleBlock.Tapret.vesper | 32 +++++++++++++--------------- stl/Anchor.MerkleProof.Tapret.vesper | 10 ++++----- stl/Anchor.MerkleTree.Opret.vesper | 13 ++++++----- stl/Anchor.MerkleTree.Tapret.vesper | 21 +++++++++--------- stl/Seals.vesper | 6 +++--- 5 files changed, 39 insertions(+), 43 deletions(-) diff --git a/stl/Anchor.MerkleBlock.Tapret.vesper b/stl/Anchor.MerkleBlock.Tapret.vesper index 2f913607..e8395f79 100644 --- a/stl/Anchor.MerkleBlock.Tapret.vesper +++ b/stl/Anchor.MerkleBlock.Tapret.vesper @@ -1,31 +1,29 @@ AnchorMerkleBlockTapretProof rec txid bytes len=32 aka=Txid - mpcProof rec MerkleBlock + mpcProof rec -- MerkleBlock depth enum { - U5 _0=0 _1=1 _2=2 _3=3 _4=4 _5=5 _6=6 _7=7 - _8=8 _9=9 _10=10 _11=11 _12=12 _13=13 _14=14 _15=15 - _16=16 _17=17 _18=18 _19=19 _20=20 _21=21 _22=22 _23=23 - _24=24 _25=25 _26=26 _27=27 _28=28 _29=29 _30=30 _31=31 - - } + _0=0 _1=1 _2=2 _3=3 _4=4 _5=5 _6=6 _7=7 _8=8 + _9=9 _10=10 _11=11 _12=12 _13=13 _14=14 _15=15 _16=16 + _17=17 _18=18 _19=19 _20=20 _21=21 _22=22 _23=23 _24=24 + _25=25 _26=26 _27=27 _28=28 _29=29 _30=30 _31=31 + } -- U5 cofactor is U16 crossSection list len=0..MAX32 TreeNode union concealedNode rec tag=0 depth enum { - U5 _0=0 _1=1 _2=2 _3=3 _4=4 _5=5 _6=6 _7=7 - _8=8 _9=9 _10=10 _11=11 _12=12 _13=13 _14=14 _15=15 - _16=16 _17=17 _18=18 _19=19 _20=20 _21=21 _22=22 _23=23 - _24=24 _25=25 _26=26 _27=27 _28=28 _29=29 _30=30 _31=31 - - } + _0=0 _1=1 _2=2 _3=3 _4=4 _5=5 _6=6 _7=7 _8=8 + _9=9 _10=10 _11=11 _12=12 _13=13 _14=14 _15=15 _16=16 + _17=17 _18=18 _19=19 _20=20 _21=21 _22=22 _23=23 _24=24 + _25=25 _26=26 _27=27 _28=28 _29=29 _30=30 _31=31 + } -- U5 hash bytes len=32 aka=MerkleHash commitmentLeaf rec tag=1 protocolId bytes len=32 aka=ProtocolId message bytes len=32 aka=Message some is U64 option wrapped tag=1 - dbcProof rec TapretProof - pathProof rec TapretPathProof - some union TapretNodePartner option wrapped tag=1 - rightBranch rec TapretRightBranch wrapped tag=2 + dbcProof rec -- TapretProof + pathProof rec -- TapretPathProof + some union option wrapped tag=1 -- TapretNodePartner + rightBranch rec wrapped tag=2 -- TapretRightBranch nonce is U8 diff --git a/stl/Anchor.MerkleProof.Tapret.vesper b/stl/Anchor.MerkleProof.Tapret.vesper index 027b1e08..e7e2bb7b 100644 --- a/stl/Anchor.MerkleProof.Tapret.vesper +++ b/stl/Anchor.MerkleProof.Tapret.vesper @@ -1,12 +1,12 @@ AnchorMerkleProofTapretProof rec txid bytes len=32 aka=Txid - mpcProof rec MerkleProof + mpcProof rec -- MerkleProof pos is U32 cofactor is U16 path list len=0..32 element bytes len=32 aka=MerkleHash - dbcProof rec TapretProof - pathProof rec TapretPathProof - some union TapretNodePartner option wrapped tag=1 - rightBranch rec TapretRightBranch wrapped tag=2 + dbcProof rec -- TapretProof + pathProof rec -- TapretPathProof + some union option wrapped tag=1 -- TapretNodePartner + rightBranch rec wrapped tag=2 -- TapretRightBranch nonce is U8 diff --git a/stl/Anchor.MerkleTree.Opret.vesper b/stl/Anchor.MerkleTree.Opret.vesper index 13de5143..5d71467f 100644 --- a/stl/Anchor.MerkleTree.Opret.vesper +++ b/stl/Anchor.MerkleTree.Opret.vesper @@ -1,13 +1,12 @@ AnchorMerkleTreeOpretProof rec txid bytes len=32 aka=Txid - mpcProof rec MerkleTree + mpcProof rec -- MerkleTree depth enum { - U5 _0=0 _1=1 _2=2 _3=3 _4=4 _5=5 _6=6 _7=7 - _8=8 _9=9 _10=10 _11=11 _12=12 _13=13 _14=14 _15=15 - _16=16 _17=17 _18=18 _19=19 _20=20 _21=21 _22=22 _23=23 - _24=24 _25=25 _26=26 _27=27 _28=28 _29=29 _30=30 _31=31 - - } + _0=0 _1=1 _2=2 _3=3 _4=4 _5=5 _6=6 _7=7 _8=8 + _9=9 _10=10 _11=11 _12=12 _13=13 _14=14 _15=15 _16=16 + _17=17 _18=18 _19=19 _20=20 _21=21 _22=22 _23=23 _24=24 + _25=25 _26=26 _27=27 _28=28 _29=29 _30=30 _31=31 + } -- U5 entropy is U64 cofactor is U16 messages map len=0..MAX24 diff --git a/stl/Anchor.MerkleTree.Tapret.vesper b/stl/Anchor.MerkleTree.Tapret.vesper index 5de7efaa..b42c9feb 100644 --- a/stl/Anchor.MerkleTree.Tapret.vesper +++ b/stl/Anchor.MerkleTree.Tapret.vesper @@ -1,13 +1,12 @@ AnchorMerkleTreeTapretProof rec txid bytes len=32 aka=Txid - mpcProof rec MerkleTree + mpcProof rec -- MerkleTree depth enum { - U5 _0=0 _1=1 _2=2 _3=3 _4=4 _5=5 _6=6 _7=7 - _8=8 _9=9 _10=10 _11=11 _12=12 _13=13 _14=14 _15=15 - _16=16 _17=17 _18=18 _19=19 _20=20 _21=21 _22=22 _23=23 - _24=24 _25=25 _26=26 _27=27 _28=28 _29=29 _30=30 _31=31 - - } + _0=0 _1=1 _2=2 _3=3 _4=4 _5=5 _6=6 _7=7 _8=8 + _9=9 _10=10 _11=11 _12=12 _13=13 _14=14 _15=15 _16=16 + _17=17 _18=18 _19=19 _20=20 _21=21 _22=22 _23=23 _24=24 + _25=25 _26=26 _27=27 _28=28 _29=29 _30=30 _31=31 + } -- U5 entropy is U64 cofactor is U16 messages map len=0..MAX24 @@ -18,8 +17,8 @@ AnchorMerkleTreeTapretProof rec value tuple _ bytes len=32 aka=ProtocolId _ bytes len=32 aka=Message - dbcProof rec TapretProof - pathProof rec TapretPathProof - some union TapretNodePartner option wrapped tag=1 - rightBranch rec TapretRightBranch wrapped tag=2 + dbcProof rec -- TapretProof + pathProof rec -- TapretPathProof + some union option wrapped tag=1 -- TapretNodePartner + rightBranch rec wrapped tag=2 -- TapretRightBranch nonce is U8 diff --git a/stl/Seals.vesper b/stl/Seals.vesper index f212aaef..a6ee6e7e 100644 --- a/stl/Seals.vesper +++ b/stl/Seals.vesper @@ -14,14 +14,14 @@ SecretSeal commitment hasher=SHA256 tagged=urn:lnp-bp:seals:secret#2024-02-03 BlindSealTxPtr serialized BlindSealTxid rec - method enum Method opretFirst=0 tapretFirst=1 + method enum opretFirst=0 tapretFirst=1 -- Method txid bytes len=32 aka=Txid vout is U32 aka=Vout blinding is U64 BlindSealTxPtr rec - method enum Method opretFirst=0 tapretFirst=1 - txid union TxPtr + method enum opretFirst=0 tapretFirst=1 -- Method + txid union -- TxPtr witnessTx is Unit tag=0 txid bytes len=32 wrapped aka=Txid tag=1 vout is U32 aka=Vout