Use threshold const

nomic-io · Oct 27, 2023 · 6c2f3b0 · 6c2f3b0
1 parent 8f9b333
commit 6c2f3b0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/src/bitcoin/checkpoint.rs b/src/bitcoin/checkpoint.rs
@@ -31,6 +31,7 @@ use orga::{
     Error as OrgaError, Result as OrgaResult,
 };
 
+use super::SIGSET_THRESHOLD;
 use orga::{describe::Describe, store::Store};
 use serde::{Deserialize, Serialize};
 use std::convert::TryFrom;
@@ -966,10 +967,7 @@ impl Config {
             target_checkpoint_inclusion: 2,
             min_fee_rate: 2, // relay threshold is 1 sat/vbyte
             max_fee_rate: 200,
-            #[cfg(feature = "testnet")]
-            sigset_threshold: (9, 10),
-            #[cfg(not(feature = "testnet"))]
-            sigset_threshold: (2, 3),
+            sigset_threshold: SIGSET_THRESHOLD,
             emergency_disbursal_min_tx_amt: 1000,
             #[cfg(feature = "testnet")]
             emergency_disbursal_lock_time_interval: 60 * 60 * 24 * 7, // one week

diff --git a/src/bitcoin/mod.rs b/src/bitcoin/mod.rs
@@ -63,6 +63,12 @@ pub const NETWORK: ::bitcoin::Network = ::bitcoin::Network::Testnet;
 #[cfg(all(feature = "devnet", feature = "testnet"))]
 pub const NETWORK: ::bitcoin::Network = ::bitcoin::Network::Regtest;
 
+// TODO: move to config
+#[cfg(feature = "testnet")]
+pub const SIGSET_THRESHOLD: (u64, u64) = (9, 10);
+#[cfg(not(feature = "testnet"))]
+pub const SIGSET_THRESHOLD: (u64, u64) = (2, 3);
+
 /// The configuration parameters for the Bitcoin module.
 #[orga(skip(Default), version = 3)]
 pub struct Config {

diff --git a/src/bitcoin/relayer.rs b/src/bitcoin/relayer.rs
@@ -1,5 +1,6 @@
 use super::signatory::Signatory;
 use super::SignatorySet;
+use super::SIGSET_THRESHOLD;
 use crate::app::Dest;
 use crate::app_client;
 use crate::bitcoin::deposit_index::{Deposit, DepositIndex};
@@ -33,12 +34,6 @@ where
 
 const HEADER_BATCH_SIZE: usize = 250;
 
-// TODO: get dynamically from sigset
-#[cfg(feature = "testnet")]
-const THRESHOLD: (u64, u64) = (9, 10);
-#[cfg(not(feature = "testnet"))]
-const THRESHOLD: (u64, u64) = (2, 3);
-
 #[derive(Serialize, Deserialize)]
 pub struct DepositsQuery {
     pub receiver: String,
@@ -195,7 +190,7 @@ impl Relayer {
                         &sigset
                             .output_script(
                                 dest.commitment_bytes().map_err(|_| reject())?.as_slice(),
-                                THRESHOLD,
+                                SIGSET_THRESHOLD,
                             )
                             .map_err(warp::reject::custom)?,
                         super::NETWORK,
@@ -1023,7 +1018,7 @@ impl WatchedScripts {
     }
 
     pub fn insert(&mut self, dest: Dest, sigset: &SignatorySet) -> Result<bool> {
-        let script = self.derive_script(&dest, sigset, THRESHOLD)?;
+        let script = self.derive_script(&dest, sigset, SIGSET_THRESHOLD)?;
 
         if self.scripts.contains_key(&script) {
             return Ok(false);
@@ -1049,7 +1044,7 @@ impl WatchedScripts {
             }
 
             for dest in dests {
-                let script = self.derive_script(dest, sigset, THRESHOLD)?; // TODO: get threshold from state
+                let script = self.derive_script(dest, sigset, SIGSET_THRESHOLD)?; // TODO: get threshold from state
                 self.scripts.remove(&script);
             }
         }

diff --git a/src/bitcoin/threshold_sig.rs b/src/bitcoin/threshold_sig.rs
@@ -1,4 +1,4 @@
-use super::SignatorySet;
+use super::{SignatorySet, SIGSET_THRESHOLD};
 use bitcoin::blockdata::transaction::EcdsaSighashType;
 use bitcoin::secp256k1::{
     self,
@@ -258,7 +258,8 @@ impl ThresholdSig {
         }
 
         // TODO: get threshold ratio from somewhere else
-        ts.threshold = ((total_vp as u128) * 9 / 10) as u64;
+        ts.threshold =
+            ((total_vp as u128) * SIGSET_THRESHOLD.0 as u128 / SIGSET_THRESHOLD.1 as u128) as u64;
 
         Ok(ts)
     }
@@ -281,7 +282,8 @@ impl ThresholdSig {
         }
 
         // TODO: get threshold ratio from somewhere else
-        ts.threshold = ((total_vp as u128) * 9 / 10) as u64;
+        ts.threshold =
+            ((total_vp as u128) * SIGSET_THRESHOLD.0 as u128 / SIGSET_THRESHOLD.1 as u128) as u64;
         ts.len = len;
 
         Ok(ts)