Remove wsts from stackslib

Signed-off-by: Jacinta Ferrant <[email protected]>

Author: jferrant

Cargo.lock

@@ -25,7 +25,7 @@ use std::time::SystemTime;
 use blockstack_lib::chainstate::nakamoto::NakamotoBlock;
 use blockstack_lib::chainstate::stacks::boot::{MINERS_NAME, SIGNERS_NAME};
 use blockstack_lib::chainstate::stacks::events::StackerDBChunksEvent;
-use blockstack_lib::chainstate::stacks::{StacksTransaction, ThresholdSignature};
+use blockstack_lib::chainstate::stacks::StacksTransaction;
 use blockstack_lib::net::api::postblock_proposal::{
     BlockValidateReject, BlockValidateResponse, ValidateRejectCode,
 };

libsigner/src/events.rs

@@ -887,8 +887,8 @@ impl From<BlockResponse> for SignerMessage {
 mod test {
     use blockstack_lib::chainstate::nakamoto::NakamotoBlockHeader;
     use blockstack_lib::chainstate::stacks::{
-        ThresholdSignature, TransactionAnchorMode, TransactionAuth, TransactionPayload,
-        TransactionPostConditionMode, TransactionSmartContract, TransactionVersion,
+        TransactionAnchorMode, TransactionAuth, TransactionPayload, TransactionPostConditionMode,
+        TransactionSmartContract, TransactionVersion,
     };
     use blockstack_lib::util_lib::strings::StacksString;
     use clarity::consts::CHAIN_ID_MAINNET;

libsigner/src/v0/messages.rs

@@ -56,7 +56,6 @@ stacks-common = { path = "../stacks-common" }
 pox-locking = { path = "../pox-locking" }
 libstackerdb = { path = "../libstackerdb" }
 siphasher = "0.3.7"
-wsts = { workspace = true }
 hashbrown = { workspace = true }
 rusqlite = { workspace = true }
 

stackslib/Cargo.toml

@@ -21,7 +21,6 @@ use stacks_common::deps_common::bitcoin::blockdata::script::Builder;
 use stacks_common::types::chainstate::{BurnchainHeaderHash, StacksAddress};
 use stacks_common::types::StacksPublicKeyBuffer;
 use stacks_common::util::secp256k1::Secp256k1PublicKey;
-use wsts::curve::point::{Compressed, Point};
 
 use crate::burnchains::bitcoin::bits::parse_script;
 use crate::burnchains::bitcoin::{BitcoinTxInput, BitcoinTxInputStructured};
@@ -175,26 +174,18 @@ impl VoteForAggregateKeyOp {
 
     /// Check the payload of a vote-for-aggregate-key burn op.
     /// Both `signer_key` and `aggregate_key` are checked for validity against
-    /// `Secp256k1PublicKey` from `stacks_common` as well as `Point` from wsts.
+    /// `Secp256k1PublicKey` from `stacks_common`
     pub fn check(&self) -> Result<(), op_error> {
         // Check to see if the aggregate key is valid
         let aggregate_key_bytes = self.aggregate_key.as_bytes();
         Secp256k1PublicKey::from_slice(aggregate_key_bytes)
             .map_err(|_| op_error::VoteForAggregateKeyInvalidKey)?;
 
-        let compressed = Compressed::try_from(aggregate_key_bytes.clone())
-            .map_err(|_| op_error::VoteForAggregateKeyInvalidKey)?;
-        Point::try_from(&compressed).map_err(|_| op_error::VoteForAggregateKeyInvalidKey)?;
-
         // Check to see if the signer key is valid
         let signer_key_bytes = self.signer_key.as_bytes();
         Secp256k1PublicKey::from_slice(signer_key_bytes)
             .map_err(|_| op_error::VoteForAggregateKeyInvalidKey)?;
 
-        let compressed = Compressed::try_from(signer_key_bytes.clone())
-            .map_err(|_| op_error::VoteForAggregateKeyInvalidKey)?;
-        Point::try_from(&compressed).map_err(|_| op_error::VoteForAggregateKeyInvalidKey)?;
-
         Ok(())
     }
 }

stackslib/src/chainstate/burn/operations/vote_for_aggregate_key.rs

@@ -34,7 +34,6 @@ use stacks_common::types::{Address, StacksEpoch, StacksEpochId, StacksPublicKeyB
 use stacks_common::util::hash::Hash160;
 use stacks_common::util::secp256k1::Secp256k1PrivateKey;
 use stacks_common::util::vrf::VRFProof;
-use wsts::curve::point::Point;
 
 use crate::burnchains::{PoxConstants, Txid};
 use crate::chainstate::burn::db::sortdb::{SortitionDB, SortitionHandle};

stackslib/src/chainstate/nakamoto/coordinator/tests.rs

@@ -53,7 +53,6 @@ use stacks_common::util::retry::BoundReader;
 use stacks_common::util::secp256k1::MessageSignature;
 use stacks_common::util::vrf::{VRFProof, VRFPublicKey, VRF};
 use stacks_common::util::{get_epoch_time_secs, sleep_ms};
-use wsts::curve::point::Point;
 
 use self::signer_set::SignerCalculation;
 use super::burn::db::sortdb::{
@@ -74,7 +73,7 @@ use super::stacks::db::{
 use super::stacks::events::{StacksTransactionReceipt, TransactionOrigin};
 use super::stacks::{
     Error as ChainstateError, StacksBlock, StacksBlockHeader, StacksMicroblock, StacksTransaction,
-    TenureChangeError, TenureChangePayload, ThresholdSignature, TransactionPayload,
+    TenureChangeError, TenureChangePayload, TransactionPayload,
 };
 use crate::burnchains::{Burnchain, PoxConstants, Txid};
 use crate::chainstate::burn::db::sortdb::SortitionDB;
@@ -4499,8 +4498,8 @@ impl NakamotoChainState {
     /// Boot code instantiation for the aggregate public key.
     /// TODO: This should be removed once it's possible for stackers to vote on the aggregate
     /// public key
-    pub fn aggregate_public_key_bootcode(clarity_tx: &mut ClarityTx, apk: &Point) {
-        let agg_pub_key = to_hex(&apk.compress().data);
+    pub fn aggregate_public_key_bootcode(clarity_tx: &mut ClarityTx, apk: Vec<u8>) {
+        let agg_pub_key = to_hex(&apk);
         let contract_content = format!(
             "(define-read-only ({}) 0x{})",
             BOOT_TEST_POX_4_AGG_KEY_FNAME, agg_pub_key

stackslib/src/chainstate/nakamoto/mod.rs

@@ -47,7 +47,6 @@ use stacks_common::util::hash::{to_hex, Hash160, MerkleHashFunc, MerkleTree, Sha
 use stacks_common::util::retry::BoundReader;
 use stacks_common::util::secp256k1::MessageSignature;
 use stacks_common::util::vrf::{VRFProof, VRFPublicKey, VRF};
-use wsts::curve::point::{Compressed, Point};
 
 use crate::burnchains::{Burnchain, PoxConstants, Txid};
 use crate::chainstate::burn::db::sortdb::{
@@ -73,8 +72,8 @@ use crate::chainstate::stacks::db::{
 use crate::chainstate::stacks::events::{StacksTransactionReceipt, TransactionOrigin};
 use crate::chainstate::stacks::{
     Error as ChainstateError, StacksBlock, StacksBlockHeader, StacksMicroblock, StacksTransaction,
-    TenureChangeCause, TenureChangeError, TenureChangePayload, ThresholdSignature,
-    TransactionPayload, MINER_BLOCK_CONSENSUS_HASH, MINER_BLOCK_HEADER_HASH,
+    TenureChangeCause, TenureChangeError, TenureChangePayload, TransactionPayload,
+    MINER_BLOCK_CONSENSUS_HASH, MINER_BLOCK_HEADER_HASH,
 };
 use crate::clarity::vm::clarity::{ClarityConnection, TransactionConnection};
 use crate::clarity_vm::clarity::{
@@ -101,7 +100,7 @@ pub struct SignerCalculation {
 
 pub struct AggregateKeyVoteParams {
     pub signer_index: u64,
-    pub aggregate_key: Point,
+    pub aggregate_key: Vec<u8>,
     pub voting_round: u64,
     pub reward_cycle: u64,
 }
@@ -547,10 +546,8 @@ impl NakamotoSigners {
         }
         let signer_index_value = payload.function_args.first()?;
         let signer_index = u64::try_from(signer_index_value.clone().expect_u128().ok()?).ok()?;
-        let point_value = payload.function_args.get(1)?;
-        let point_bytes = point_value.clone().expect_buff(33).ok()?;
-        let compressed_data = Compressed::try_from(point_bytes.as_slice()).ok()?;
-        let aggregate_key = Point::try_from(&compressed_data).ok()?;
+        let aggregate_key_value = payload.function_args.get(1)?;
+        let aggregate_key = aggregate_key_value.clone().expect_buff(33).ok()?;
         let round_value = payload.function_args.get(2)?;
         let voting_round = u64::try_from(round_value.clone().expect_u128().ok()?).ok()?;
         let reward_cycle =

stackslib/src/chainstate/nakamoto/signer_set.rs

@@ -87,7 +87,6 @@ use stacks_common::util::hash::{to_hex, Hash160, MerkleHashFunc, MerkleTree, Sha
 use stacks_common::util::retry::BoundReader;
 use stacks_common::util::secp256k1::MessageSignature;
 use stacks_common::util::vrf::{VRFProof, VRFPublicKey, VRF};
-use wsts::curve::point::Point;
 
 use crate::burnchains::{PoxConstants, Txid};
 use crate::chainstate::burn::db::sortdb::{
@@ -108,8 +107,8 @@ use crate::chainstate::stacks::db::{
 use crate::chainstate::stacks::events::StacksTransactionReceipt;
 use crate::chainstate::stacks::{
     Error as ChainstateError, StacksBlock, StacksBlockHeader, StacksMicroblock, StacksTransaction,
-    TenureChangeCause, TenureChangeError, TenureChangePayload, ThresholdSignature,
-    TransactionPayload, MINER_BLOCK_CONSENSUS_HASH, MINER_BLOCK_HEADER_HASH,
+    TenureChangeCause, TenureChangeError, TenureChangePayload, TransactionPayload,
+    MINER_BLOCK_CONSENSUS_HASH, MINER_BLOCK_HEADER_HASH,
 };
 use crate::clarity_vm::clarity::{ClarityInstance, PreCommitClarityBlock};
 use crate::clarity_vm::database::SortitionDBRef;