consensus: move nseq consensus-related methods from bp-std

consensus/src/lib.rs

@@ -85,14 +85,15 @@ pub use sigtypes::{Bip340Sig, LegacySig, SigError, SighashFlag, SighashType};
 pub use taproot::{
     ControlBlock, FutureLeafVer, InternalPk, IntoTapHash, InvalidLeafVer, InvalidParityValue,
     LeafScript, LeafVer, OutputPk, Parity, TapBranchHash, TapCode, TapLeafHash, TapMerklePath,
-    TapNodeHash, TapScript, XOnlyPk, TAPROOT_ANNEX_PREFIX, TAPROOT_LEAF_MASK,
+    TapNodeHash, TapScript, XOnlyPk, MIDSTATE_TAPSIGHASH, TAPROOT_ANNEX_PREFIX, TAPROOT_LEAF_MASK,
     TAPROOT_LEAF_TAPSCRIPT,
 };
 pub use timelocks::{
-    InvalidTimelock, LockHeight, LockTime, LockTimestamp, TimelockParseError, LOCKTIME_THRESHOLD,
+    InvalidTimelock, LockHeight, LockTime, LockTimestamp, SeqNo, TimelockParseError,
+    LOCKTIME_THRESHOLD, SEQ_NO_CSV_DISABLE_MASK, SEQ_NO_CSV_TYPE_MASK,
 };
 pub use tx::{
-    Outpoint, OutpointParseError, Sats, SeqNo, Tx, TxIn, TxOut, TxParseError, TxVer, Txid, Vout,
+    Outpoint, OutpointParseError, Sats, Tx, TxIn, TxOut, TxParseError, TxVer, Txid, Vout,
 };
 pub use util::{Chain, ChainParseError, NonStandardValue};
 pub use weights::{VBytes, Weight, WeightUnits};

consensus/src/segwit.rs

@@ -213,7 +213,7 @@ impl WitnessVer {
 /// Witness program as defined in BIP141.
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[derive(StrictType, StrictEncode, StrictDecode, StrictDumb)]
-#[strict_type(lib = LIB_NAME_BITCOIN, dumb = {Self::new(strict_dumb!(), vec![0; 32]).unwrap()})]
+#[strict_type(lib = LIB_NAME_BITCOIN, dumb = Self::dumb())]
 pub struct WitnessProgram {
     /// The witness program version.
     version: WitnessVer,
@@ -222,6 +222,8 @@ pub struct WitnessProgram {
 }
 
 impl WitnessProgram {
+    fn dumb() -> Self { Self::new(strict_dumb!(), vec![0; 32]).unwrap() }
+
     /// Creates a new witness program.
     pub fn new(version: WitnessVer, program: Vec<u8>) -> Result<Self, SegwitError> {
         let len = program.len();

consensus/src/stl.rs

@@ -22,11 +22,13 @@
 
 use strict_types::{CompileError, LibBuilder, TypeLib};
 
+use crate::timelocks::TimeLockInterval;
 use crate::{
     Bip340Sig, BlockHeader, ByteStr, Chain, CompressedPk, ControlBlock, FutureLeafVer, InternalPk,
-    LeafScript, LegacyPk, LegacySig, OpCode, OutputPk, PubkeyHash, RedeemScript, ScriptHash,
-    TapCode, TapLeafHash, TapNodeHash, TapScript, Tx, UncompressedPk, VBytes, VarInt, WPubkeyHash,
-    WScriptHash, WeightUnits, WitnessProgram, WitnessScript, WitnessVer, Wtxid, LIB_NAME_BITCOIN,
+    LeafScript, LegacyPk, LegacySig, LockHeight, LockTimestamp, OpCode, OutputPk, PubkeyHash,
+    RedeemScript, ScriptHash, TapCode, TapLeafHash, TapNodeHash, TapScript, Tx, UncompressedPk,
+    VBytes, VarInt, WPubkeyHash, WScriptHash, WeightUnits, WitnessProgram, WitnessScript,
+    WitnessVer, Wtxid, LIB_NAME_BITCOIN,
 };
 
 #[deprecated(since = "0.10.8", note = "use LIB_ID_BP_TX instead")]
@@ -35,7 +37,7 @@ pub const LIB_ID_BITCOIN: &str =
 pub const LIB_ID_BP_TX: &str =
     "urn:ubideco:stl:6GgF7biXPVNcus2FfQj2pQuRzau11rXApMQLfCZhojgi#money-pardon-parody";
 pub const LIB_ID_BP_CONSENSUS: &str =
-    "urn:ubideco:stl:3NDewC9zBEosrNM82npGstFcvPhjg9E9nLoQZrQq6kwe#remark-shelter-weekend";
+    "urn:ubideco:stl:4AXTqXq8jUDs244XbhvErdsG82Y8r9PiaPBPAmD5y9fQ#cheese-provide-morph";
 
 #[deprecated(since = "0.10.8", note = "use _bp_tx_stl instead")]
 fn _bitcoin_stl() -> Result<TypeLib, CompileError> { _bp_tx_stl() }
@@ -75,6 +77,9 @@ fn _bp_consensus_stl() -> Result<TypeLib, CompileError> {
     .transpile::<TapScript>()
     .transpile::<ControlBlock>()
     .transpile::<BlockHeader>()
+    .transpile::<TimeLockInterval>()
+    .transpile::<LockTimestamp>()
+    .transpile::<LockHeight>()
     .transpile::<Tx>()
     .transpile::<VarInt>()
     .transpile::<ByteStr>()

consensus/src/taproot.rs

@@ -55,8 +55,7 @@ const MIDSTATE_TAPTWEAK: [u8; 8] = *b"TapTweak";
 // d129a2f3701c655d6583b6c3b941972795f4e23294fd54f4a2ae8d8547ca590b
 
 /// The SHA-256 midstate value for the TapSig hash.
-#[warn(dead_code)]
-const MIDSTATE_TAPSIGHASH: [u8; 10] = *b"TapSighash";
+pub const MIDSTATE_TAPSIGHASH: [u8; 10] = *b"TapSighash";
 // f504a425d7f8783b1363868ae3e556586eee945dbc7888dd02a6e2c31873fe9f
 
 impl<const LEN: usize> From<InvalidPubkey<LEN>> for DecodeError {

consensus/src/timelocks.rs

@@ -28,6 +28,25 @@ use chrono::Utc;
 
 use crate::LIB_NAME_BITCOIN;
 
+/// The Threshold for deciding whether a lock time value is a height or a time
+/// (see [Bitcoin Core]).
+///
+/// `LockTime` values _below_ the threshold are interpreted as block heights,
+/// values _above_ (or equal to) the threshold are interpreted as block times
+/// (UNIX timestamp, seconds since epoch).
+///
+/// Bitcoin is able to safely use this value because a block height greater than
+/// 500,000,000 would never occur because it would represent a height in
+/// approximately 9500 years. Conversely, block times under 500,000,000 will
+/// never happen because they would represent times before 1986 which
+/// are, for obvious reasons, not useful within the Bitcoin network.
+///
+/// [Bitcoin Core]: https://github.com/bitcoin/bitcoin/blob/9ccaee1d5e2e4b79b0a7c29aadb41b97e4741332/src/script/script.h#L39
+pub const LOCKTIME_THRESHOLD: u32 = 500_000_000;
+
+pub const SEQ_NO_CSV_DISABLE_MASK: u32 = 0x80000000;
+pub const SEQ_NO_CSV_TYPE_MASK: u32 = 0x00400000;
+
 /// Error constructing timelock from the provided value.
 #[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug, Display, Error)]
 #[display("invalid timelock value {0}")]
@@ -54,22 +73,6 @@ pub enum TimelockParseError {
     NoRand,
 }
 
-/// The Threshold for deciding whether a lock time value is a height or a time
-/// (see [Bitcoin Core]).
-///
-/// `LockTime` values _below_ the threshold are interpreted as block heights,
-/// values _above_ (or equal to) the threshold are interpreted as block times
-/// (UNIX timestamp, seconds since epoch).
-///
-/// Bitcoin is able to safely use this value because a block height greater than
-/// 500,000,000 would never occur because it would represent a height in
-/// approximately 9500 years. Conversely, block times under 500,000,000 will
-/// never happen because they would represent times before 1986 which
-/// are, for obvious reasons, not useful within the Bitcoin network.
-///
-/// [Bitcoin Core]: https://github.com/bitcoin/bitcoin/blob/9ccaee1d5e2e4b79b0a7c29aadb41b97e4741332/src/script/script.h#L39
-pub const LOCKTIME_THRESHOLD: u32 = 500_000_000;
-
 #[derive(Copy, Clone, Eq, PartialEq, Hash, Debug, Default)]
 #[derive(StrictType, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_BITCOIN)]
@@ -372,9 +375,52 @@ impl FromStr for LockHeight {
     }
 }
 
+#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
+#[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
+#[strict_type(lib = LIB_NAME_BITCOIN)]
+#[cfg_attr(
+    feature = "serde",
+    derive(Serialize, Deserialize),
+    serde(crate = "serde_crate", transparent)
+)]
+pub struct SeqNo(u32);
+
+impl SeqNo {
+    #[inline]
+    pub const fn from_consensus_u32(lock_time: u32) -> Self { SeqNo(lock_time) }
+
+    #[inline]
+    pub const fn to_consensus_u32(&self) -> u32 { self.0 }
+
+    /// Creates relative time lock measured in number of blocks (implies RBF).
+    #[inline]
+    pub const fn from_height(blocks: u16) -> SeqNo { SeqNo(blocks as u32) }
+
+    /// Creates relative time lock measured in number of 512-second intervals
+    /// (implies RBF).
+    #[inline]
+    pub const fn from_intervals(intervals: u16) -> SeqNo {
+        SeqNo(intervals as u32 | SEQ_NO_CSV_TYPE_MASK)
+    }
+
+    /// Gets structured relative time lock information from the `nSeq` value.
+    /// See [`TimeLockInterval`].
+    pub const fn time_lock_interval(self) -> Option<TimeLockInterval> {
+        if self.0 & SEQ_NO_CSV_DISABLE_MASK != 0 {
+            None
+        } else if self.0 & SEQ_NO_CSV_TYPE_MASK != 0 {
+            Some(TimeLockInterval::Time((self.0 & 0xFFFF) as u16))
+        } else {
+            Some(TimeLockInterval::Height((self.0 & 0xFFFF) as u16))
+        }
+    }
+
+    pub const fn is_timelock(self) -> bool { self.0 & SEQ_NO_CSV_DISABLE_MASK > 1 }
+}
+
 /// Time lock interval describing both relative (OP_CHECKSEQUENCEVERIFY) and
 /// absolute (OP_CHECKTIMELOCKVERIFY) timelocks.
-#[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug, From)]
+#[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug, Display)]
 #[derive(StrictType, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_BITCOIN, tags = order)]
 #[cfg_attr(
@@ -384,12 +430,12 @@ impl FromStr for LockHeight {
 )]
 pub enum TimeLockInterval {
     /// Describes number of blocks for the timelock
-    #[from]
-    Height(LockHeight),
+    #[display("height({0})")]
+    Height(u16),
 
     /// Describes number of 512-second intervals for the timelock
-    #[from]
-    Time(LockTimestamp),
+    #[display("time({0})")]
+    Time(u16),
 }
 
 impl Default for TimeLockInterval {

consensus/src/tx.rs

@@ -31,7 +31,7 @@ use commit_verify::{DigestExt, Sha256};
 
 use crate::{
     ConsensusDecode, ConsensusDecodeError, ConsensusEncode, LockTime, NonStandardValue,
-    ScriptPubkey, SigScript, VarIntArray, Witness, Wtxid, LIB_NAME_BITCOIN,
+    ScriptPubkey, SeqNo, SigScript, VarIntArray, Witness, Wtxid, LIB_NAME_BITCOIN,
 };
 
 #[derive(Wrapper, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, From)]
@@ -215,24 +215,6 @@ mod _serde_outpoint {
     }
 }
 
-#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-#[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
-#[strict_type(lib = LIB_NAME_BITCOIN)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
-pub struct SeqNo(u32);
-
-impl SeqNo {
-    #[inline]
-    pub const fn from_consensus_u32(lock_time: u32) -> Self { SeqNo(lock_time) }
-
-    #[inline]
-    pub const fn to_consensus_u32(&self) -> u32 { self.0 }
-}
-
 #[derive(Clone, Eq, PartialEq, Hash, Debug)]
 #[derive(StrictType, StrictDumb, StrictEncode, StrictDecode)]
 #[strict_type(lib = LIB_NAME_BITCOIN)]

stl/Bitcoin@0.1.0.sta

@@ -1,11 +1,11 @@
 -----BEGIN STRICT TYPE LIB-----
-Id: urn:ubideco:stl:3NDewC9zBEosrNM82npGstFcvPhjg9E9nLoQZrQq6kwe
+Id: urn:ubideco:stl:4AXTqXq8jUDs244XbhvErdsG82Y8r9PiaPBPAmD5y9fQ
 Name: Bitcoin
 Dependencies: 
   urn:ubideco:stl:9KALDYR8Nyjq4FdMW6kYoL7vdkWnqPqNuFnmE9qHpNjZ
 
 B0JpdGNvaW4Be4SAPJ764hElp3wsObxw0v3o+UOuDf2c9OaC7cdmynADU3RkAQNT
-dGQBAGGGItF7rvBmAt/ndcmA4LNrbrroCQ2AdfdRO+xLk/ZNBEJvb2w0AAlCaXAz
+dGQBAGGGItF7rvBmAt/ndcmA4LNrbrroCQ2AdfdRO+xLk/ZNBEJvb2w3AAlCaXAz
 NDBTaWcGAgNzaWcABwAAQEAADHNpZ2hhc2hfdHlwZQAEAgAEbm9uZQAAAAEEc29t
 ZQAFAQHbF2Q+dwkTJ+gEmSSB1dxgFSMIlVM55Yszn9RMT3JIKglCbG9ja0hhc2gF
 AQAHAABAIAALQmxvY2tIZWFkZXIGBgd2ZXJzaW9uAABEDXByZXZCbG9ja0hhc2gB
@@ -23,47 +23,49 @@ oznUX3sVdadxS+F6dRhd0DE1etTJLemGB0xlYWZWZXIFAQAAAQhMZWdhY3lQawYC
 CmNvbXByZXNzZWQCe4SAPJ764hElp3wsObxw0v3o+UOuDf2c9OaC7cdmynBhhiLR
 e67wZgLf53XJgOCza2666AkNgHX3UTvsS5P2TQZwdWJrZXkABwAAQCEACUxlZ2Fj
 eVNpZwYCA3NpZwAIAABAAAAAAAAAAAD/AAAAAAAAAAxzaWdoYXNoX3R5cGUB2xdk
-PncJEyfoBJkkgdXcYBUjCJVTOeWLM5/UTE9ySCoITG9ja1RpbWUFAQAABAZPcENv
-ZGUDEgpwdXNoQnl0ZXMwAAtwdXNoQnl0ZXMzMiAJcHVzaERhdGExTAlwdXNoRGF0
-YTJNCXB1c2hEYXRhNE4IcmVzZXJ2ZWRQCHB1c2hOdW0xUQZyZXR1cm5qA2R1cHYF
-ZXF1YWyHC2VxdWFsVmVyaWZ5iAlyaXBlbWQxNjCmBHNoYTGnBnNoYTI1NqgHaGFz
-aDE2MKkHaGFzaDI1NqoIY2hlY2tTaWesDmNoZWNrU2lnVmVyaWZ5rQhPdXRwb2lu
-dAYCBHR4aWQBo4JC88vX0dChEtqN4WAvVtT4bw7ExHbFwGhZTEsEZVYEdm91dAEh
-4z5Dxapc8iknU6M4wWftO2OcTdnOvamPNGkXuslDdQhPdXRwdXRQawUBAfyipyq+
-kf7NgqixmJBjIsJOdqqqNfIk0XMFY6AYLohZBlBhcml0eQMCBGV2ZW4AA29kZAEK
-UHVia2V5SGFzaAUBAAcAAEAUAAxSZWRlZW1TY3JpcHQFAQElq/W5EhQXuqM51F97
-FXWncUvhenUYXdAxNXrUyS3phgRTYXRzBQEAAAgLU2NyaXB0Qnl0ZXMFAQAIAABA
-AAAAAAAAAAD/////AAAAAApTY3JpcHRIYXNoBQEABwAAQBQADFNjcmlwdFB1Ymtl
-eQUBASWr9bkSFBe6oznUX3sVdadxS+F6dRhd0DE1etTJLemGBVNlcU5vBQEAAAQJ
-U2lnU2NyaXB0BQEBJav1uRIUF7qjOdRfexV1p3FL4Xp1GF3QMTV61Mkt6YYLU2ln
-aGFzaEZsYWcDAwNhbGwBBG5vbmUCBnNpbmdsZQMLU2lnaGFzaFR5cGUGAgRmbGFn
-Af8+an/Ix4VDTvyO53SzALGb7Jhxopoe8QCL7xDrKNU0DGFueW9uZUNhblBheQJ7
-hIA8nvriESWnfCw5vHDS/ej5Q64N/Zz05oLtx2bKcGGGItF7rvBmAt/ndcmA4LNr
-brroCQ2AdfdRO+xLk/ZNDVRhcEJyYW5jaEhhc2gFAQAHAABAIAAHVGFwQ29kZQMG
-C3B1c2hCeXRlczMyIAlwdXNoRGF0YTFMCXB1c2hEYXRhMk0JcHVzaERhdGE0Tghy
-ZXNlcnZlZFAGcmV0dXJuagtUYXBMZWFmSGFzaAUBAAcAAEAgAA1UYXBNZXJrbGVQ
-YXRoBQEACAGv68Wd2P1QRx2YXcJBKC6rqYxIivJkY8F2flEGIsKS2AAAAAAAAAAA
-gAAAAAAAAAALVGFwTm9kZUhhc2gFAQAHAABAIAAJVGFwU2NyaXB0BQEBJav1uRIU
-F7qjOdRfexV1p3FL4Xp1GF3QMTV61Mkt6YYCVHgGBAd2ZXJzaW9uAah8xnlkZ+VX
-10TlyWI64AzLldkaDS8D33TAdRJPvseeBmlucHV0cwAIARlHLRfYYgenDyExqVih
-aKVuKtZTP5xmTBl32lz5/mKGAAAAAAAAAAD/////AAAAAAdvdXRwdXRzAAgBkDtk
-cHmEjxsmUyrkzsamiUSgU1i48IHLJrO7+C2eO/MAAAAAAAAAAP////8AAAAACGxv
-Y2tUaW1lATXaHRU5IG673dykwz2HMerym6fadN89yIIgHE4WtbkcBFR4SW4GBApw
-cmV2T3V0cHV0AehqQM1cJfm94oT/aaURMqdBKyFVvQ5WEsG/44SVYMUGCXNpZ1Nj
-cmlwdAE4dQSxS3wORm1HnhdHfSR0JH/4A2TsPUuq9zog90F0awhzZXF1ZW5jZQEB
-GW2FKcj22kRNFU6NnIy9ng+NiQJaO7CRIcY9UrAehwd3aXRuZXNzAXN3Q3A2kyBJ
-zSiVCKpxfOOCnbJFLlXoTtT8LjzNLgCdBVR4T3V0BgIFdmFsdWUBl/XXBkKuKjOS
-JTuoTh3OxJPjvz7TcbGHc4Y1TsyIgmsMc2NyaXB0UHVia2V5Ab78HvxmpRn9ZFJq
-OhOHQOfxEC0Lvv86wUZO8/dAdnRcBVR4VmVyBQEAAEQEVHhpZAUBAAcAAEAgAA5V
-bmNvbXByZXNzZWRQawUBAAcAAEBBAAZWQnl0ZXMFAQAABAZWYXJJbnQFAQAACARW
-b3V0BQEAAAQLV1B1YmtleUhhc2gFAQAHAABAFAALV1NjcmlwdEhhc2gFAQAHAABA
-IAALV2VpZ2h0VW5pdHMFAQAABAdXaXRuZXNzBQEACAAIAABAAAAAAAAAAAD/////
-AAAAAAAAAAAAAAAA/////wAAAAAOV2l0bmVzc1Byb2dyYW0GAgd2ZXJzaW9uAdHs
-2nZn5ELtTRJppmcDNuX+9DevXs4raa66DEZWxPqtB3Byb2dyYW0ACAAAQAIAAAAA
-AAAAKAAAAAAAAAANV2l0bmVzc1NjcmlwdAUBASWr9bkSFBe6oznUX3sVdadxS+F6
-dRhd0DE1etTJLemGCldpdG5lc3NWZXIDEQJ2MAACdjFRAnYyUgJ2M1MCdjRUAnY1
-VQJ2NlYCdjdXAnY4WAJ2OVkDdjEwWgN2MTFbA3YxMlwDdjEzXQN2MTReA3YxNV8D
-djE2YAVXdHhpZAUBAAcAAEAgAAdYT25seVBrBQEABwAAQCAA
+PncJEyfoBJkkgdXcYBUjCJVTOeWLM5/UTE9ySCoKTG9ja0hlaWdodAUBAAAECExv
+Y2tUaW1lBQEAAAQNTG9ja1RpbWVzdGFtcAUBAAAEBk9wQ29kZQMSCnB1c2hCeXRl
+czAAC3B1c2hCeXRlczMyIAlwdXNoRGF0YTFMCXB1c2hEYXRhMk0JcHVzaERhdGE0
+TghyZXNlcnZlZFAIcHVzaE51bTFRBnJldHVybmoDZHVwdgVlcXVhbIcLZXF1YWxW
+ZXJpZnmICXJpcGVtZDE2MKYEc2hhMacGc2hhMjU2qAdoYXNoMTYwqQdoYXNoMjU2
+qghjaGVja1NpZ6wOY2hlY2tTaWdWZXJpZnmtCE91dHBvaW50BgIEdHhpZAGjgkLz
+y9fR0KES2o3hYC9W1PhvDsTEdsXAaFlMSwRlVgR2b3V0ASHjPkPFqlzyKSdTozjB
+Z+07Y5xN2c69qY80aRe6yUN1CE91dHB1dFBrBQEB/KKnKr6R/s2CqLGYkGMiwk52
+qqo18iTRcwVjoBguiFkGUGFyaXR5AwIEZXZlbgADb2RkAQpQdWJrZXlIYXNoBQEA
+BwAAQBQADFJlZGVlbVNjcmlwdAUBASWr9bkSFBe6oznUX3sVdadxS+F6dRhd0DE1
+etTJLemGBFNhdHMFAQAACAtTY3JpcHRCeXRlcwUBAAgAAEAAAAAAAAAAAP////8A
+AAAAClNjcmlwdEhhc2gFAQAHAABAFAAMU2NyaXB0UHVia2V5BQEBJav1uRIUF7qj
+OdRfexV1p3FL4Xp1GF3QMTV61Mkt6YYFU2VxTm8FAQAABAlTaWdTY3JpcHQFAQEl
+q/W5EhQXuqM51F97FXWncUvhenUYXdAxNXrUyS3phgtTaWdoYXNoRmxhZwMDA2Fs
+bAEEbm9uZQIGc2luZ2xlAwtTaWdoYXNoVHlwZQYCBGZsYWcB/z5qf8jHhUNO/I7n
+dLMAsZvsmHGimh7xAIvvEOso1TQMYW55b25lQ2FuUGF5AnuEgDye+uIRJad8LDm8
+cNL96PlDrg39nPTmgu3HZspwYYYi0Xuu8GYC3+d1yYDgs2tuuugJDYB191E77EuT
+9k0NVGFwQnJhbmNoSGFzaAUBAAcAAEAgAAdUYXBDb2RlAwYLcHVzaEJ5dGVzMzIg
+CXB1c2hEYXRhMUwJcHVzaERhdGEyTQlwdXNoRGF0YTROCHJlc2VydmVkUAZyZXR1
+cm5qC1RhcExlYWZIYXNoBQEABwAAQCAADVRhcE1lcmtsZVBhdGgFAQAIAa/rxZ3Y
+/VBHHZhdwkEoLqupjEiK8mRjwXZ+UQYiwpLYAAAAAAAAAACAAAAAAAAAAAtUYXBO
+b2RlSGFzaAUBAAcAAEAgAAlUYXBTY3JpcHQFAQElq/W5EhQXuqM51F97FXWncUvh
+enUYXdAxNXrUyS3phhBUaW1lTG9ja0ludGVydmFsBAIABmhlaWdodAAFAQAAAgEE
+dGltZQAFAQAAAgJUeAYEB3ZlcnNpb24BqHzGeWRn5VfXROXJYjrgDMuV2RoNLwPf
+dMB1Ek++x54GaW5wdXRzAAgBGUctF9hiB6cPITGpWKFopW4q1lM/nGZMGXfaXPn+
+YoYAAAAAAAAAAP////8AAAAAB291dHB1dHMACAGQO2RweYSPGyZTKuTOxqaJRKBT
+WLjwgcsms7v4LZ478wAAAAAAAAAA/////wAAAAAIbG9ja1RpbWUBNdodFTkgbrvd
+3KTDPYcx6vKbp9p03z3IgiAcTha1uRwEVHhJbgYECnByZXZPdXRwdXQB6GpAzVwl
++b3ihP9ppREyp0ErIVW9DlYSwb/jhJVgxQYJc2lnU2NyaXB0ATh1BLFLfA5GbUee
+F0d9JHQkf/gDZOw9S6r3OiD3QXRrCHNlcXVlbmNlAQEZbYUpyPbaRE0VTo2cjL2e
+D42JAlo7sJEhxj1SsB6HB3dpdG5lc3MBc3dDcDaTIEnNKJUIqnF844KdskUuVehO
+1PwuPM0uAJ0FVHhPdXQGAgV2YWx1ZQGX9dcGQq4qM5IlO6hOHc7Ek+O/PtNxsYdz
+hjVOzIiCawxzY3JpcHRQdWJrZXkBvvwe/GalGf1kUmo6E4dA5/EQLQu+/zrBRk7z
+90B2dFwFVHhWZXIFAQAARARUeGlkBQEABwAAQCAADlVuY29tcHJlc3NlZFBrBQEA
+BwAAQEEABlZCeXRlcwUBAAAEBlZhckludAUBAAAIBFZvdXQFAQAABAtXUHVia2V5
+SGFzaAUBAAcAAEAUAAtXU2NyaXB0SGFzaAUBAAcAAEAgAAtXZWlnaHRVbml0cwUB
+AAAEB1dpdG5lc3MFAQAIAAgAAEAAAAAAAAAAAP////8AAAAAAAAAAAAAAAD/////
+AAAAAA5XaXRuZXNzUHJvZ3JhbQYCB3ZlcnNpb24B0ezadmfkQu1NEmmmZwM25f70
+N69ezitprroMRlbE+q0HcHJvZ3JhbQAIAABAAgAAAAAAAAAoAAAAAAAAAA1XaXRu
+ZXNzU2NyaXB0BQEBJav1uRIUF7qjOdRfexV1p3FL4Xp1GF3QMTV61Mkt6YYKV2l0
+bmVzc1ZlcgMRAnYwAAJ2MVECdjJSAnYzUwJ2NFQCdjVVAnY2VgJ2N1cCdjhYAnY5
+WQN2MTBaA3YxMVsDdjEyXAN2MTNdA3YxNF4DdjE1XwN2MTZgBVd0eGlkBQEABwAA
+QCAAB1hPbmx5UGsFAQAHAABAIAA=
 
 -----END STRICT TYPE LIB-----
 

stl/Bitcoin@0.1.0.sty

@@ -1,5 +1,5 @@
 {-
-  Id: urn:ubideco:stl:3NDewC9zBEosrNM82npGstFcvPhjg9E9nLoQZrQq6kwe#remark-shelter-weekend
+  Id: urn:ubideco:stl:4AXTqXq8jUDs244XbhvErdsG82Y8r9PiaPBPAmD5y9fQ#cheese-provide-morph
   Name: Bitcoin
   Version: 0.1.0
   Description: Consensus library for bitcoin protocol
@@ -51,8 +51,12 @@ data LeafVer          :: U8
 data LegacyPk         :: compressed Std.Bool {- urn:ubideco:semid:7ZhBHGSJm9ixmm8Z9vCX7i5Ga7j5xrW8t11nsb1Cgpnx#laser-madam-maxwell -}, pubkey [Byte ^ 33]
 -- urn:ubideco:semid:89ux18kFuT9nT6LEWnvkpFBiWR9GJwBYVVBqFUPvrTuj#gondola-middle-style
 data LegacySig        :: sig [Byte ^ ..0xff], sighash_type SighashType
+-- urn:ubideco:semid:Gm9B1aVGcLG8MQ27bZrVg4mteg1AuKoFn1aFNkZ72Y2Y#greek-support-hawaii
+data LockHeight       :: U32
 -- urn:ubideco:semid:4dDWWU4afiPN3q4AgCMuFRFhL4UDta2u5SrqrBzPvjby#tokyo-inch-program
 data LockTime         :: U32
+-- urn:ubideco:semid:8h25q8Va3Sx3csGvq4reMPqG7w4QrEowpYxdMAwaErmF#compass-protein-barcode
+data LockTimestamp    :: U32
 -- urn:ubideco:semid:F8WJfUNUgyVDSX6zXjrdi2pWBa54zLWorawtahJf33Hw#shampoo-rufus-tobacco
 data OpCode           :: pushBytes0:0 | pushBytes32:32 | pushData1:76 | pushData2:77
                        | pushData4:78 | reserved:80 | pushNum1:81 | return:106
@@ -102,6 +106,9 @@ data TapMerklePath    :: [TapBranchHash ^ ..0x80]
 data TapNodeHash      :: [Byte ^ 32]
 -- urn:ubideco:semid:71AxyLFsoRG6hJ1c11gxad65nEbWfzkQBjWCPPrgCyjX#telecom-quest-helium
 data TapScript        :: ScriptBytes
+-- urn:ubideco:semid:EjaLfxk1qE5LgYWBnrg1tcYHAcmMnCXd2S1S3szJw666#texas-tommy-geneva
+data TimeLockInterval :: height U16
+                       | time U16
 -- urn:ubideco:semid:DynChojW1sfr8VjSoZbmReHhZoU8u9KCiuwijgEGdToe#milk-gloria-prize
 data Tx               :: version TxVer
                        , inputs [TxIn ^ ..0xffffffff]