From 31ac2338e24aa4125f6d5a52b00118126cd806f1 Mon Sep 17 00:00:00 2001
From: Matt Bell <mappum@gmail.com>
Date: Fri, 27 Sep 2024 15:17:29 -0500
Subject: [PATCH 1/3] Disable 'legacy-bin' feature

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3213430c..76fcfcde 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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",

From bddad8bb910258e47b1c9ddea9bd167dbcff40d4 Mon Sep 17 00:00:00 2001
From: Judd Keppel <kepzorz@gmail.com>
Date: Fri, 27 Sep 2024 15:55:10 -0500
Subject: [PATCH 2/3] Start Frost signer in `nomic signer`

---
 src/bin/nomic.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/bin/nomic.rs b/src/bin/nomic.rs
index abe233e1..18727fc6 100644
--- 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(())
     }

From 6e4fc1fb0aa3cb017b5671897a52b4452e733f5d Mon Sep 17 00:00:00 2001
From: Judd Keppel <kepzorz@gmail.com>
Date: Fri, 27 Sep 2024 15:55:47 -0500
Subject: [PATCH 3/3] Update frost-secp256k1-tr dependency

---
 Cargo.lock      | 6 +++---
 Cargo.toml      | 2 +-
 rest/Cargo.lock | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a61a87c7..b8bd2a01 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2312,7 +2312,7 @@ dependencies = [
 [[package]]
 name = "frost-core"
 version = "1.0.0"
-source = "git+https://github.com/ZcashFoundation/frost?rev=20c2c98a931c564655e2a03719e19ba916e11545#20c2c98a931c564655e2a03719e19ba916e11545"
+source = "git+https://github.com/ZcashFoundation/frost?rev=51fa7d09f3742563a35d065afcff6ad486430dac#51fa7d09f3742563a35d065afcff6ad486430dac"
 dependencies = [
  "byteorder",
  "const-crc32",
@@ -2333,7 +2333,7 @@ dependencies = [
 [[package]]
 name = "frost-rerandomized"
 version = "1.0.0"
-source = "git+https://github.com/ZcashFoundation/frost?rev=20c2c98a931c564655e2a03719e19ba916e11545#20c2c98a931c564655e2a03719e19ba916e11545"
+source = "git+https://github.com/ZcashFoundation/frost?rev=51fa7d09f3742563a35d065afcff6ad486430dac#51fa7d09f3742563a35d065afcff6ad486430dac"
 dependencies = [
  "derive-getters",
  "document-features",
@@ -2344,7 +2344,7 @@ dependencies = [
 [[package]]
 name = "frost-secp256k1-tr"
 version = "1.0.0"
-source = "git+https://github.com/ZcashFoundation/frost?rev=20c2c98a931c564655e2a03719e19ba916e11545#20c2c98a931c564655e2a03719e19ba916e11545"
+source = "git+https://github.com/ZcashFoundation/frost?rev=51fa7d09f3742563a35d065afcff6ad486430dac#51fa7d09f3742563a35d065afcff6ad486430dac"
 dependencies = [
  "document-features",
  "frost-core",
diff --git a/Cargo.toml b/Cargo.toml
index 76fcfcde..3f7155e9 100644
--- 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 = [
diff --git a/rest/Cargo.lock b/rest/Cargo.lock
index 83119f63..e93f72b5 100644
--- a/rest/Cargo.lock
+++ b/rest/Cargo.lock
@@ -1447,7 +1447,7 @@ dependencies = [
 [[package]]
 name = "frost-core"
 version = "1.0.0"
-source = "git+https://github.com/ZcashFoundation/frost?rev=20c2c98a931c564655e2a03719e19ba916e11545#20c2c98a931c564655e2a03719e19ba916e11545"
+source = "git+https://github.com/ZcashFoundation/frost?rev=51fa7d09f3742563a35d065afcff6ad486430dac#51fa7d09f3742563a35d065afcff6ad486430dac"
 dependencies = [
  "byteorder",
  "const-crc32",
@@ -1468,7 +1468,7 @@ dependencies = [
 [[package]]
 name = "frost-rerandomized"
 version = "1.0.0"
-source = "git+https://github.com/ZcashFoundation/frost?rev=20c2c98a931c564655e2a03719e19ba916e11545#20c2c98a931c564655e2a03719e19ba916e11545"
+source = "git+https://github.com/ZcashFoundation/frost?rev=51fa7d09f3742563a35d065afcff6ad486430dac#51fa7d09f3742563a35d065afcff6ad486430dac"
 dependencies = [
  "derive-getters",
  "document-features",
@@ -1479,7 +1479,7 @@ dependencies = [
 [[package]]
 name = "frost-secp256k1-tr"
 version = "1.0.0"
-source = "git+https://github.com/ZcashFoundation/frost?rev=20c2c98a931c564655e2a03719e19ba916e11545#20c2c98a931c564655e2a03719e19ba916e11545"
+source = "git+https://github.com/ZcashFoundation/frost?rev=51fa7d09f3742563a35d065afcff6ad486430dac#51fa7d09f3742563a35d065afcff6ad486430dac"
 dependencies = [
  "document-features",
  "frost-core",