wip: Use LockTime

tcharding · tcharding · commit 2f1ae91cf06b · 2022-06-03T13:27:17.000+10:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,17 +15,17 @@ compiler = []
 trace = []
 unstable = []
 default = []
-use-serde = ["serde", "bitcoin/use-serde"]
+use-serde = ["serde", "bitcoin/serde"]
 rand = ["bitcoin/rand"]
 
 [dependencies]
-bitcoin = "0.28.0"
+bitcoin = { git = "https://github.com/tcharding/rust-bitcoin", branch = "05-17-timelock" }
 serde = { version = "1.0", optional = true}
 
 [dev-dependencies]
 bitcoind = {version = "0.26.1", features=["22_0"]}
 actual-rand = { package = "rand", version = "0.8.4"}
-bitcoin = { version = "0.28", features = ["rand"]}
+bitcoin = { git = "https://github.com/tcharding/rust-bitcoin", branch = "05-17-timelock", features = ["rand"] }
 
 [[example]]
 name = "htlc"
diff --git a/examples/sign_multisig.rs b/examples/sign_multisig.rs
@@ -18,7 +18,7 @@ use std::collections::HashMap;
 use std::str::FromStr;
 
 use bitcoin::blockdata::witness::Witness;
-use bitcoin::secp256k1;
+use bitcoin::{secp256k1, LockTime};
 
 fn main() {
     let mut tx = spending_transaction();
@@ -91,7 +91,7 @@ fn main() {
 fn spending_transaction() -> bitcoin::Transaction {
     bitcoin::Transaction {
         version: 2,
-        lock_time: 0,
+        lock_time: LockTime::from(0),
         input: vec![bitcoin::TxIn {
             previous_output: Default::default(),
             script_sig: bitcoin::Script::new(),
diff --git a/examples/verify_tx.rs b/examples/verify_tx.rs
@@ -16,6 +16,7 @@
 
 use std::str::FromStr;
 
+use bitcoin::LockTime;
 use bitcoin::consensus::Decodable;
 use bitcoin::secp256k1::{self, Secp256k1};
 use bitcoin::util::sighash;
@@ -33,7 +34,7 @@ fn main() {
         &spk_input_1,
         &tx.input[0].script_sig,
         &tx.input[0].witness,
-        0,
+        LockTime::from(0),
         0,
     )
     .unwrap();
diff --git a/src/descriptor/tr.rs b/src/descriptor/tr.rs
@@ -262,6 +262,7 @@ impl<Pk: MiniscriptKey> Tr<Pk> {
                     TaprootBuilderError::EmptyTree => {
                         unreachable!("Taptree is a well formed tree with atleast 1 element")
                     }
+                    _ => panic!("Unknown error, non_exhaustive catch all"),
                 },
             }
         };
diff --git a/src/interpreter/error.rs b/src/interpreter/error.rs
@@ -26,6 +26,8 @@ use super::BitcoinKey;
 pub enum Error {
     /// Could not satisfy, absolute locktime not met
     AbsoluteLocktimeNotMet(u32),
+    /// Could not satisfy, lock time values are different units
+    AbsoluteLocktimeComparisonInvalid(u32, u32),
     /// Cannot Infer a taproot descriptor
     /// Key spends cannot infer the internal key of the descriptor
     /// Inferring script spends is possible, but is hidden nodes are currently
@@ -188,6 +190,7 @@ impl fmt::Display for Error {
             Error::VerifyFailed => {
                 f.write_str("Expected Satisfied Boolean at stack top for VERIFY")
             }
+            _ => f.write_str("Unknown error, non_exhaustive catch all"),
         }
     }
 }
@@ -234,6 +237,7 @@ impl error::Error for Error {
             Secp(e) => Some(e),
             SchnorrSig(e) => Some(e),
             SighashError(e) => Some(e),
+            _ => None           // non_exhaustive catch all.
         }
     }
 }
diff --git a/src/interpreter/mod.rs b/src/interpreter/mod.rs
@@ -26,7 +26,7 @@ use std::str::FromStr;
 use bitcoin::blockdata::witness::Witness;
 use bitcoin::hashes::{hash160, ripemd160, sha256, sha256d};
 use bitcoin::util::{sighash, taproot};
-use bitcoin::{self, secp256k1, TxOut};
+use bitcoin::{self, secp256k1, TxOut, LockTime};
 
 use crate::miniscript::context::NoChecks;
 use crate::miniscript::ScriptContext;
@@ -48,7 +48,7 @@ pub struct Interpreter<'txin> {
     /// For non-Taproot spends, the scriptCode; for Taproot script-spends, this
     /// is the leaf script; for key-spends it is `None`.
     script_code: Option<bitcoin::Script>,
-    age: u32,
+    age: LockTime,
     height: u32,
 }
 
@@ -169,7 +169,7 @@ impl<'txin> Interpreter<'txin> {
         spk: &bitcoin::Script,
         script_sig: &'txin bitcoin::Script,
         witness: &'txin Witness,
-        age: u32,
+        age: LockTime,
         height: u32,
     ) -> Result<Self, Error> {
         let (inner, stack, script_code) = inner::from_txdata(spk, script_sig, witness)?;
@@ -492,7 +492,7 @@ pub enum SatisfiedConstraint {
     ///Absolute Timelock for CLTV.
     AbsoluteTimelock {
         /// The value of Absolute timelock
-        time: u32,
+        time: LockTime,
     },
 }
 
@@ -527,7 +527,7 @@ pub struct Iter<'intp, 'txin: 'intp> {
     public_key: Option<&'intp BitcoinKey>,
     state: Vec<NodeEvaluationState<'intp>>,
     stack: Stack<'txin>,
-    age: u32,
+    age: LockTime,
     height: u32,
     has_errored: bool,
 }
@@ -1130,7 +1130,7 @@ mod tests {
                     n_evaluated: 0,
                     n_satisfied: 0,
                 }],
-                age: 1002,
+                age: LockTime::from(1002),
                 height: 1002,
                 has_errored: false,
             }
@@ -1197,7 +1197,7 @@ mod tests {
         let after_satisfied: Result<Vec<SatisfiedConstraint>, Error> = constraints.collect();
         assert_eq!(
             after_satisfied.unwrap(),
-            vec![SatisfiedConstraint::AbsoluteTimelock { time: 1000 }]
+            vec![SatisfiedConstraint::AbsoluteTimelock { time: LockTime::from(1000) }]
         );
 
         //Check Older
diff --git a/src/interpreter/stack.rs b/src/interpreter/stack.rs
@@ -17,6 +17,7 @@
 use bitcoin;
 use bitcoin::blockdata::{opcodes, script};
 use bitcoin::hashes::{hash160, ripemd160, sha256, sha256d, Hash};
+use bitcoin::{locktime, LockTime};
 
 use super::error::PkEvalErrInner;
 use super::{
@@ -230,14 +231,16 @@ impl<'txin> Stack<'txin> {
     /// booleans
     pub(super) fn evaluate_after(
         &mut self,
-        n: &u32,
-        age: u32,
+        n: &LockTime,
+        age: LockTime,
     ) -> Option<Result<SatisfiedConstraint, Error>> {
-        if age >= *n {
-            self.push(Element::Satisfied);
-            Some(Ok(SatisfiedConstraint::AbsoluteTimelock { time: *n }))
-        } else {
-            Some(Err(Error::AbsoluteLocktimeNotMet(*n)))
+        match locktime::is_satisfied(*n, age) {
+            Ok(true) => {
+                self.push(Element::Satisfied);
+                Some(Ok(SatisfiedConstraint::AbsoluteTimelock { time: *n }))
+            },
+            Ok(false) => Some(Err(Error::AbsoluteLocktimeNotMet(n.to_u32()))),
+            Err(_) => Some(Err(Error::AbsoluteLocktimeComparisonInvalid(n.to_u32(), age.to_u32()))),
         }
     }
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -104,7 +104,6 @@ pub mod interpreter;
 pub mod miniscript;
 pub mod policy;
 pub mod psbt;
-pub mod timelock;
 
 mod util;
 
diff --git a/src/miniscript/astelem.rs b/src/miniscript/astelem.rs
@@ -23,6 +23,7 @@ use std::str::FromStr;
 use std::sync::Arc;
 use std::{fmt, str};
 
+use bitcoin::LockTime;
 use bitcoin::blockdata::{opcodes, script};
 use bitcoin::hashes::hex::FromHex;
 use bitcoin::hashes::{hash160, ripemd160, sha256, sha256d, Hash};
@@ -491,7 +492,7 @@ where
                 expression::terminal(&top.args[0], |x| Pk::Hash::from_str(x).map(Terminal::PkH))
             }
             ("after", 1) => expression::terminal(&top.args[0], |x| {
-                expression::parse_num(x).map(Terminal::After)
+                expression::parse_num(x).map(|x| Terminal::After(LockTime::from(x)))
             }),
             ("older", 1) => expression::terminal(&top.args[0], |x| {
                 expression::parse_num(x).map(Terminal::Older)
@@ -653,7 +654,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Terminal<Pk, Ctx> {
                 .push_slice(&Pk::hash_to_hash160(hash)[..])
                 .push_opcode(opcodes::all::OP_EQUALVERIFY),
             Terminal::After(t) => builder
-                .push_int(t as i64)
+                .push_int(t.to_u32() as i64)
                 .push_opcode(opcodes::all::OP_CLTV),
             Terminal::Older(t) => builder.push_int(t as i64).push_opcode(opcodes::all::OP_CSV),
             Terminal::Sha256(h) => builder
@@ -788,7 +789,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Terminal<Pk, Ctx> {
         match *self {
             Terminal::PkK(ref pk) => Ctx::pk_len(pk),
             Terminal::PkH(..) => 24,
-            Terminal::After(n) => script_num_size(n as usize) + 1,
+            Terminal::After(n) => script_num_size(n.to_u32() as usize) + 1,
             Terminal::Older(n) => script_num_size(n as usize) + 1,
             Terminal::Sha256(..) => 33 + 6,
             Terminal::Hash256(..) => 33 + 6,
diff --git a/src/miniscript/decode.rs b/src/miniscript/decode.rs
@@ -26,6 +26,7 @@ use bitcoin::hashes::{hash160, ripemd160, sha256, sha256d, Hash};
 
 use crate::miniscript::lex::{Token as Tk, TokenIter};
 use crate::miniscript::limits::MAX_PUBKEYS_PER_MULTISIG;
+use crate::bitcoin::locktime::LockTime;
 use crate::miniscript::types::extra_props::ExtData;
 use crate::miniscript::types::{Property, Type};
 use crate::miniscript::ScriptContext;
@@ -133,7 +134,7 @@ pub enum Terminal<Pk: MiniscriptKey, Ctx: ScriptContext> {
     PkH(Pk::Hash),
     // timelocks
     /// `n CHECKLOCKTIMEVERIFY`
-    After(u32),
+    After(LockTime),
     /// `n CHECKSEQUENCEVERIFY`
     Older(u32),
     // hashlocks
@@ -388,7 +389,7 @@ pub fn parse<Ctx: ScriptContext>(
                     Tk::CheckSequenceVerify, Tk::Num(n)
                         => term.reduce0(Terminal::Older(n))?,
                     Tk::CheckLockTimeVerify, Tk::Num(n)
-                        => term.reduce0(Terminal::After(n))?,
+                        => term.reduce0(Terminal::After(LockTime::from(n)))?,
                     // hashlocks
                     Tk::Equal => match_token!(
                         tokens,
diff --git a/src/miniscript/mod.rs b/src/miniscript/mod.rs
@@ -978,7 +978,7 @@ mod tests {
         ));
         assert_eq!(
             ms.unwrap_err().to_string(),
-            "unexpected «Key hex decoding error: bad hex string length 64 (expected 66)»"
+            "unexpected «key hex decoding error»"
         );
         Tapscript::from_str_insane(&format!(
             "pk(2788ee41e76f4f3af603da5bc8fa22997bc0344bb0f95666ba6aaff0242baa99)"
diff --git a/src/miniscript/satisfy.rs b/src/miniscript/satisfy.rs
@@ -22,13 +22,13 @@ use std::collections::{BTreeMap, HashMap};
 use std::sync::Arc;
 use std::{cmp, i64, mem};
 
-use bitcoin;
+use bitcoin::LockTime;
 use bitcoin::hashes::{hash160, ripemd160, sha256, sha256d};
 use bitcoin::secp256k1::XOnlyPublicKey;
 use bitcoin::util::taproot::{ControlBlock, LeafVersion, TapLeafHash};
 
 use crate::miniscript::limits::{
-    LOCKTIME_THRESHOLD, SEQUENCE_LOCKTIME_DISABLE_FLAG, SEQUENCE_LOCKTIME_TYPE_FLAG,
+    SEQUENCE_LOCKTIME_DISABLE_FLAG, SEQUENCE_LOCKTIME_TYPE_FLAG,
 };
 use crate::util::witness_size;
 use crate::{Miniscript, MiniscriptKey, ScriptContext, Terminal, ToPublicKey};
@@ -115,7 +115,7 @@ pub trait Satisfier<Pk: MiniscriptKey + ToPublicKey> {
     }
 
     /// Assert whether a absolute locktime is satisfied
-    fn check_after(&self, _: u32) -> bool {
+    fn check_after(&self, _: LockTime) -> bool {
         false
     }
 }
@@ -148,21 +148,6 @@ impl<Pk: MiniscriptKey + ToPublicKey> Satisfier<Pk> for Older {
     }
 }
 
-/// Newtype around `u32` which implements `Satisfier` using `n` as an
-/// absolute locktime
-pub struct After(pub u32);
-
-impl<Pk: MiniscriptKey + ToPublicKey> Satisfier<Pk> for After {
-    fn check_after(&self, n: u32) -> bool {
-        // if n > self.0; we will be returning false anyways
-        if n < LOCKTIME_THRESHOLD && self.0 >= LOCKTIME_THRESHOLD {
-            false
-        } else {
-            n <= self.0
-        }
-    }
-}
-
 impl<Pk: MiniscriptKey + ToPublicKey> Satisfier<Pk> for HashMap<Pk, bitcoin::EcdsaSig> {
     fn lookup_ecdsa_sig(&self, key: &Pk) -> Option<bitcoin::EcdsaSig> {
         self.get(key).copied()
@@ -277,7 +262,7 @@ impl<'a, Pk: MiniscriptKey + ToPublicKey, S: Satisfier<Pk>> Satisfier<Pk> for &'
         (**self).check_older(t)
     }
 
-    fn check_after(&self, t: u32) -> bool {
+    fn check_after(&self, t: LockTime) -> bool {
         (**self).check_after(t)
     }
 }
@@ -339,7 +324,7 @@ impl<'a, Pk: MiniscriptKey + ToPublicKey, S: Satisfier<Pk>> Satisfier<Pk> for &'
         (**self).check_older(t)
     }
 
-    fn check_after(&self, t: u32) -> bool {
+    fn check_after(&self, t: LockTime) -> bool {
         (**self).check_after(t)
     }
 }
@@ -483,7 +468,7 @@ macro_rules! impl_tuple_satisfier {
                 false
             }
 
-            fn check_after(&self, n: u32) -> bool {
+            fn check_after(&self, n: LockTime) -> bool {
                 let &($(ref $ty,)*) = self;
                 $(
                     if $ty.check_after(n) {
diff --git a/src/miniscript/types/extra_props.rs b/src/miniscript/types/extra_props.rs
@@ -4,10 +4,12 @@
 use std::cmp;
 use std::iter::once;
 
+use bitcoin::LockTime;
+
 use super::{Error, ErrorKind, Property, ScriptContext};
 use crate::miniscript::context::SigType;
 use crate::miniscript::limits::{
-    LOCKTIME_THRESHOLD, SEQUENCE_LOCKTIME_DISABLE_FLAG, SEQUENCE_LOCKTIME_TYPE_FLAG,
+    SEQUENCE_LOCKTIME_DISABLE_FLAG, SEQUENCE_LOCKTIME_TYPE_FLAG,
 };
 use crate::{script_num_size, MiniscriptKey, Terminal};
 
@@ -337,9 +339,9 @@ impl Property for ExtData {
         unreachable!()
     }
 
-    fn from_after(t: u32) -> Self {
+    fn from_after(t: LockTime) -> Self {
         ExtData {
-            pk_cost: script_num_size(t as usize) + 1,
+            pk_cost: script_num_size(t.to_u32() as usize) + 1,
             has_free_verify: false,
             ops: OpLimits::new(1, Some(0), None),
             stack_elem_count_sat: Some(0),
@@ -349,8 +351,8 @@ impl Property for ExtData {
             timelock_info: TimelockInfo {
                 csv_with_height: false,
                 csv_with_time: false,
-                cltv_with_height: t < LOCKTIME_THRESHOLD,
-                cltv_with_time: t >= LOCKTIME_THRESHOLD,
+                cltv_with_height: t.is_height(),
+                cltv_with_time: t.is_time(),
                 contains_combination: false,
             },
             exec_stack_elem_count_sat: Some(1), // <t>
@@ -933,7 +935,7 @@ impl Property for ExtData {
                 // Note that for CLTV this is a limitation not of Bitcoin but Miniscript. The
                 // number on the stack would be a 5 bytes signed integer but Miniscript's B type
                 // only consumes 4 bytes from the stack.
-                if t == 0 || (t & SEQUENCE_LOCKTIME_DISABLE_FLAG) != 0 {
+                if t.to_u32() == 0 || (t.to_u32() & SEQUENCE_LOCKTIME_DISABLE_FLAG) != 0 {
                     return Err(Error {
                         fragment: fragment.clone(),
                         error: ErrorKind::InvalidTime,
diff --git a/src/miniscript/types/mod.rs b/src/miniscript/types/mod.rs
diff --git a/src/policy/concrete.rs b/src/policy/concrete.rs
diff --git a/src/policy/semantic.rs b/src/policy/semantic.rs
diff --git a/src/psbt/mod.rs b/src/psbt/mod.rs
diff --git a/src/timelock.rs b/src/timelock.rs

Original file line number	Diff line number	Diff line change
`@@ -262,6 +262,7 @@ impl<Pk: MiniscriptKey> Tr<Pk> {`
`262`	`262`	`TaprootBuilderError::EmptyTree => {`
`263`	`263`	`unreachable!("Taptree is a well formed tree with atleast 1 element")`
`264`	`264`	`}`
	`265`	`+ _ => panic!("Unknown error, non_exhaustive catch all"),`
`265`	`266`	`},`
`266`	`267`	`}`
`267`	`268`	`};`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ use super::BitcoinKey;`
`26`	`26`	`pub enum Error {`
`27`	`27`	`/// Could not satisfy, absolute locktime not met`
`28`	`28`	`AbsoluteLocktimeNotMet(u32),`
	`29`	`+ /// Could not satisfy, lock time values are different units`
	`30`	`+ AbsoluteLocktimeComparisonInvalid(u32, u32),`
`29`	`31`	`/// Cannot Infer a taproot descriptor`
`30`	`32`	`/// Key spends cannot infer the internal key of the descriptor`
`31`	`33`	`/// Inferring script spends is possible, but is hidden nodes are currently`
`@@ -188,6 +190,7 @@ impl fmt::Display for Error {`
`188`	`190`	`Error::VerifyFailed => {`
`189`	`191`	`f.write_str("Expected Satisfied Boolean at stack top for VERIFY")`
`190`	`192`	`}`
	`193`	`+ _ => f.write_str("Unknown error, non_exhaustive catch all"),`
`191`	`194`	`}`
`192`	`195`	`}`
`193`	`196`	`}`
`@@ -234,6 +237,7 @@ impl error::Error for Error {`
`234`	`237`	`Secp(e) => Some(e),`
`235`	`238`	`SchnorrSig(e) => Some(e),`
`236`	`239`	`SighashError(e) => Some(e),`
	`240`	`+ _ => None // non_exhaustive catch all.`
`237`	`241`	`}`
`238`	`242`	`}`
`239`	`243`	`}`