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

broker, signer: hsmd negotation, more speedups from vls

Browse Source
This commit is contained in:
irriden
2024-02-08 05:32:52 +00:00
parent 9ee17afcea
commit d10a10e6f6
14 changed files with 208 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
broker/Cargo.lock generated
View File

@@ -459,7 +459,7 @@ dependencies = [
[[package]] [[package]]
name = "bolt-derive" name = "bolt-derive"
version = "0.2.0" version = "0.2.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=a28153e0f1b6598e6538d32b3c5bfb9c7657d565#a28153e0f1b6598e6538d32b3c5bfb9c7657d565" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -529,6 +529,33 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa622bd314835eb026b776af471344d0dba94705c937900656a31d0407e53689" checksum = "fa622bd314835eb026b776af471344d0dba94705c937900656a31d0407e53689"
[[package]]
name = "ciborium"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
dependencies = [
"ciborium-io",
"ciborium-ll",
"serde",
]
[[package]]
name = "ciborium-io"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
[[package]]
name = "ciborium-ll"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
dependencies = [
"ciborium-io",
"half",
]
[[package]] [[package]]
name = "clap" name = "clap"
version = "3.2.25" version = "3.2.25"
@@ -702,6 +729,12 @@ dependencies = [
"cfg-if", "cfg-if",
] ]
[[package]]
name = "crunchy"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]] [[package]]
name = "crypto-common" name = "crypto-common"
version = "0.1.6" version = "0.1.6"
@@ -1206,9 +1239,13 @@ dependencies = [
[[package]] [[package]]
name = "half" name = "half"
version = "1.8.2" version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872"
dependencies = [
"cfg-if",
"crunchy",
]
[[package]] [[package]]
name = "hashbrown" name = "hashbrown"
@@ -1664,11 +1701,12 @@ dependencies = [
[[package]] [[package]]
name = "lightning-storage-server" name = "lightning-storage-server"
version = "0.3.0" version = "0.3.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=a28153e0f1b6598e6538d32b3c5bfb9c7657d565#a28153e0f1b6598e6538d32b3c5bfb9c7657d565" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
"bitcoin_hashes", "bitcoin_hashes",
"ciborium",
"clap 3.2.25", "clap 3.2.25",
"ctrlc", "ctrlc",
"deadpool-postgres", "deadpool-postgres",
@@ -1682,7 +1720,6 @@ dependencies = [
"redb", "redb",
"secp256k1", "secp256k1",
"serde", "serde",
"serde_cbor",
"thiserror", "thiserror",
"time", "time",
"tokio", "tokio",
@@ -1758,7 +1795,7 @@ dependencies = [
[[package]] [[package]]
name = "lss-connector" name = "lss-connector"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs?rev=b461de86bdd8945254f38410902908f4c798da57#b461de86bdd8945254f38410902908f4c798da57" source = "git+https://github.com/stakwork/sphinx-rs?rev=83f6718de0be1a5ef044779253b06770537b4622#83f6718de0be1a5ef044779253b06770537b4622"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"lightning-storage-server", "lightning-storage-server",
@@ -2760,7 +2797,7 @@ dependencies = [
[[package]] [[package]]
name = "rmp-utils" name = "rmp-utils"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs?rev=b461de86bdd8945254f38410902908f4c798da57#b461de86bdd8945254f38410902908f4c798da57" source = "git+https://github.com/stakwork/sphinx-rs?rev=83f6718de0be1a5ef044779253b06770537b4622#83f6718de0be1a5ef044779253b06770537b4622"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"log", "log",
@@ -3117,16 +3154,6 @@ dependencies = [
"hex", "hex",
] ]
[[package]]
name = "serde_cbor"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
dependencies = [
"half",
"serde",
]
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.193" version = "1.0.193"
@@ -3182,9 +3209,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_with" name = "serde_with"
version = "3.4.0" version = "3.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" checksum = "1b0ed1662c5a68664f45b76d18deb0e234aff37207086803165c961eb695e981"
dependencies = [ dependencies = [
"base64 0.21.5", "base64 0.21.5",
"chrono", "chrono",
@@ -3197,9 +3224,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_with_macros" name = "serde_with_macros"
version = "3.4.0" version = "3.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" checksum = "568577ff0ef47b879f736cd66740e022f3672788cdf002a05a4e609ea5a6fb15"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
@@ -3339,7 +3366,7 @@ dependencies = [
[[package]] [[package]]
name = "sphinx-auther" name = "sphinx-auther"
version = "0.1.12" version = "0.1.12"
source = "git+https://github.com/stakwork/sphinx-rs?rev=b461de86bdd8945254f38410902908f4c798da57#b461de86bdd8945254f38410902908f4c798da57" source = "git+https://github.com/stakwork/sphinx-rs?rev=83f6718de0be1a5ef044779253b06770537b4622#83f6718de0be1a5ef044779253b06770537b4622"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64 0.21.5", "base64 0.21.5",
@@ -3351,7 +3378,7 @@ dependencies = [
[[package]] [[package]]
name = "sphinx-glyph" name = "sphinx-glyph"
version = "0.1.2" version = "0.1.2"
source = "git+https://github.com/stakwork/sphinx-rs?rev=b461de86bdd8945254f38410902908f4c798da57#b461de86bdd8945254f38410902908f4c798da57" source = "git+https://github.com/stakwork/sphinx-rs?rev=83f6718de0be1a5ef044779253b06770537b4622#83f6718de0be1a5ef044779253b06770537b4622"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"hex", "hex",
@@ -3394,7 +3421,7 @@ dependencies = [
[[package]] [[package]]
name = "sphinx-signer" name = "sphinx-signer"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs?rev=b461de86bdd8945254f38410902908f4c798da57#b461de86bdd8945254f38410902908f4c798da57" source = "git+https://github.com/stakwork/sphinx-rs?rev=83f6718de0be1a5ef044779253b06770537b4622#83f6718de0be1a5ef044779253b06770537b4622"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bip39", "bip39",
@@ -3403,6 +3430,7 @@ dependencies = [
"log", "log",
"lss-connector", "lss-connector",
"rand", "rand",
"rmp-serde",
"serde", "serde",
"sphinx-glyph", "sphinx-glyph",
"thiserror", "thiserror",
@@ -4100,7 +4128,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]] [[package]]
name = "vls-core" name = "vls-core"
version = "0.11.0-rc.1" version = "0.11.0-rc.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=a28153e0f1b6598e6538d32b3c5bfb9c7657d565#a28153e0f1b6598e6538d32b3c5bfb9c7657d565" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"backtrace", "backtrace",
@@ -4126,7 +4154,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-frontend" name = "vls-frontend"
version = "0.11.0-rc.1" version = "0.11.0-rc.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=a28153e0f1b6598e6538d32b3c5bfb9c7657d565#a28153e0f1b6598e6538d32b3c5bfb9c7657d565" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"lightning-storage-server", "lightning-storage-server",
@@ -4141,7 +4169,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-persist" name = "vls-persist"
version = "0.11.0-rc.1" version = "0.11.0-rc.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=a28153e0f1b6598e6538d32b3c5bfb9c7657d565#a28153e0f1b6598e6538d32b3c5bfb9c7657d565" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"hex", "hex",
"log", "log",
@@ -4156,7 +4184,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-protocol" name = "vls-protocol"
version = "0.11.0-rc.1" version = "0.11.0-rc.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=a28153e0f1b6598e6538d32b3c5bfb9c7657d565#a28153e0f1b6598e6538d32b3c5bfb9c7657d565" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"as-any", "as-any",
"bitcoin-consensus-derive", "bitcoin-consensus-derive",
@@ -4170,7 +4198,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-protocol-client" name = "vls-protocol-client"
version = "0.11.0-rc.1" version = "0.11.0-rc.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=a28153e0f1b6598e6538d32b3c5bfb9c7657d565#a28153e0f1b6598e6538d32b3c5bfb9c7657d565" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@@ -4185,7 +4213,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-protocol-signer" name = "vls-protocol-signer"
version = "0.11.0-rc.1" version = "0.11.0-rc.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=a28153e0f1b6598e6538d32b3c5bfb9c7657d565#a28153e0f1b6598e6538d32b3c5bfb9c7657d565" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"bit-vec", "bit-vec",
"log", "log",
@@ -4196,7 +4224,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-proxy" name = "vls-proxy"
version = "0.11.0-rc.1" version = "0.11.0-rc.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=a28153e0f1b6598e6538d32b3c5bfb9c7657d565#a28153e0f1b6598e6538d32b3c5bfb9c7657d565" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"as-any", "as-any",

12
broker/Cargo.toml
View File

@@ -27,17 +27,17 @@ toml = "0.5.9"
triggered = "0.1.2" triggered = "0.1.2"
url = { version = "2.2" } url = { version = "2.2" }
vls-frontend = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "a28153e0f1b6598e6538d32b3c5bfb9c7657d565" } vls-frontend = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "6672ee99904c59e635a2f96b06339b9ce656af12" }
vls-protocol = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "a28153e0f1b6598e6538d32b3c5bfb9c7657d565" } vls-protocol = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "6672ee99904c59e635a2f96b06339b9ce656af12" }
vls-protocol-client = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "a28153e0f1b6598e6538d32b3c5bfb9c7657d565" } vls-protocol-client = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "6672ee99904c59e635a2f96b06339b9ce656af12" }
vls-proxy = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "a28153e0f1b6598e6538d32b3c5bfb9c7657d565" } vls-proxy = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "6672ee99904c59e635a2f96b06339b9ce656af12" }
# vls-frontend = { path = "../../vls/vls-frontend" } # vls-frontend = { path = "../../vls/vls-frontend" }
# vls-protocol = { path = "../../vls/vls-protocol" } # vls-protocol = { path = "../../vls/vls-protocol" }
# vls-protocol-client = { path = "../../vls/vls-protocol-client" } # vls-protocol-client = { path = "../../vls/vls-protocol-client" }
# vls-proxy = { path = "../../vls/vls-proxy" } # vls-proxy = { path = "../../vls/vls-proxy" }
lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "b461de86bdd8945254f38410902908f4c798da57" } lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "83f6718de0be1a5ef044779253b06770537b4622" }
sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "b461de86bdd8945254f38410902908f4c798da57" } sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "83f6718de0be1a5ef044779253b06770537b4622" }
# lss-connector = { path = "../../sphinx-rs/lss-connector" } # lss-connector = { path = "../../sphinx-rs/lss-connector" }
# sphinx-signer = { path = "../../sphinx-rs/signer" } # sphinx-signer = { path = "../../sphinx-rs/signer" }

3
broker/src/chain_tracker.rs
View File

@@ -24,8 +24,7 @@ impl SignerPort for MqttSignerPort {
fn is_ready(&self) -> bool { fn is_ready(&self) -> bool {
let (cid, is_synced) = current_client_and_synced(); let (cid, is_synced) = current_client_and_synced();
let ret = cid.is_some() && is_synced; cid.is_some() && is_synced
ret
} }
} }

24
broker/src/looper.rs
View File

@@ -1,5 +1,3 @@
use crate::bitcoin::blockdata::constants::ChainHash;
use crate::bitcoin::Network;
use crate::conn::{ChannelRequest, LssReq}; use crate::conn::{ChannelRequest, LssReq};
use crate::handle::handle_message; use crate::handle::handle_message;
use crate::secp256k1::PublicKey; use crate::secp256k1::PublicKey;
@@ -77,16 +75,16 @@ impl<C: 'static + Client> SignerLoop<C> {
} }
/// Start the read loop /// Start the read loop
pub fn start(&mut self, network: Option<Network>) { pub fn start(&mut self) {
info!("loop {}: start", self.log_prefix); info!("loop {}: start", self.log_prefix);
match self.do_loop(network) { match self.do_loop() {
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, network: Option<Network>) -> Result<()> { fn do_loop(&mut self) -> 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);
@@ -108,7 +106,7 @@ impl<C: 'static + Client> SignerLoop<C> {
self.vls_tx.clone(), self.vls_tx.clone(),
client_id, client_id,
); );
thread::spawn(move || new_loop.start(None)); thread::spawn(move || new_loop.start());
} }
Message::Memleak(_) => { Message::Memleak(_) => {
// info!("Memleak"); // info!("Memleak");
@@ -116,16 +114,8 @@ impl<C: 'static + Client> SignerLoop<C> {
self.client.write(reply)?; self.client.write(reply)?;
} }
msg => { msg => {
if let Message::HsmdInit(ref m) = msg { if let Message::HsmdInit(ref _m) = msg {
if let Some(net) = network { panic!("HsmdInit should have been handled already!");
if ChainHash::using_genesis_block(net).as_bytes()
!= m.chain_params.as_ref()
{
panic!("The network settings of CLN and broker don't match!");
}
} else {
log::error!("No Network provided");
}
} }
// check if we got the same preapprove message less than PREAPPROVE_CACHE_TTL seconds ago // check if we got the same preapprove message less than PREAPPROVE_CACHE_TTL seconds ago
if let Message::PreapproveInvoice(_) | Message::PreapproveKeysend(_) = msg { if let Message::PreapproveInvoice(_) | Message::PreapproveKeysend(_) = msg {
@@ -296,6 +286,8 @@ fn vls_cmd(msg: &Message) -> String {
Message::LockOutpointReply(_) => "LockOutpointReply", Message::LockOutpointReply(_) => "LockOutpointReply",
Message::ForgetChannel(_) => "ForgetChannel", Message::ForgetChannel(_) => "ForgetChannel",
Message::ForgetChannelReply(_) => "ForgetChannelReply", Message::ForgetChannelReply(_) => "ForgetChannelReply",
Message::RevokeCommitmentTx(_) => "RevokeCommitmentTx",
Message::RevokeCommitmentTxReply(_) => "RevokeCommitmentTxReply",
}; };
m.to_string() m.to_string()
} }

71
broker/src/lss.rs
View File

@@ -4,29 +4,43 @@ use lss_connector::{InitResponse, LssBroker, Response, SignerMutations};
use rocket::tokio; use rocket::tokio;
use rumqttd::oneshot; use rumqttd::oneshot;
use rumqttd::oneshot as std_oneshot; use rumqttd::oneshot as std_oneshot;
use sphinx_signer::parser;
use sphinx_signer::sphinx_glyph::topics; use sphinx_signer::sphinx_glyph::topics;
use tokio::sync::mpsc; use tokio::sync::mpsc;
use vls_protocol::msgs::{self, Message, SerBolt};
use vls_proxy::client::{Client, UnixClient};
pub fn lss_tasks( pub fn lss_tasks(
uri: String, uri: String,
lss_rx: mpsc::Receiver<LssReq>, lss_rx: mpsc::Receiver<LssReq>,
mut conn_rx: mpsc::Receiver<(String, oneshot::Sender<bool>)>, mut conn_rx: mpsc::Receiver<(String, oneshot::Sender<bool>)>,
init_tx: mpsc::Sender<ChannelRequest>, init_tx: mpsc::Sender<ChannelRequest>,
mut cln_client: UnixClient,
mut hsmd_raw: Vec<u8>,
) { ) {
tokio::task::spawn(async move { tokio::task::spawn(async move {
// first connection - initializes lssbroker // first connection - initializes lssbroker
let lss_conn = loop { let (lss_conn, hsmd_init_reply) = loop {
let (cid, dance_complete_tx) = conn_rx.recv().await.unwrap(); let (cid, dance_complete_tx) = conn_rx.recv().await.unwrap();
match try_dance(&cid, &uri, None, &init_tx, dance_complete_tx).await { match try_dance(&cid, &uri, None, &init_tx, dance_complete_tx, &mut hsmd_raw).await {
Some(broker) => break broker, Some(ret) => break ret,
None => log::warn!("broker not initialized, try connecting again..."), None => log::warn!("broker not initialized, try connecting again..."),
} }
}; };
cln_client.write_vec(hsmd_init_reply).unwrap();
spawn_lss_rx(lss_conn.clone(), lss_rx); spawn_lss_rx(lss_conn.clone(), lss_rx);
// connect handler for all subsequent connections // connect handler for all subsequent connections
while let Some((cid, dance_complete_tx)) = conn_rx.recv().await { while let Some((cid, dance_complete_tx)) = conn_rx.recv().await {
log::info!("CLIENT {} connected!", cid); log::info!("CLIENT {} connected!", cid);
let _ = try_dance(&cid, &uri, Some(&lss_conn), &init_tx, dance_complete_tx).await; let _ = try_dance(
&cid,
&uri,
Some(&lss_conn),
&init_tx,
dance_complete_tx,
&mut hsmd_raw,
)
.await;
} }
}); });
} }
@@ -52,12 +66,13 @@ async fn try_dance(
lss_conn: Option<&LssBroker>, lss_conn: Option<&LssBroker>,
init_tx: &mpsc::Sender<ChannelRequest>, init_tx: &mpsc::Sender<ChannelRequest>,
dance_complete_tx: std_oneshot::Sender<bool>, dance_complete_tx: std_oneshot::Sender<bool>,
) -> Option<LssBroker> { hsmd_raw: &mut Vec<u8>,
match connect_dance(cid, uri, lss_conn, init_tx).await { ) -> Option<(LssBroker, Vec<u8>)> {
Ok(broker) => { match connect_dance(cid, uri, lss_conn, init_tx, hsmd_raw).await {
Ok(ret) => {
let _ = dance_complete_tx.send(true); let _ = dance_complete_tx.send(true);
// none if lss_conn is some, some otherwise // none if lss_conn is some, some otherwise
broker ret
} }
Err(e) => { Err(e) => {
log::warn!("connect_dance failed: {:?}", e); log::warn!("connect_dance failed: {:?}", e);
@@ -70,16 +85,18 @@ async fn try_dance(
async fn connect_dance( async fn connect_dance(
cid: &str, cid: &str,
uri: &str, uri: &str,
lss_conn: Option<&LssBroker>, lss_conn_opt: Option<&LssBroker>,
mqtt_tx: &mpsc::Sender<ChannelRequest>, mqtt_tx: &mpsc::Sender<ChannelRequest>,
) -> Result<Option<LssBroker>> { hsmd_raw: &mut Vec<u8>,
let (new_broker, ir) = dance_step_1(cid, uri, lss_conn, mqtt_tx).await?; ) -> Result<Option<(LssBroker, Vec<u8>)>> {
let lss_conn = new_broker.as_ref().xor(lss_conn).ok_or(anyhow!( let (new_broker, ir) = dance_step_1(cid, uri, lss_conn_opt, mqtt_tx).await?;
let lss_conn = new_broker.as_ref().xor(lss_conn_opt).ok_or(anyhow!(
"should never happen, either we use the newly initialized, or the one passed in" "should never happen, either we use the newly initialized, or the one passed in"
))?; ))?;
dance_step_2(cid, lss_conn, mqtt_tx, &ir).await?; dance_step_2(cid, lss_conn, mqtt_tx, &ir).await?;
// only some when lss_conn is none let hsmd_init_reply = dance_step_3(cid, mqtt_tx, hsmd_raw).await?;
Ok(new_broker) // only some when lss_conn_opt is none
Ok(new_broker.map(|broker| (broker, hsmd_init_reply)))
} }
// initializes a new broker in case lss_conn is none // initializes a new broker in case lss_conn is none
@@ -116,6 +133,32 @@ async fn dance_step_2(
Ok(()) Ok(())
} }
async fn dance_step_3(
cid: &str,
mqtt_tx: &mpsc::Sender<ChannelRequest>,
hsmd_raw: &mut Vec<u8>,
) -> Result<Vec<u8>> {
let Message::HsmdInit(mut hsmd_init) = msgs::from_vec(hsmd_raw.clone()).unwrap() else {
panic!("Expected a hsmd init message here")
};
let hsmd_init_bytes = parser::raw_request_from_bytes(hsmd_raw.clone(), 0, [0u8; 33], 0)?;
let reply = ChannelRequest::send(cid, topics::INIT_3_MSG, hsmd_init_bytes, mqtt_tx).await?;
if reply.is_empty() {
return Err(anyhow!("Hsmd init failed !"));
}
let hsmd_init_reply = parser::raw_response_from_bytes(reply, 0).unwrap();
// this match is a noop after the first pass
match msgs::from_vec(hsmd_init_reply.clone()) {
Ok(Message::HsmdInitReplyV4(hir)) => {
hsmd_init.hsm_wire_max_version = hir.hsm_version;
hsmd_init.hsm_wire_min_version = hir.hsm_version;
*hsmd_raw = hsmd_init.as_vec();
}
_ => panic!("Not a hsmd init reply v4"),
};
Ok(hsmd_init_reply)
}
async fn send_init( async fn send_init(
cid: &str, cid: &str,
msg_bytes: Vec<u8>, msg_bytes: Vec<u8>,

17
broker/src/main.rs
View File

@@ -11,6 +11,7 @@ mod util;
pub(crate) use sphinx_signer::lightning_signer::bitcoin::{self, secp256k1}; pub(crate) use sphinx_signer::lightning_signer::bitcoin::{self, secp256k1};
use crate::bitcoin::blockdata::constants::ChainHash;
use crate::chain_tracker::MqttSignerPort; use crate::chain_tracker::MqttSignerPort;
use crate::conn::{conns_set_pubkey, current_pubkey, new_connection, ChannelRequest, LssReq}; use crate::conn::{conns_set_pubkey, current_pubkey, new_connection, ChannelRequest, LssReq};
use crate::looper::SignerLoop; use crate::looper::SignerLoop;
@@ -26,7 +27,8 @@ use std::env;
use std::sync::Arc; use std::sync::Arc;
use url::Url; use url::Url;
use vls_frontend::{frontend::SourceFactory, Frontend}; use vls_frontend::{frontend::SourceFactory, Frontend};
use vls_proxy::client::UnixClient; use vls_protocol::{msgs, msgs::Message};
use vls_proxy::client::{Client, UnixClient};
use vls_proxy::connection::{open_parent_fd, UnixConnection}; use vls_proxy::connection::{open_parent_fd, UnixConnection};
use vls_proxy::portfront::SignerPortFront; use vls_proxy::portfront::SignerPortFront;
use vls_proxy::util::{add_hsmd_args, handle_hsmd_version}; use vls_proxy::util::{add_hsmd_args, handle_hsmd_version};
@@ -78,11 +80,20 @@ fn run_main(parent_fd: i32) -> rocket::Rocket<rocket::Build> {
broker_setup(settings, mqtt_rx, init_rx, conn_tx, error_tx.clone()); broker_setup(settings, mqtt_rx, init_rx, conn_tx, error_tx.clone());
let mut cln_client_a = UnixClient::new(UnixConnection::new(parent_fd));
let hsmd_raw = cln_client_a.read_raw().unwrap();
let msg = msgs::from_vec(hsmd_raw.clone()).unwrap();
let Message::HsmdInit(ref m) = msg else {
panic!("Expected a hsmd init message first");
};
if ChainHash::using_genesis_block(settings.network).as_bytes() != m.chain_params.as_ref() {
panic!("The network settings of CLN and broker don't match!");
}
let (lss_tx, lss_rx) = mpsc::channel::<LssReq>(10000); let (lss_tx, lss_rx) = mpsc::channel::<LssReq>(10000);
// TODO: add a validation here of the uri setting to make sure LSS is running // TODO: add a validation here of the uri setting to make sure LSS is running
if let Ok(lss_uri) = env::var("VLS_LSS") { if let Ok(lss_uri) = env::var("VLS_LSS") {
log::info!("Spawning lss tasks..."); log::info!("Spawning lss tasks...");
lss::lss_tasks(lss_uri, lss_rx, conn_rx, init_tx); lss::lss_tasks(lss_uri, lss_rx, conn_rx, init_tx, cln_client_a, hsmd_raw);
} else { } else {
log::warn!("running without LSS"); log::warn!("running without LSS");
} }
@@ -115,7 +126,7 @@ fn run_main(parent_fd: i32) -> rocket::Rocket<rocket::Build> {
let mut signer_loop = SignerLoop::new(cln_client, mqtt_tx.clone(), lss_tx); let mut signer_loop = SignerLoop::new(cln_client, mqtt_tx.clone(), lss_tx);
// spawn CLN listener // spawn CLN listener
std::thread::spawn(move || { std::thread::spawn(move || {
signer_loop.start(Some(settings.network)); signer_loop.start();
}); });
routes::launch_rocket(mqtt_tx, error_tx, settings) routes::launch_rocket(mqtt_tx, error_tx, settings)

5
broker/src/mqtt.rs
View File

@@ -110,7 +110,10 @@ pub fn start_broker(
} else { } else {
// VLS, CONTROL, LSS // VLS, CONTROL, LSS
let pld = f.publish.payload.to_vec(); let pld = f.publish.payload.to_vec();
if topic_end == topics::INIT_1_RES || topic_end == topics::INIT_2_RES { if topic_end == topics::INIT_1_RES
|| topic_end == topics::INIT_2_RES
|| topic_end == topics::INIT_3_RES
{
if let Err(e) = init_tx.send((cid, topic_end, pld)) { if let Err(e) = init_tx.send((cid, topic_end, pld)) {
log::error!("failed to pub to init_tx! {:?}", e); log::error!("failed to pub to init_tx! {:?}", e);
} }

30
sphinx-key/Cargo.lock generated
View File

@@ -237,7 +237,7 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]] [[package]]
name = "bolt-derive" name = "bolt-derive"
version = "0.2.0" version = "0.2.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=753024b51bf681695490eff76888a4d63241fd7c#753024b51bf681695490eff76888a4d63241fd7c" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -1156,7 +1156,7 @@ checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
[[package]] [[package]]
name = "lss-connector" name = "lss-connector"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=437728607bce0288908fc8979936a850e52560b7#437728607bce0288908fc8979936a850e52560b7" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=83f6718de0be1a5ef044779253b06770537b4622#83f6718de0be1a5ef044779253b06770537b4622"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"log", "log",
@@ -1513,7 +1513,7 @@ dependencies = [
[[package]] [[package]]
name = "rmp-utils" name = "rmp-utils"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=437728607bce0288908fc8979936a850e52560b7#437728607bce0288908fc8979936a850e52560b7" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=83f6718de0be1a5ef044779253b06770537b4622#83f6718de0be1a5ef044779253b06770537b4622"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"log", "log",
@@ -1669,9 +1669,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_with" name = "serde_with"
version = "3.3.0" version = "3.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" checksum = "1b0ed1662c5a68664f45b76d18deb0e234aff37207086803165c961eb695e981"
dependencies = [ dependencies = [
"base64", "base64",
"chrono", "chrono",
@@ -1684,9 +1684,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_with_macros" name = "serde_with_macros"
version = "3.3.0" version = "3.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" checksum = "568577ff0ef47b879f736cd66740e022f3672788cdf002a05a4e609ea5a6fb15"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
@@ -1703,7 +1703,7 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
[[package]] [[package]]
name = "sphinx-auther" name = "sphinx-auther"
version = "0.1.12" version = "0.1.12"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=437728607bce0288908fc8979936a850e52560b7#437728607bce0288908fc8979936a850e52560b7" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=83f6718de0be1a5ef044779253b06770537b4622#83f6718de0be1a5ef044779253b06770537b4622"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64", "base64",
@@ -1715,7 +1715,7 @@ dependencies = [
[[package]] [[package]]
name = "sphinx-crypter" name = "sphinx-crypter"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=437728607bce0288908fc8979936a850e52560b7#437728607bce0288908fc8979936a850e52560b7" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=83f6718de0be1a5ef044779253b06770537b4622#83f6718de0be1a5ef044779253b06770537b4622"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chacha20poly1305", "chacha20poly1305",
@@ -1726,7 +1726,7 @@ dependencies = [
[[package]] [[package]]
name = "sphinx-glyph" name = "sphinx-glyph"
version = "0.1.2" version = "0.1.2"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=437728607bce0288908fc8979936a850e52560b7#437728607bce0288908fc8979936a850e52560b7" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=83f6718de0be1a5ef044779253b06770537b4622#83f6718de0be1a5ef044779253b06770537b4622"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"hex", "hex",
@@ -1758,7 +1758,7 @@ dependencies = [
[[package]] [[package]]
name = "sphinx-signer" name = "sphinx-signer"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=437728607bce0288908fc8979936a850e52560b7#437728607bce0288908fc8979936a850e52560b7" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=83f6718de0be1a5ef044779253b06770537b4622#83f6718de0be1a5ef044779253b06770537b4622"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bip39", "bip39",
@@ -2010,7 +2010,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]] [[package]]
name = "vls-core" name = "vls-core"
version = "0.11.0-rc.1" version = "0.11.0-rc.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=753024b51bf681695490eff76888a4d63241fd7c#753024b51bf681695490eff76888a4d63241fd7c" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bitcoin", "bitcoin",
@@ -2034,7 +2034,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-persist" name = "vls-persist"
version = "0.11.0-rc.1" version = "0.11.0-rc.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=753024b51bf681695490eff76888a4d63241fd7c#753024b51bf681695490eff76888a4d63241fd7c" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"hex", "hex",
"log", "log",
@@ -2047,7 +2047,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-protocol" name = "vls-protocol"
version = "0.11.0-rc.1" version = "0.11.0-rc.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=753024b51bf681695490eff76888a4d63241fd7c#753024b51bf681695490eff76888a4d63241fd7c" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"as-any", "as-any",
"bitcoin-consensus-derive", "bitcoin-consensus-derive",
@@ -2061,7 +2061,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-protocol-signer" name = "vls-protocol-signer"
version = "0.11.0-rc.1" version = "0.11.0-rc.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=753024b51bf681695490eff76888a4d63241fd7c#753024b51bf681695490eff76888a4d63241fd7c" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"bit-vec", "bit-vec",
"log", "log",

6
sphinx-key/Cargo.toml
View File

@@ -25,9 +25,9 @@ serde_json = { version = "1.0.81", default-features = false }
serde_urlencoded = "0.7.1" serde_urlencoded = "0.7.1"
# sphinx-rs # sphinx-rs
lss-connector = { git = "https://github.com/stakwork/sphinx-rs.git", default-features = false, rev = "437728607bce0288908fc8979936a850e52560b7" } lss-connector = { git = "https://github.com/stakwork/sphinx-rs.git", default-features = false, rev = "83f6718de0be1a5ef044779253b06770537b4622" }
sphinx-crypter = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "437728607bce0288908fc8979936a850e52560b7" } sphinx-crypter = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "83f6718de0be1a5ef044779253b06770537b4622" }
sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", optional = true, rev = "437728607bce0288908fc8979936a850e52560b7" } sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", optional = true, rev = "83f6718de0be1a5ef044779253b06770537b4622" }
# local # local
# lss-connector = { path = "../../sphinx-rs/lss-connector", default-features = false } # lss-connector = { path = "../../sphinx-rs/lss-connector", default-features = false }
# sphinx-crypter = { path = "../../sphinx-rs/crypter" } # sphinx-crypter = { path = "../../sphinx-rs/crypter" }

1
sphinx-key/src/conn/mqtt.rs
View File

@@ -109,6 +109,7 @@ pub fn make_client(
} else if topic.ends_with(topics::LSS_MSG) } else if topic.ends_with(topics::LSS_MSG)
|| topic.ends_with(topics::INIT_1_MSG) || topic.ends_with(topics::INIT_1_MSG)
|| topic.ends_with(topics::INIT_2_MSG) || topic.ends_with(topics::INIT_2_MSG)
|| topic.ends_with(topics::INIT_3_MSG)
|| topic.ends_with(topics::LSS_CONFLICT) || topic.ends_with(topics::LSS_CONFLICT)
{ {
log::debug!("received data len {}", data.len()); log::debug!("received data len {}", data.len());

9
sphinx-key/src/core/events.rs
View File

@@ -11,11 +11,12 @@ use glyph::ser::{serialize_controlresponse, ByteBuf};
use glyph::topics; use glyph::topics;
use lss_connector::secp256k1::PublicKey; use lss_connector::secp256k1::PublicKey;
use sphinx_signer::approver::SphinxApprover; use sphinx_signer::approver::SphinxApprover;
use sphinx_signer::kvv::{CloudKVVStore, FsKVVStore, KVVPersister, RmpFormat}; use sphinx_signer::kvv::{fs::FsKVVStore, CloudKVVStore, KVVPersister, RmpFormat};
// use sphinx_signer::kvv::{JsonFormat, MemoryKVVStore};
use sphinx_signer::lightning_signer::persist::Persist; use sphinx_signer::lightning_signer::persist::Persist;
use sphinx_signer::root::VlsHandlerError; use sphinx_signer::root::VlsHandlerError;
use sphinx_signer::sphinx_glyph as glyph; use sphinx_signer::sphinx_glyph as glyph;
use sphinx_signer::{self, Handler, RootHandler}; use sphinx_signer::{self, Handler, RootHandler, WarningPositiveApprover};
use std::sync::mpsc; use std::sync::mpsc;
use std::sync::Arc; use std::sync::Arc;
use std::thread; use std::thread;
@@ -86,6 +87,7 @@ pub fn make_event_loop(
} }
let kvv_store = FsKVVStore::new(ROOT_STORE, *signer_id, None); let kvv_store = FsKVVStore::new(ROOT_STORE, *signer_id, None);
//let kvv_store = MemoryKVVStore::new([0xcc; 16]);
let fs_persister = KVVPersister(CloudKVVStore::new(kvv_store), RmpFormat); let fs_persister = KVVPersister(CloudKVVStore::new(kvv_store), RmpFormat);
let _ = fs_persister.enter(); let _ = fs_persister.enter();
@@ -111,7 +113,7 @@ pub fn make_event_loop(
let persister = Arc::new(fs_persister); let persister = Arc::new(fs_persister);
// initialize the RootHandler // initialize the RootHandler
let (rhb, approver) = sphinx_signer::root::builder( let (mut rhb, approver) = sphinx_signer::root::builder(
seed, seed,
network, network,
policy.clone(), policy.clone(),
@@ -120,6 +122,7 @@ pub fn make_event_loop(
persister, persister,
) )
.expect("failed to init signer"); .expect("failed to init signer");
rhb = rhb.approver(Arc::new(WarningPositiveApprover()));
thread::sleep(std::time::Duration::from_secs(1)); thread::sleep(std::time::Duration::from_secs(1));
// send the initial HELLO // send the initial HELLO

19
sphinx-key/src/core/lss.rs
View File

@@ -7,7 +7,7 @@ use esp_idf_svc::mqtt::client::MessageImpl;
use esp_idf_svc::sys::EspError; use esp_idf_svc::sys::EspError;
use lss_connector::{secp256k1::PublicKey, BrokerMutations, LssSigner, Msg as LssMsg}; use lss_connector::{secp256k1::PublicKey, BrokerMutations, LssSigner, Msg as LssMsg};
use sphinx_signer::sphinx_glyph::topics; use sphinx_signer::sphinx_glyph::topics;
use sphinx_signer::{self, RootHandler, RootHandlerBuilder}; use sphinx_signer::{self, HandlerBuilder, RootHandler};
use std::sync::mpsc; use std::sync::mpsc;
use std::time::Duration; use std::time::Duration;
@@ -16,7 +16,7 @@ pub use lss_connector::handle_lss_msg;
pub fn init_lss( pub fn init_lss(
signer_id: &[u8; 16], signer_id: &[u8; 16],
rx: &mpsc::Receiver<Event>, rx: &mpsc::Receiver<Event>,
handler_builder: RootHandlerBuilder, handler_builder: HandlerBuilder,
mqtt: &mut EspMqttClient<ConnState<MessageImpl, EspError>>, mqtt: &mut EspMqttClient<ConnState<MessageImpl, EspError>>,
) -> Result<(RootHandler, LssSigner)> { ) -> Result<(RootHandler, LssSigner)> {
let client_id = hex::encode(signer_id); let client_id = hex::encode(signer_id);
@@ -42,11 +42,24 @@ pub fn init_lss(
} }
}; };
let (root_handler, res2) = lss_signer.build_with_lss(created, handler_builder, None)?; let (mut init_handler, res2) = lss_signer.build_with_lss(created, handler_builder, None)?;
let lss_res_2_topic = format!("{}/{}", client_id, topics::INIT_2_RES); let lss_res_2_topic = format!("{}/{}", client_id, topics::INIT_2_RES);
mqtt.publish(&lss_res_2_topic, QOS, false, &res2) mqtt.publish(&lss_res_2_topic, QOS, false, &res2)
.expect("could not publish LSS response 2"); .expect("could not publish LSS response 2");
let hsmd_init_bytes = loop {
match rx.recv_timeout(Duration::from_secs(30))? {
Event::LssMessage(hib) => break hib,
_ => log::warn!("not an LSS message"),
}
};
let (res3, init, _cmd) =
sphinx_signer::root::handle_init(&mut init_handler, hsmd_init_bytes, false).unwrap();
let lss_res_3_topic = format!("{}/{}", client_id, topics::INIT_3_RES);
mqtt.publish(&lss_res_3_topic, QOS, false, &res3)
.expect("could not publish LSS response 3");
assert!(init);
let root_handler = init_handler.into_root_handler();
Ok((root_handler, lss_signer)) Ok((root_handler, lss_signer))
} }

31
tester/Cargo.lock generated
View File

@@ -255,7 +255,7 @@ checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
[[package]] [[package]]
name = "bolt-derive" name = "bolt-derive"
version = "0.2.0" version = "0.2.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=a28153e0f1b6598e6538d32b3c5bfb9c7657d565#a28153e0f1b6598e6538d32b3c5bfb9c7657d565" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -1120,7 +1120,7 @@ dependencies = [
[[package]] [[package]]
name = "lss-connector" name = "lss-connector"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=b461de86bdd8945254f38410902908f4c798da57#b461de86bdd8945254f38410902908f4c798da57" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=83f6718de0be1a5ef044779253b06770537b4622#83f6718de0be1a5ef044779253b06770537b4622"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"log", "log",
@@ -1692,7 +1692,7 @@ dependencies = [
[[package]] [[package]]
name = "rmp-utils" name = "rmp-utils"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=b461de86bdd8945254f38410902908f4c798da57#b461de86bdd8945254f38410902908f4c798da57" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=83f6718de0be1a5ef044779253b06770537b4622#83f6718de0be1a5ef044779253b06770537b4622"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"log", "log",
@@ -2005,9 +2005,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_with" name = "serde_with"
version = "3.4.0" version = "3.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" checksum = "1b0ed1662c5a68664f45b76d18deb0e234aff37207086803165c961eb695e981"
dependencies = [ dependencies = [
"base64 0.21.5", "base64 0.21.5",
"chrono", "chrono",
@@ -2020,9 +2020,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_with_macros" name = "serde_with_macros"
version = "3.4.0" version = "3.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" checksum = "568577ff0ef47b879f736cd66740e022f3672788cdf002a05a4e609ea5a6fb15"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
@@ -2086,7 +2086,7 @@ dependencies = [
[[package]] [[package]]
name = "sphinx-auther" name = "sphinx-auther"
version = "0.1.12" version = "0.1.12"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=b461de86bdd8945254f38410902908f4c798da57#b461de86bdd8945254f38410902908f4c798da57" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=83f6718de0be1a5ef044779253b06770537b4622#83f6718de0be1a5ef044779253b06770537b4622"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64 0.21.5", "base64 0.21.5",
@@ -2098,7 +2098,7 @@ dependencies = [
[[package]] [[package]]
name = "sphinx-crypter" name = "sphinx-crypter"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=b461de86bdd8945254f38410902908f4c798da57#b461de86bdd8945254f38410902908f4c798da57" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=83f6718de0be1a5ef044779253b06770537b4622#83f6718de0be1a5ef044779253b06770537b4622"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chacha20poly1305", "chacha20poly1305",
@@ -2109,7 +2109,7 @@ dependencies = [
[[package]] [[package]]
name = "sphinx-glyph" name = "sphinx-glyph"
version = "0.1.2" version = "0.1.2"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=b461de86bdd8945254f38410902908f4c798da57#b461de86bdd8945254f38410902908f4c798da57" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=83f6718de0be1a5ef044779253b06770537b4622#83f6718de0be1a5ef044779253b06770537b4622"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"hex", "hex",
@@ -2147,7 +2147,7 @@ dependencies = [
[[package]] [[package]]
name = "sphinx-signer" name = "sphinx-signer"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=b461de86bdd8945254f38410902908f4c798da57#b461de86bdd8945254f38410902908f4c798da57" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=83f6718de0be1a5ef044779253b06770537b4622#83f6718de0be1a5ef044779253b06770537b4622"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bip39", "bip39",
@@ -2156,6 +2156,7 @@ dependencies = [
"log", "log",
"lss-connector", "lss-connector",
"rand", "rand",
"rmp-serde",
"serde", "serde",
"sphinx-glyph", "sphinx-glyph",
"thiserror", "thiserror",
@@ -2687,7 +2688,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]] [[package]]
name = "vls-core" name = "vls-core"
version = "0.11.0-rc.1" version = "0.11.0-rc.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=a28153e0f1b6598e6538d32b3c5bfb9c7657d565#a28153e0f1b6598e6538d32b3c5bfb9c7657d565" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bitcoin", "bitcoin",
@@ -2711,7 +2712,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-persist" name = "vls-persist"
version = "0.11.0-rc.1" version = "0.11.0-rc.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=a28153e0f1b6598e6538d32b3c5bfb9c7657d565#a28153e0f1b6598e6538d32b3c5bfb9c7657d565" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"hex", "hex",
"log", "log",
@@ -2724,7 +2725,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-protocol" name = "vls-protocol"
version = "0.11.0-rc.1" version = "0.11.0-rc.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=a28153e0f1b6598e6538d32b3c5bfb9c7657d565#a28153e0f1b6598e6538d32b3c5bfb9c7657d565" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"as-any", "as-any",
"bitcoin-consensus-derive", "bitcoin-consensus-derive",
@@ -2738,7 +2739,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-protocol-signer" name = "vls-protocol-signer"
version = "0.11.0-rc.1" version = "0.11.0-rc.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=a28153e0f1b6598e6538d32b3c5bfb9c7657d565#a28153e0f1b6598e6538d32b3c5bfb9c7657d565" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=6672ee99904c59e635a2f96b06339b9ce656af12#6672ee99904c59e635a2f96b06339b9ce656af12"
dependencies = [ dependencies = [
"bit-vec", "bit-vec",
"log", "log",

4
tester/Cargo.toml
View File

@@ -23,8 +23,8 @@ serde_json = "1.0"
tokio = { version = "1.4.0", features = ["rt", "rt-multi-thread", "macros"] } tokio = { version = "1.4.0", features = ["rt", "rt-multi-thread", "macros"] }
urlencoding = "2.1.0" urlencoding = "2.1.0"
sphinx-crypter = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "b461de86bdd8945254f38410902908f4c798da57" } sphinx-crypter = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "83f6718de0be1a5ef044779253b06770537b4622" }
sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "b461de86bdd8945254f38410902908f4c798da57" } sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "83f6718de0be1a5ef044779253b06770537b4622" }
# sphinx-crypter = { path = "../../sphinx-rs/crypter" } # sphinx-crypter = { path = "../../sphinx-rs/crypter" }
# sphinx-signer = { path = "../../sphinx-rs/signer" } # sphinx-signer = { path = "../../sphinx-rs/signer" }