From 01fe20c2e0e245fc6c279d88a4ab9eb36de35beb Mon Sep 17 00:00:00 2001
From: irriden <irriden@proton.me>
Date: Sat, 25 Nov 2023 19:34:56 +0000
Subject: [PATCH] broker: use bitcoin and secp256k1 from vls re-exports

---
 broker/Cargo.lock    | 2 --
 broker/Cargo.toml    | 2 --
 broker/src/looper.rs | 6 +++---
 broker/src/main.rs   | 2 ++
 broker/src/util.rs   | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/broker/Cargo.lock b/broker/Cargo.lock
index 33894fc..412578c 100644
--- a/broker/Cargo.lock
+++ b/broker/Cargo.lock
@@ -3309,7 +3309,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "bitcoin",
  "chrono",
  "clap 3.2.25",
  "clap_derive 3.2.25",
@@ -3323,7 +3322,6 @@ dependencies = [
  "rocket",
  "rumqttc",
  "rumqttd",
- "secp256k1",
  "serde",
  "serde_json",
  "sphinx-signer",
diff --git a/broker/Cargo.toml b/broker/Cargo.toml
index eae1b14..c498987 100644
--- a/broker/Cargo.toml
+++ b/broker/Cargo.toml
@@ -10,7 +10,6 @@ strip = "debuginfo"
 [dependencies]
 anyhow            = { version = "1", features = ["backtrace"] }
 async-trait       = "0.1"
-bitcoin           = "0.29.0"
 chrono            = "0.4"
 clap              = "3.2"
 clap_derive       = "3.2"
@@ -23,7 +22,6 @@ pretty_env_logger = "0.4.0"
 rocket            = { version = "0.5.0-rc.2", features = ["json"] }
 rumqttc           = "0.12.0"
 rumqttd           = { git = "https://github.com/Evanfeenstra/rumqtt", branch = "sphinx-asdf", features = ["websocket"] }
-secp256k1         = { version = "0.24.0", features = ["rand-std", "bitcoin_hashes"] }
 serde             = { version = "1.0", features = ["derive"] }
 serde_json        = "1.0"
 thiserror         = "1.0.31"
diff --git a/broker/src/looper.rs b/broker/src/looper.rs
index e110709..7bf66c9 100644
--- a/broker/src/looper.rs
+++ b/broker/src/looper.rs
@@ -1,10 +1,10 @@
+use crate::bitcoin::blockdata::constants::ChainHash;
+use crate::bitcoin::Network;
 use crate::conn::{ChannelRequest, LssReq};
 use crate::handle::handle_message;
-use bitcoin::blockdata::constants::ChainHash;
-use bitcoin::Network;
+use crate::secp256k1::PublicKey;
 use log::*;
 use rocket::tokio::sync::mpsc;
-use secp256k1::PublicKey;
 use std::thread;
 use vls_protocol::{msgs, msgs::Message, Error, Result};
 use vls_proxy::client::Client;
diff --git a/broker/src/main.rs b/broker/src/main.rs
index a7e4828..0970b26 100644
--- a/broker/src/main.rs
+++ b/broker/src/main.rs
@@ -9,6 +9,8 @@ mod routes;
 mod run_test;
 mod util;
 
+pub(crate) use sphinx_signer::lightning_signer::bitcoin::{self, secp256k1};
+
 use crate::chain_tracker::MqttSignerPort;
 use crate::conn::{conns_set_pubkey, current_pubkey, new_connection, ChannelRequest, LssReq};
 use crate::looper::SignerLoop;
diff --git a/broker/src/util.rs b/broker/src/util.rs
index cc52b64..3c025a4 100644
--- a/broker/src/util.rs
+++ b/broker/src/util.rs
@@ -1,4 +1,4 @@
-use bitcoin::Network;
+use crate::bitcoin::Network;
 use std::default::Default;
 use std::env;
 use std::fs;