diff --git a/seals/src/txout.rs b/seals/src/txout.rs index 2f1287ad..be8c978b 100644 --- a/seals/src/txout.rs +++ b/seals/src/txout.rs @@ -233,6 +233,10 @@ impl StrictDumb for TxoSealExt { /// informational purposes only. For all other uses please check [`TxoSeal`]. #[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug, Display)] #[display("{primary}/{secondary}")] +#[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)] +#[strict_type(lib = dbc::LIB_NAME_BPCORE)] +#[derive(CommitEncode)] +#[commit_encode(strategy = strict, id = StrictHash)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] pub struct TxoSealDef { pub primary: Outpoint, @@ -252,8 +256,6 @@ impl From> for TxoSealDef { #[display("{primary}/{secondary}")] #[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)] #[strict_type(lib = dbc::LIB_NAME_BPCORE)] -#[derive(CommitEncode)] -#[commit_encode(strategy = strict, id = StrictHash)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] pub struct TxoSeal { pub primary: Outpoint, diff --git a/src/bin/bpcore-stl.rs b/src/bin/bpcore-stl.rs index 23f4a46c..9fde87e3 100644 --- a/src/bin/bpcore-stl.rs +++ b/src/bin/bpcore-stl.rs @@ -26,8 +26,7 @@ use bc::stl::{bp_consensus_stl, bp_tx_stl}; use bp::stl::bp_core_stl; use commit_verify::stl::commit_verify_stl; use commit_verify::CommitmentLayout; -use dbc::tapret::TapretProof; -use seals::TxoSeal; +use seals::TxoSealDef; use strict_encoding::libname; use strict_types::stl::std_stl; use strict_types::{parse_args, SystemBuilder}; @@ -114,7 +113,7 @@ Seals vesper lexicon=types+commitments " ) .unwrap(); - let layout = TxoSeal::::commitment_layout(); + let layout = TxoSealDef::commitment_layout(); writeln!(file, "{layout}").unwrap(); let tt = sys.type_tree("BPCore.TxoSealTapretProof").unwrap(); writeln!(file, "{tt}").unwrap(); diff --git a/stl/Seals.vesper b/stl/Seals.vesper index e16b06b5..f4cb1da2 100644 --- a/stl/Seals.vesper +++ b/stl/Seals.vesper @@ -8,7 +8,7 @@ Seals vesper lexicon=types+commitments commitment StrictHash, hasher SHA256, tagged urn:ubideco:strict-types:value-hash#2024-02-10 - serialized TxoSealTapretProof + serialized TxoSealDef rec TxoSealTapretProof rec primary, Outpoint