bump sphinx-rs

This commit is contained in:
irriden
2023-07-27 20:26:51 +00:00
parent eed1aa72a5
commit a99584cb3c
5 changed files with 18 additions and 17 deletions

12
Cargo.lock generated
View File

@@ -1199,7 +1199,7 @@ checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
[[package]]
name = "lss-connector"
version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=31f4305caa37f98e3db181a00543947d6d856e6c#31f4305caa37f98e3db181a00543947d6d856e6c"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
dependencies = [
"anyhow",
"log",
@@ -1571,7 +1571,7 @@ dependencies = [
[[package]]
name = "rmp-utils"
version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=31f4305caa37f98e3db181a00543947d6d856e6c#31f4305caa37f98e3db181a00543947d6d856e6c"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
dependencies = [
"anyhow",
"log",
@@ -1778,7 +1778,7 @@ dependencies = [
[[package]]
name = "sphinx-auther"
version = "0.1.12"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=31f4305caa37f98e3db181a00543947d6d856e6c#31f4305caa37f98e3db181a00543947d6d856e6c"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
dependencies = [
"anyhow",
"base64 0.21.2",
@@ -1790,7 +1790,7 @@ dependencies = [
[[package]]
name = "sphinx-crypter"
version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=31f4305caa37f98e3db181a00543947d6d856e6c#31f4305caa37f98e3db181a00543947d6d856e6c"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
dependencies = [
"anyhow",
"chacha20poly1305",
@@ -1801,7 +1801,7 @@ dependencies = [
[[package]]
name = "sphinx-glyph"
version = "0.1.2"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=31f4305caa37f98e3db181a00543947d6d856e6c#31f4305caa37f98e3db181a00543947d6d856e6c"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
dependencies = [
"anyhow",
"hex",
@@ -1852,7 +1852,7 @@ dependencies = [
[[package]]
name = "sphinx-signer"
version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=31f4305caa37f98e3db181a00543947d6d856e6c#31f4305caa37f98e3db181a00543947d6d856e6c"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
dependencies = [
"anyhow",
"bip39",

10
broker/Cargo.lock generated
View File

@@ -1700,7 +1700,7 @@ dependencies = [
[[package]]
name = "lss-connector"
version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs?rev=31f4305caa37f98e3db181a00543947d6d856e6c#31f4305caa37f98e3db181a00543947d6d856e6c"
source = "git+https://github.com/stakwork/sphinx-rs?rev=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
dependencies = [
"anyhow",
"lightning-storage-server",
@@ -2694,7 +2694,7 @@ dependencies = [
[[package]]
name = "rmp-utils"
version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs?rev=31f4305caa37f98e3db181a00543947d6d856e6c#31f4305caa37f98e3db181a00543947d6d856e6c"
source = "git+https://github.com/stakwork/sphinx-rs?rev=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
dependencies = [
"anyhow",
"log",
@@ -3308,7 +3308,7 @@ dependencies = [
[[package]]
name = "sphinx-auther"
version = "0.1.12"
source = "git+https://github.com/stakwork/sphinx-rs?rev=31f4305caa37f98e3db181a00543947d6d856e6c#31f4305caa37f98e3db181a00543947d6d856e6c"
source = "git+https://github.com/stakwork/sphinx-rs?rev=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
dependencies = [
"anyhow",
"base64 0.21.2",
@@ -3320,7 +3320,7 @@ dependencies = [
[[package]]
name = "sphinx-glyph"
version = "0.1.2"
source = "git+https://github.com/stakwork/sphinx-rs?rev=31f4305caa37f98e3db181a00543947d6d856e6c#31f4305caa37f98e3db181a00543947d6d856e6c"
source = "git+https://github.com/stakwork/sphinx-rs?rev=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
dependencies = [
"anyhow",
"hex",
@@ -3366,7 +3366,7 @@ dependencies = [
[[package]]
name = "sphinx-signer"
version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs?rev=31f4305caa37f98e3db181a00543947d6d856e6c#31f4305caa37f98e3db181a00543947d6d856e6c"
source = "git+https://github.com/stakwork/sphinx-rs?rev=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
dependencies = [
"anyhow",
"bip39",

View File

@@ -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 = "31f4305caa37f98e3db181a00543947d6d856e6c" }
sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "31f4305caa37f98e3db181a00543947d6d856e6c" }
lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "8b0c8aefa939448dab2594eaad1c7e2568b5dad5" }
sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "8b0c8aefa939448dab2594eaad1c7e2568b5dad5" }
# lss-connector = { path = "../../sphinx-rs/lss-connector" }
# sphinx-signer = { path = "../../sphinx-rs/signer" }

View File

@@ -18,11 +18,11 @@ 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 = "31f4305caa37f98e3db181a00543947d6d856e6c" }
lss-connector = { git = "https://github.com/stakwork/sphinx-rs.git", default-features = false, rev = "8b0c8aefa939448dab2594eaad1c7e2568b5dad5" }
# lss-connector = { path = "../../sphinx-rs/lss-connector", default-features = false }
sphinx-crypter = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "31f4305caa37f98e3db181a00543947d6d856e6c" }
sphinx-crypter = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "8b0c8aefa939448dab2594eaad1c7e2568b5dad5" }
# sphinx-crypter = { path = "../../sphinx-rs/crypter" }
sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", optional = true, rev = "31f4305caa37f98e3db181a00543947d6d856e6c" }
sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", optional = true, rev = "8b0c8aefa939448dab2594eaad1c7e2568b5dad5" }
# sphinx-signer = { path = "../../sphinx-rs/signer", optional = true }
anyhow.workspace = true

View File

@@ -214,7 +214,7 @@ pub fn make_event_loop(
}
}
Event::LssMessage(msg_bytes) => {
match lss::handle_lss_msg(&msg_bytes, &msgs, &lss_signer) {
match lss::handle_lss_msg(&msg_bytes, msgs, &lss_signer) {
Ok((ret_topic, bytes)) => {
// set msgs back to None
msgs = None;
@@ -224,6 +224,7 @@ pub fn make_event_loop(
}
}
Err(e) => {
msgs = None;
let err_msg = GlyphError::new(1, &e.to_string());
mqtt_pub(&mut mqtt, client_id, topics::ERROR, &err_msg.to_vec()[..]);
}