Merge pull request #309 from nomic-io/frost-updates

Frost updates
nomic-io · Sep 28, 2024 · 9f2ea08 · 9f2ea08
2 parents 1a68304 + 6e4fc1f
commit 9f2ea08
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -49,7 +49,7 @@ lazy_static = "1.4.0"
 prost = "0.13.3"
 cosmrs = "0.14.0"
 ripemd = "0.1.3"
-frost-secp256k1-tr = { git = "https://github.com/ZcashFoundation/frost", rev = "20c2c98a931c564655e2a03719e19ba916e11545", features = [
+frost-secp256k1-tr = { git = "https://github.com/ZcashFoundation/frost", rev = "51fa7d09f3742563a35d065afcff6ad486430dac", features = [
     "nightly",
 ] }
 alloy = { version = "0.2.1", features = [
@@ -79,7 +79,7 @@ semver = "1.0.18"
 glob = "0.3.1"
 
 [features]
-default = ["full", "feat-ibc", "testnet", "ethereum", "legacy-bin"]
+default = ["full", "feat-ibc", "testnet", "ethereum"]
 full = [
     "bitcoincore-rpc-async",
     "clap",

diff --git a/rest/Cargo.lock b/rest/Cargo.lock
diff --git a/src/bin/nomic.rs b/src/bin/nomic.rs
@@ -180,7 +180,6 @@ pub enum Command {
     PayToFeePool(PayToFeePoolCmd),
     BabylonRelayer(BabylonRelayerCmd),
     StakeNbtc(StakeNbtcCmd),
-    FrostSigner(FrostSignerCmd),
     #[cfg(feature = "ethereum")]
     RelayEthereum(RelayEthereumCmd),
     #[cfg(feature = "ethereum")]
@@ -251,7 +250,6 @@ impl Command {
                 PayToFeePool(cmd) => cmd.run().await,
                 BabylonRelayer(cmd) => cmd.run().await,
                 StakeNbtc(cmd) => cmd.run().await,
-                FrostSigner(cmd) => cmd.run().await,
                 #[cfg(feature = "ethereum")]
                 RelayEthereum(cmd) => cmd.run().await,
                 #[cfg(feature = "ethereum")]
@@ -1485,7 +1483,12 @@ impl SignerCmd {
 
         let relaunch = relaunch_on_migrate(&self.config);
 
-        futures::try_join!(signer, relaunch).unwrap();
+        let frost_cmd = FrostSignerCmd {
+            config: self.config.clone(),
+        };
+        let frost_signer = frost_cmd.run();
+
+        futures::try_join!(signer, relaunch, frost_signer).unwrap();
 
         Ok(())
     }