diff --git a/Cargo.lock b/Cargo.lock index f3dd412..c8fe278 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -230,7 +230,7 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bolt-derive" version = "0.1.0" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" dependencies = [ "proc-macro2", "quote", @@ -1201,7 +1201,7 @@ checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "lss-connector" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=97edb51448fa2ea4402e6411f67d1cf63e87ea51#97edb51448fa2ea4402e6411f67d1cf63e87ea51" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=0843db9ff287f388653089ae95f45cac85fe7a66#0843db9ff287f388653089ae95f45cac85fe7a66" dependencies = [ "anyhow", "log", @@ -1781,7 +1781,7 @@ dependencies = [ [[package]] name = "sphinx-auther" version = "0.1.12" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=97edb51448fa2ea4402e6411f67d1cf63e87ea51#97edb51448fa2ea4402e6411f67d1cf63e87ea51" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=0843db9ff287f388653089ae95f45cac85fe7a66#0843db9ff287f388653089ae95f45cac85fe7a66" dependencies = [ "anyhow", "base64 0.21.2", @@ -1793,7 +1793,7 @@ dependencies = [ [[package]] name = "sphinx-crypter" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=97edb51448fa2ea4402e6411f67d1cf63e87ea51#97edb51448fa2ea4402e6411f67d1cf63e87ea51" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=0843db9ff287f388653089ae95f45cac85fe7a66#0843db9ff287f388653089ae95f45cac85fe7a66" dependencies = [ "anyhow", "chacha20poly1305", @@ -1804,7 +1804,7 @@ dependencies = [ [[package]] name = "sphinx-glyph" version = "0.1.2" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=97edb51448fa2ea4402e6411f67d1cf63e87ea51#97edb51448fa2ea4402e6411f67d1cf63e87ea51" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=0843db9ff287f388653089ae95f45cac85fe7a66#0843db9ff287f388653089ae95f45cac85fe7a66" dependencies = [ "anyhow", "hex", @@ -1856,7 +1856,7 @@ dependencies = [ [[package]] name = "sphinx-signer" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=97edb51448fa2ea4402e6411f67d1cf63e87ea51#97edb51448fa2ea4402e6411f67d1cf63e87ea51" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=0843db9ff287f388653089ae95f45cac85fe7a66#0843db9ff287f388653089ae95f45cac85fe7a66" dependencies = [ "anyhow", "bip39", @@ -2137,7 +2137,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vls-core" version = "0.9.1" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" dependencies = [ "anyhow", "bitcoin", @@ -2159,7 +2159,7 @@ dependencies = [ [[package]] name = "vls-persist" version = "0.9.1" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" dependencies = [ "hex", "log", @@ -2172,7 +2172,7 @@ dependencies = [ [[package]] name = "vls-protocol" version = "0.9.1" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" dependencies = [ "as-any", "bolt-derive", @@ -2186,7 +2186,7 @@ dependencies = [ [[package]] name = "vls-protocol-signer" version = "0.9.1" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" dependencies = [ "bit-vec", "log", diff --git a/broker/Cargo.lock b/broker/Cargo.lock index 8fa092f..68620da 100644 --- a/broker/Cargo.lock +++ b/broker/Cargo.lock @@ -407,7 +407,7 @@ dependencies = [ [[package]] name = "bolt-derive" version = "0.1.0" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" dependencies = [ "proc-macro2", "quote", @@ -1620,7 +1620,7 @@ dependencies = [ [[package]] name = "lightning-storage-server" version = "0.3.0" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" dependencies = [ "anyhow", "async-trait", @@ -1702,7 +1702,7 @@ dependencies = [ [[package]] name = "lss-connector" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs?rev=97edb51448fa2ea4402e6411f67d1cf63e87ea51#97edb51448fa2ea4402e6411f67d1cf63e87ea51" +source = "git+https://github.com/stakwork/sphinx-rs?rev=0843db9ff287f388653089ae95f45cac85fe7a66#0843db9ff287f388653089ae95f45cac85fe7a66" dependencies = [ "anyhow", "lightning-storage-server", @@ -3311,7 +3311,7 @@ dependencies = [ [[package]] name = "sphinx-auther" version = "0.1.12" -source = "git+https://github.com/stakwork/sphinx-rs?rev=97edb51448fa2ea4402e6411f67d1cf63e87ea51#97edb51448fa2ea4402e6411f67d1cf63e87ea51" +source = "git+https://github.com/stakwork/sphinx-rs?rev=0843db9ff287f388653089ae95f45cac85fe7a66#0843db9ff287f388653089ae95f45cac85fe7a66" dependencies = [ "anyhow", "base64 0.21.2", @@ -3323,7 +3323,7 @@ dependencies = [ [[package]] name = "sphinx-glyph" version = "0.1.2" -source = "git+https://github.com/stakwork/sphinx-rs?rev=97edb51448fa2ea4402e6411f67d1cf63e87ea51#97edb51448fa2ea4402e6411f67d1cf63e87ea51" +source = "git+https://github.com/stakwork/sphinx-rs?rev=0843db9ff287f388653089ae95f45cac85fe7a66#0843db9ff287f388653089ae95f45cac85fe7a66" dependencies = [ "anyhow", "hex", @@ -3369,7 +3369,7 @@ dependencies = [ [[package]] name = "sphinx-signer" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs?rev=97edb51448fa2ea4402e6411f67d1cf63e87ea51#97edb51448fa2ea4402e6411f67d1cf63e87ea51" +source = "git+https://github.com/stakwork/sphinx-rs?rev=0843db9ff287f388653089ae95f45cac85fe7a66#0843db9ff287f388653089ae95f45cac85fe7a66" dependencies = [ "anyhow", "bip39", @@ -4055,7 +4055,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vls-core" version = "0.9.1" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" dependencies = [ "anyhow", "backtrace", @@ -4079,7 +4079,7 @@ dependencies = [ [[package]] name = "vls-frontend" version = "0.9.1" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" dependencies = [ "async-trait", "lightning-storage-server", @@ -4093,7 +4093,7 @@ dependencies = [ [[package]] name = "vls-persist" version = "0.9.1" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" dependencies = [ "hex", "kv", @@ -4107,7 +4107,7 @@ dependencies = [ [[package]] name = "vls-protocol" version = "0.9.1" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" dependencies = [ "as-any", "bolt-derive", @@ -4121,7 +4121,7 @@ dependencies = [ [[package]] name = "vls-protocol-client" version = "0.9.1" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" dependencies = [ "anyhow", "async-trait", @@ -4136,7 +4136,7 @@ dependencies = [ [[package]] name = "vls-protocol-signer" version = "0.9.1" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" dependencies = [ "bit-vec", "log", @@ -4148,7 +4148,7 @@ dependencies = [ [[package]] name = "vls-proxy" version = "0.9.1" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" dependencies = [ "anyhow", "as-any", diff --git a/broker/Cargo.toml b/broker/Cargo.toml index 73f2a9a..fef6f1d 100644 --- a/broker/Cargo.toml +++ b/broker/Cargo.toml @@ -30,13 +30,13 @@ thiserror = "1.0.31" toml = "0.5.9" url = { version = "2.2" } -vls-frontend = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "163bade8dc4a97fdb516b68fbfdff8e43a74e795" } -vls-protocol = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "163bade8dc4a97fdb516b68fbfdff8e43a74e795" } -vls-protocol-client = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "163bade8dc4a97fdb516b68fbfdff8e43a74e795" } -vls-proxy = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "163bade8dc4a97fdb516b68fbfdff8e43a74e795" } +vls-frontend = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "de25fc60bce03e9be16a698ffd8e8bdc48ed975d" } +vls-protocol = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "de25fc60bce03e9be16a698ffd8e8bdc48ed975d" } +vls-protocol-client = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "de25fc60bce03e9be16a698ffd8e8bdc48ed975d" } +vls-proxy = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "de25fc60bce03e9be16a698ffd8e8bdc48ed975d" } -lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "97edb51448fa2ea4402e6411f67d1cf63e87ea51" } -sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "97edb51448fa2ea4402e6411f67d1cf63e87ea51" } +lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "0843db9ff287f388653089ae95f45cac85fe7a66" } +sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "0843db9ff287f388653089ae95f45cac85fe7a66" } # lss-connector = { path = "../../sphinx-rs/lss-connector" } # sphinx-signer = { path = "../../sphinx-rs/signer" } diff --git a/sphinx-key/Cargo.toml b/sphinx-key/Cargo.toml index 83e6e45..779e80d 100644 --- a/sphinx-key/Cargo.toml +++ b/sphinx-key/Cargo.toml @@ -19,10 +19,10 @@ serde_json = { version = "1.0.81", default-features = false } serde_urlencoded = "0.7.1" url = "2" -lss-connector = { git = "https://github.com/stakwork/sphinx-rs.git", default-features = false, rev = "97edb51448fa2ea4402e6411f67d1cf63e87ea51" } +lss-connector = { git = "https://github.com/stakwork/sphinx-rs.git", default-features = false, rev = "0843db9ff287f388653089ae95f45cac85fe7a66" } # lss-connector = { path = "../../sphinx-rs/lss-connector", default-features = false } -sphinx-crypter = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "97edb51448fa2ea4402e6411f67d1cf63e87ea51" } -sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", optional = true, rev = "97edb51448fa2ea4402e6411f67d1cf63e87ea51" } +sphinx-crypter = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "0843db9ff287f388653089ae95f45cac85fe7a66" } +sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", optional = true, rev = "0843db9ff287f388653089ae95f45cac85fe7a66" } # sphinx-signer = { path = "../../sphinx-rs/signer", optional = true } anyhow.workspace = true diff --git a/sphinx-key/src/core/lss.rs b/sphinx-key/src/core/lss.rs index 2f7e51f..0f27f3c 100644 --- a/sphinx-key/src/core/lss.rs +++ b/sphinx-key/src/core/lss.rs @@ -26,7 +26,7 @@ pub fn init_lss( } }; - let (lss_signer, res1) = LssSigner::new(&handler_builder, &server_pubkey, None); + let (lss_signer, res1) = LssSigner::new(&handler_builder, &server_pubkey, None, None); let lss_res_1_topic = format!("{}/{}", client_id, topics::INIT_1_RES); mqtt.publish(&lss_res_1_topic, QOS, false, &res1) .expect("could not publish LSS response");