aljaz/sphinx-key
1
1
Fork 0
mirror of https://github.com/stakwork/sphinx-key.git synced 2025-12-19 00:04:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check that broker and CLN are on the same network

Browse Source
This commit is contained in:
decentclock
2022-08-26 19:20:26 +00:00
parent cd465bf084
commit 6f81516a60
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
broker/src/main.rs
View File

@@ -103,7 +103,7 @@ fn main() -> anyhow::Result<()> {
let client = UnixClient::new(conn); let client = UnixClient::new(conn);
// TODO pass status_rx into SignerLoop // TODO pass status_rx into SignerLoop
let mut signer_loop = SignerLoop::new(client, tx); let mut signer_loop = SignerLoop::new(client, tx);
signer_loop.start(); signer_loop.start(Some(&settings));
// }) // })
Ok(()) Ok(())

23
broker/src/unix_fd.rs
View File

@@ -1,4 +1,6 @@
use crate::util::Settings;
use crate::{Channel, ChannelReply, ChannelRequest}; use crate::{Channel, ChannelReply, ChannelRequest};
use bitcoin::blockdata::constants::ChainHash;
use log::*; use log::*;
use secp256k1::PublicKey; use secp256k1::PublicKey;
use sphinx_key_parser as parser; use sphinx_key_parser as parser;
@@ -58,16 +60,16 @@ impl<C: 'static + Client> SignerLoop<C> {
} }
/// Start the read loop /// Start the read loop
pub fn start(&mut self) { pub fn start(&mut self, settings: Option<&Settings>) {
info!("loop {}: start", self.log_prefix); info!("loop {}: start", self.log_prefix);
match self.do_loop() { match self.do_loop(settings) {
Ok(()) => info!("loop {}: done", self.log_prefix), Ok(()) => info!("loop {}: done", self.log_prefix),
Err(Error::Eof) => info!("loop {}: ending", self.log_prefix), Err(Error::Eof) => info!("loop {}: ending", self.log_prefix),
Err(e) => error!("loop {}: error {:?}", self.log_prefix, e), Err(e) => error!("loop {}: error {:?}", self.log_prefix, e),
} }
} }
fn do_loop(&mut self) -> Result<()> { fn do_loop(&mut self, settings: Option<&Settings>) -> Result<()> {
loop { loop {
let raw_msg = self.client.read_raw()?; let raw_msg = self.client.read_raw()?;
debug!("loop {}: got raw", self.log_prefix); debug!("loop {}: got raw", self.log_prefix);
@@ -85,13 +87,24 @@ impl<C: 'static + Client> SignerLoop<C> {
}; };
let mut new_loop = let mut new_loop =
SignerLoop::new_for_client(new_client, self.chan.sender.clone(), client_id); SignerLoop::new_for_client(new_client, self.chan.sender.clone(), client_id);
thread::spawn(move || new_loop.start()); thread::spawn(move || new_loop.start(None));
} }
Message::Memleak(_) => { Message::Memleak(_) => {
let reply = msgs::MemleakReply { result: false }; let reply = msgs::MemleakReply { result: false };
self.client.write(reply)?; self.client.write(reply)?;
} }
_ => { msg => {
if let Message::HsmdInit(m) = msg {
if let Some(set) = settings {
if ChainHash::using_genesis_block(set.network).as_bytes()
!= &m.chain_params.0
{
panic!("The network settings of CLN and broker don't match!");
}
} else {
panic!("Got HsmdInit without settings - likely because HsmdInit was sent after startup");
}
}
let reply = self.handle_message(raw_msg)?; let reply = self.handle_message(raw_msg)?;
// Write the reply to the node // Write the reply to the node
self.client.write_vec(reply)?; self.client.write_vec(reply)?;