diff --git a/Cargo.lock b/Cargo.lock index 6c3bc4f..71eb131 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -148,6 +148,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + [[package]] name = "bech32" version = "0.9.1" @@ -224,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=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" dependencies = [ "proc-macro2", "quote", @@ -1195,7 +1201,7 @@ checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "lss-connector" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=be14ee70477f8e99f70f17d7cee6b30741a2ffca#be14ee70477f8e99f70f17d7cee6b30741a2ffca" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f#b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f" dependencies = [ "anyhow", "log", @@ -1727,7 +1733,7 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" dependencies = [ - "base64", + "base64 0.13.1", "chrono", "hex", "serde", @@ -1775,10 +1781,10 @@ dependencies = [ [[package]] name = "sphinx-auther" version = "0.1.12" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=be14ee70477f8e99f70f17d7cee6b30741a2ffca#be14ee70477f8e99f70f17d7cee6b30741a2ffca" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f#b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f" dependencies = [ "anyhow", - "base64", + "base64 0.21.2", "hex", "log", "secp256k1", @@ -1787,7 +1793,7 @@ dependencies = [ [[package]] name = "sphinx-crypter" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=be14ee70477f8e99f70f17d7cee6b30741a2ffca#be14ee70477f8e99f70f17d7cee6b30741a2ffca" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f#b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f" dependencies = [ "anyhow", "chacha20poly1305", @@ -1798,7 +1804,7 @@ dependencies = [ [[package]] name = "sphinx-glyph" version = "0.1.2" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=be14ee70477f8e99f70f17d7cee6b30741a2ffca#be14ee70477f8e99f70f17d7cee6b30741a2ffca" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f#b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f" dependencies = [ "anyhow", "hex", @@ -1850,7 +1856,7 @@ dependencies = [ [[package]] name = "sphinx-signer" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=be14ee70477f8e99f70f17d7cee6b30741a2ffca#be14ee70477f8e99f70f17d7cee6b30741a2ffca" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f#b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f" dependencies = [ "anyhow", "bip39", @@ -2131,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=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" dependencies = [ "anyhow", "bitcoin", @@ -2153,7 +2159,7 @@ dependencies = [ [[package]] name = "vls-persist" version = "0.9.1" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" dependencies = [ "hex", "log", @@ -2166,7 +2172,7 @@ dependencies = [ [[package]] name = "vls-protocol" version = "0.9.1" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" dependencies = [ "as-any", "bolt-derive", @@ -2180,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=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" dependencies = [ "bit-vec", "log", diff --git a/broker/Cargo.lock b/broker/Cargo.lock index 86995cb..94be4a8 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=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" 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=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" 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=be14ee70477f8e99f70f17d7cee6b30741a2ffca#be14ee70477f8e99f70f17d7cee6b30741a2ffca" +source = "git+https://github.com/stakwork/sphinx-rs?rev=b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f#b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f" dependencies = [ "anyhow", "lightning-storage-server", @@ -3311,10 +3311,10 @@ dependencies = [ [[package]] name = "sphinx-auther" version = "0.1.12" -source = "git+https://github.com/stakwork/sphinx-rs?rev=be14ee70477f8e99f70f17d7cee6b30741a2ffca#be14ee70477f8e99f70f17d7cee6b30741a2ffca" +source = "git+https://github.com/stakwork/sphinx-rs?rev=b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f#b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f" dependencies = [ "anyhow", - "base64 0.13.1", + "base64 0.21.2", "hex", "log", "secp256k1", @@ -3323,7 +3323,7 @@ dependencies = [ [[package]] name = "sphinx-glyph" version = "0.1.2" -source = "git+https://github.com/stakwork/sphinx-rs?rev=be14ee70477f8e99f70f17d7cee6b30741a2ffca#be14ee70477f8e99f70f17d7cee6b30741a2ffca" +source = "git+https://github.com/stakwork/sphinx-rs?rev=b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f#b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f" 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=be14ee70477f8e99f70f17d7cee6b30741a2ffca#be14ee70477f8e99f70f17d7cee6b30741a2ffca" +source = "git+https://github.com/stakwork/sphinx-rs?rev=b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f#b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f" 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=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" 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=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" 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=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" 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=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" 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=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" 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=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" 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=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=163bade8dc4a97fdb516b68fbfdff8e43a74e795#163bade8dc4a97fdb516b68fbfdff8e43a74e795" dependencies = [ "anyhow", "as-any", diff --git a/broker/Cargo.toml b/broker/Cargo.toml index 4a7a91e..be8bbd7 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 = "e199c70cbacd3404e7cecf95bb75ca02afd4cffd" } -vls-protocol = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "e199c70cbacd3404e7cecf95bb75ca02afd4cffd" } -vls-protocol-client = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "e199c70cbacd3404e7cecf95bb75ca02afd4cffd" } -vls-proxy = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "e199c70cbacd3404e7cecf95bb75ca02afd4cffd" } +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" } -lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "be14ee70477f8e99f70f17d7cee6b30741a2ffca" } -sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "be14ee70477f8e99f70f17d7cee6b30741a2ffca" } +lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f" } +sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f" } # 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 12e1194..dc79bb0 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 = "be14ee70477f8e99f70f17d7cee6b30741a2ffca" } +lss-connector = { git = "https://github.com/stakwork/sphinx-rs.git", default-features = false, rev = "b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f" } # lss-connector = { path = "../../sphinx-rs/lss-connector", default-features = false } -sphinx-crypter = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "be14ee70477f8e99f70f17d7cee6b30741a2ffca" } -sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", optional = true, rev = "be14ee70477f8e99f70f17d7cee6b30741a2ffca" } +sphinx-crypter = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f" } +sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", optional = true, rev = "b08bd8d76b8f810892e409c5fa0fecbfdf2d6a8f" } # 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 7563d38..2f7e51f 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); + let (lss_signer, res1) = LssSigner::new(&handler_builder, &server_pubkey, 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");