diff --git a/Cargo.lock b/Cargo.lock index c7c4e67..7a5466c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1213,7 +1213,7 @@ checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "lss-connector" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=4f8f9ee02814e17d7c3888cbef0addd6844c0fe7#4f8f9ee02814e17d7c3888cbef0addd6844c0fe7" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=9709ba23b49aca8d8ea09197c901913f44d5fa00#9709ba23b49aca8d8ea09197c901913f44d5fa00" dependencies = [ "anyhow", "log", @@ -1585,7 +1585,7 @@ dependencies = [ [[package]] name = "rmp-utils" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=4f8f9ee02814e17d7c3888cbef0addd6844c0fe7#4f8f9ee02814e17d7c3888cbef0addd6844c0fe7" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=9709ba23b49aca8d8ea09197c901913f44d5fa00#9709ba23b49aca8d8ea09197c901913f44d5fa00" dependencies = [ "anyhow", "log", @@ -1792,7 +1792,7 @@ dependencies = [ [[package]] name = "sphinx-auther" version = "0.1.12" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=4f8f9ee02814e17d7c3888cbef0addd6844c0fe7#4f8f9ee02814e17d7c3888cbef0addd6844c0fe7" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=9709ba23b49aca8d8ea09197c901913f44d5fa00#9709ba23b49aca8d8ea09197c901913f44d5fa00" dependencies = [ "anyhow", "base64", @@ -1804,7 +1804,7 @@ dependencies = [ [[package]] name = "sphinx-crypter" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=4f8f9ee02814e17d7c3888cbef0addd6844c0fe7#4f8f9ee02814e17d7c3888cbef0addd6844c0fe7" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=9709ba23b49aca8d8ea09197c901913f44d5fa00#9709ba23b49aca8d8ea09197c901913f44d5fa00" dependencies = [ "anyhow", "chacha20poly1305", @@ -1815,7 +1815,7 @@ dependencies = [ [[package]] name = "sphinx-glyph" version = "0.1.2" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=4f8f9ee02814e17d7c3888cbef0addd6844c0fe7#4f8f9ee02814e17d7c3888cbef0addd6844c0fe7" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=9709ba23b49aca8d8ea09197c901913f44d5fa00#9709ba23b49aca8d8ea09197c901913f44d5fa00" dependencies = [ "anyhow", "hex", @@ -1866,7 +1866,7 @@ dependencies = [ [[package]] name = "sphinx-signer" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=4f8f9ee02814e17d7c3888cbef0addd6844c0fe7#4f8f9ee02814e17d7c3888cbef0addd6844c0fe7" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=9709ba23b49aca8d8ea09197c901913f44d5fa00#9709ba23b49aca8d8ea09197c901913f44d5fa00" dependencies = [ "anyhow", "bip39", diff --git a/broker/Cargo.lock b/broker/Cargo.lock index 42405e9..f3de789 100644 --- a/broker/Cargo.lock +++ b/broker/Cargo.lock @@ -1691,7 +1691,7 @@ dependencies = [ [[package]] name = "lss-connector" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs?rev=4f8f9ee02814e17d7c3888cbef0addd6844c0fe7#4f8f9ee02814e17d7c3888cbef0addd6844c0fe7" +source = "git+https://github.com/stakwork/sphinx-rs?rev=9709ba23b49aca8d8ea09197c901913f44d5fa00#9709ba23b49aca8d8ea09197c901913f44d5fa00" dependencies = [ "anyhow", "lightning-storage-server", @@ -2693,7 +2693,7 @@ dependencies = [ [[package]] name = "rmp-utils" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs?rev=4f8f9ee02814e17d7c3888cbef0addd6844c0fe7#4f8f9ee02814e17d7c3888cbef0addd6844c0fe7" +source = "git+https://github.com/stakwork/sphinx-rs?rev=9709ba23b49aca8d8ea09197c901913f44d5fa00#9709ba23b49aca8d8ea09197c901913f44d5fa00" dependencies = [ "anyhow", "log", @@ -3268,7 +3268,7 @@ dependencies = [ [[package]] name = "sphinx-auther" version = "0.1.12" -source = "git+https://github.com/stakwork/sphinx-rs?rev=4f8f9ee02814e17d7c3888cbef0addd6844c0fe7#4f8f9ee02814e17d7c3888cbef0addd6844c0fe7" +source = "git+https://github.com/stakwork/sphinx-rs?rev=9709ba23b49aca8d8ea09197c901913f44d5fa00#9709ba23b49aca8d8ea09197c901913f44d5fa00" dependencies = [ "anyhow", "base64 0.21.2", @@ -3280,7 +3280,7 @@ dependencies = [ [[package]] name = "sphinx-glyph" version = "0.1.2" -source = "git+https://github.com/stakwork/sphinx-rs?rev=4f8f9ee02814e17d7c3888cbef0addd6844c0fe7#4f8f9ee02814e17d7c3888cbef0addd6844c0fe7" +source = "git+https://github.com/stakwork/sphinx-rs?rev=9709ba23b49aca8d8ea09197c901913f44d5fa00#9709ba23b49aca8d8ea09197c901913f44d5fa00" dependencies = [ "anyhow", "hex", @@ -3326,7 +3326,7 @@ dependencies = [ [[package]] name = "sphinx-signer" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs?rev=4f8f9ee02814e17d7c3888cbef0addd6844c0fe7#4f8f9ee02814e17d7c3888cbef0addd6844c0fe7" +source = "git+https://github.com/stakwork/sphinx-rs?rev=9709ba23b49aca8d8ea09197c901913f44d5fa00#9709ba23b49aca8d8ea09197c901913f44d5fa00" dependencies = [ "anyhow", "bip39", diff --git a/broker/Cargo.toml b/broker/Cargo.toml index 3373b1b..8b451f8 100644 --- a/broker/Cargo.toml +++ b/broker/Cargo.toml @@ -39,8 +39,8 @@ vls-proxy = { git = "https://gitlab.com/lightning-signer/validating-li # vls-protocol-client = { path = "../../vls/vls-protocol-client" } # vls-proxy = { path = "../../vls/vls-proxy" } -lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "4f8f9ee02814e17d7c3888cbef0addd6844c0fe7" } -sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "4f8f9ee02814e17d7c3888cbef0addd6844c0fe7" } +lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "9709ba23b49aca8d8ea09197c901913f44d5fa00" } +sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "9709ba23b49aca8d8ea09197c901913f44d5fa00" } # lss-connector = { path = "../../sphinx-rs/lss-connector" } # sphinx-signer = { path = "../../sphinx-rs/signer" } diff --git a/broker/src/looper.rs b/broker/src/looper.rs index cc47008..e110709 100644 --- a/broker/src/looper.rs +++ b/broker/src/looper.rs @@ -73,7 +73,7 @@ impl SignerLoop { let raw_msg = self.client.read_raw()?; // debug!("loop {}: got raw", self.log_prefix); let msg = msgs::from_vec(raw_msg.clone())?; - info!("loop {}: got {:x?}", self.log_prefix, msg); + info!("loop {}: got {}", self.log_prefix, vls_cmd(&msg)); match msg { Message::ClientHsmFd(m) => { self.client.write(msgs::ClientHsmFdReply {}).unwrap(); @@ -118,3 +118,104 @@ impl SignerLoop { } } } + +fn vls_cmd(msg: &Message) -> String { + let m = match msg { + Message::Ping(_) => "Ping", + Message::Pong(_) => "Pong", + Message::HsmdInit(_) => "HsmdInit", + // HsmdInitReplyV1(HsmdInitReplyV1), + #[allow(deprecated)] + Message::HsmdInitReplyV2(_) => "HsmdInitReplyV2", + Message::HsmdInitReplyV4(_) => "HsmdInitReplyV4", + Message::HsmdInit2(_) => "HsmdInit2", + Message::HsmdInit2Reply(_) => "HsmdInit2Reply", + Message::ClientHsmFd(_) => "ClientHsmFd", + Message::ClientHsmFdReply(_) => "ClientHsmFdReply", + Message::SignInvoice(_) => "SignInvoice", + Message::SignInvoiceReply(_) => "SignInvoiceReply", + Message::SignWithdrawal(_) => "SignWithdrawal", + Message::SignWithdrawalReply(_) => "SignWithdrawalReply", + Message::Ecdh(_) => "Ecdh", + Message::EcdhReply(_) => "EcdhReply", + Message::Memleak(_) => "Memleak", + Message::MemleakReply(_) => "MemleakReply", + Message::CheckFutureSecret(_) => "CheckFutureSecret", + Message::CheckFutureSecretReply(_) => "CheckFutureSecretReply", + Message::SignBolt12(_) => "SignBolt12", + Message::SignBolt12Reply(_) => "SignBolt12Reply", + Message::PreapproveInvoice(_) => "PreapproveInvoice", + Message::PreapproveInvoiceReply(_) => "PreapproveInvoiceReply", + Message::PreapproveKeysend(_) => "PreapproveKeysend", + Message::PreapproveKeysendReply(_) => "PreapproveKeysendReply", + Message::DeriveSecret(_) => "DeriveSecret", + Message::DeriveSecretReply(_) => "DeriveSecretReply", + Message::CheckPubKey(_) => "CheckPubKey", + Message::CheckPubKeyReply(_) => "CheckPubKeyReply", + Message::SignMessage(_) => "SignMessage", + Message::SignMessageReply(_) => "SignMessageReply", + Message::SignChannelUpdate(_) => "SignChannelUpdate", + Message::SignChannelUpdateReply(_) => "SignChannelUpdateReply", + Message::SignChannelAnnouncement(_) => "SignChannelAnnouncement", + Message::SignChannelAnnouncementReply(_) => "SignChannelAnnouncementReply", + Message::SignNodeAnnouncement(_) => "SignNodeAnnouncement", + Message::SignNodeAnnouncementReply(_) => "SignNodeAnnouncementReply", + Message::GetPerCommitmentPoint(_) => "GetPerCommitmentPoint", + Message::GetPerCommitmentPointReply(_) => "GetPerCommitmentPointReply", + Message::GetPerCommitmentPoint2(_) => "GetPerCommitmentPoint2", + Message::GetPerCommitmentPoint2Reply(_) => "GetPerCommitmentPoint2Reply", + Message::SetupChannel(_) => "SetupChannel", + Message::SetupChannelReply(_) => "SetupChannelReply", + Message::ValidateCommitmentTx(_) => "ValidateCommitmentTx", + Message::ValidateCommitmentTx2(_) => "ValidateCommitmentTx2", + Message::ValidateCommitmentTxReply(_) => "ValidateCommitmentTxReply", + Message::ValidateRevocation(_) => "ValidateRevocation", + Message::ValidateRevocationReply(_) => "ValidateRevocationReply", + Message::SignRemoteCommitmentTx(_) => "SignRemoteCommitmentTx", + Message::SignRemoteCommitmentTx2(_) => "SignRemoteCommitmentTx2", + Message::SignCommitmentTxWithHtlcsReply(_) => "SignCommitmentTxWithHtlcsReply", + Message::SignDelayedPaymentToUs(_) => "SignDelayedPaymentToUs", + Message::SignAnyDelayedPaymentToUs(_) => "SignAnyDelayedPaymentToUs", + Message::SignRemoteHtlcToUs(_) => "SignRemoteHtlcToUs", + Message::SignAnyRemoteHtlcToUs(_) => "SignAnyRemoteHtlcToUs", + Message::SignLocalHtlcTx(_) => "SignLocalHtlcTx", + Message::SignAnyLocalHtlcTx(_) => "SignAnyLocalHtlcTx", + Message::SignCommitmentTx(_) => "SignCommitmentTx", + Message::SignLocalCommitmentTx2(_) => "SignLocalCommitmentTx2", + Message::SignGossipMessage(_) => "SignGossipMessage", + Message::SignMutualCloseTx(_) => "SignMutualCloseTx", + Message::SignMutualCloseTx2(_) => "SignMutualCloseTx2", + Message::SignTxReply(_) => "SignTxReply", + Message::SignCommitmentTxReply(_) => "SignCommitmentTxReply", + Message::GetChannelBasepoints(_) => "GetChannelBasepoints", + Message::GetChannelBasepointsReply(_) => "GetChannelBasepointsReply", + Message::NewChannel(_) => "NewChannel", + Message::NewChannelReply(_) => "NewChannelReply", + Message::SignRemoteHtlcTx(_) => "SignRemoteHtlcTx", + Message::SignPenaltyToUs(_) => "SignPenaltyToUs", + Message::SignAnyPenaltyToUs(_) => "SignAnyPenaltyToUs", + Message::TipInfo(_) => "TipInfo", + Message::TipInfoReply(_) => "TipInfoReply", + Message::ForwardWatches(_) => "ForwardWatches", + Message::ForwardWatchesReply(_) => "ForwardWatchesReply", + Message::ReverseWatches(_) => "ReverseWatches", + Message::ReverseWatchesReply(_) => "ReverseWatchesReply", + Message::AddBlock(_) => "AddBlock", + Message::AddBlockReply(_) => "AddBlockReply", + Message::RemoveBlock(_) => "RemoveBlock", + Message::RemoveBlockReply(_) => "RemoveBlockReply", + Message::GetHeartbeat(_) => "GetHeartbeat", + Message::GetHeartbeatReply(_) => "GetHeartbeatReply", + Message::NodeInfo(_) => "NodeInfo", + Message::NodeInfoReply(_) => "NodeInfoReply", + Message::Unknown(_) => "Unknown", + Message::SignAnchorspend(_) => "SignAnchorspend", + Message::SignAnchorspendReply(_) => "SignAnchorspendReply", + Message::SignSpliceTx(_) => "SignAnchorspendReply", + Message::SignHtlcTxMingle(_) => "SignHtlcTxMingle", + Message::SignHtlcTxMingleReply(_) => "SignHtlcTxMingleReply", + Message::BlockChunk(_) => "BlockChunk", + Message::BlockChunkReply(_) => "BlockChunkReply", + }; + m.to_string() +} diff --git a/sphinx-key/Cargo.toml b/sphinx-key/Cargo.toml index 0968862..7dda5c3 100644 --- a/sphinx-key/Cargo.toml +++ b/sphinx-key/Cargo.toml @@ -20,9 +20,9 @@ serde_urlencoded = "0.7.1" url = "2" # sphinx-rs -lss-connector = { git = "https://github.com/stakwork/sphinx-rs.git", default-features = false, rev = "4f8f9ee02814e17d7c3888cbef0addd6844c0fe7" } -sphinx-crypter = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "4f8f9ee02814e17d7c3888cbef0addd6844c0fe7" } -sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", optional = true, rev = "4f8f9ee02814e17d7c3888cbef0addd6844c0fe7" } +lss-connector = { git = "https://github.com/stakwork/sphinx-rs.git", default-features = false, rev = "9709ba23b49aca8d8ea09197c901913f44d5fa00" } +sphinx-crypter = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "9709ba23b49aca8d8ea09197c901913f44d5fa00" } +sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", optional = true, rev = "9709ba23b49aca8d8ea09197c901913f44d5fa00" } # local # lss-connector = { path = "../../sphinx-rs/lss-connector", default-features = false } # sphinx-crypter = { path = "../../sphinx-rs/crypter" }