Merge pull request #95 from coblox/fix/handle-block-expiries

Treat expiry/exit-delay values as blocks if below 512

Author: luckysori

ark-grpc/src/types.rs

@@ -54,16 +54,9 @@ impl TryFrom<generated::ark::v1::GetInfoResponse> for server::Info {
     fn try_from(value: generated::ark::v1::GetInfoResponse) -> Result<Self, Self::Error> {
         let pk = value.signer_pubkey.parse().map_err(Error::conversion)?;
 
-        let vtxo_tree_expiry = bitcoin::Sequence::from_seconds_ceil(value.vtxo_tree_expiry as u32)
-            .map_err(Error::conversion)?;
-
-        let unilateral_exit_delay =
-            bitcoin::Sequence::from_seconds_ceil(value.unilateral_exit_delay as u32)
-                .map_err(Error::conversion)?;
-
-        let boarding_exit_delay =
-            bitcoin::Sequence::from_seconds_ceil(value.boarding_exit_delay as u32)
-                .map_err(Error::conversion)?;
+        let vtxo_tree_expiry = parse_sequence_number(value.vtxo_tree_expiry)?;
+        let unilateral_exit_delay = parse_sequence_number(value.unilateral_exit_delay)?;
+        let boarding_exit_delay = parse_sequence_number(value.boarding_exit_delay)?;
 
         let network = Network::from_str(value.network.as_str()).map_err(Error::conversion)?;
         let network = bitcoin::Network::from(network);
@@ -112,6 +105,27 @@ impl TryFrom<generated::ark::v1::GetInfoResponse> for server::Info {
     }
 }
 
+fn parse_sequence_number(value: i64) -> Result<bitcoin::Sequence, Error> {
+    /// The threshold that determines whether an expiry or exit delay should be parsed as a
+    /// number of blocks or a number of seconds.
+    ///
+    /// - A value below 512 is considered a number of blocks.
+    /// - A value over 512 is considered a number of seconds.
+    const ARBITRARY_SEQUENCE_THRESHOLD: i64 = 512;
+
+    let sequence = if value.is_negative() {
+        return Err(Error::conversion(format!(
+            "invalid sequence number: {value}"
+        )));
+    } else if value < ARBITRARY_SEQUENCE_THRESHOLD {
+        bitcoin::Sequence::from_height(value as u16)
+    } else {
+        bitcoin::Sequence::from_seconds_ceil(value as u32).map_err(Error::conversion)?
+    };
+
+    Ok(sequence)
+}
+
 impl TryFrom<&generated::ark::v1::IndexerVtxo> for server::VirtualTxOutPoint {
     type Error = Error;