bump sphinx-rs

this points to a pin of thiserror to 1.0.43, which results in a
downgrade here. 1.0.44 was eating up 10K bytes upfront of esp32 DRAM.
This commit is contained in:
irriden
2023-07-29 05:36:30 +00:00
parent a99584cb3c
commit d8c6ac4bd7
5 changed files with 25 additions and 25 deletions

20
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=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138#fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138"
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=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138#fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138"
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=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138#fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138"
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=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138#fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138"
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=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138#fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138"
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=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138#fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138"
dependencies = [
"anyhow",
"bip39",
@@ -1984,18 +1984,18 @@ dependencies = [
[[package]]
name = "thiserror"
version = "1.0.44"
version = "1.0.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.44"
version = "1.0.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
dependencies = [
"proc-macro2",
"quote",

18
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=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
source = "git+https://github.com/stakwork/sphinx-rs?rev=fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138#fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138"
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=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
source = "git+https://github.com/stakwork/sphinx-rs?rev=fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138#fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138"
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=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
source = "git+https://github.com/stakwork/sphinx-rs?rev=fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138#fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138"
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=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
source = "git+https://github.com/stakwork/sphinx-rs?rev=fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138#fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138"
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=8b0c8aefa939448dab2594eaad1c7e2568b5dad5#8b0c8aefa939448dab2594eaad1c7e2568b5dad5"
source = "git+https://github.com/stakwork/sphinx-rs?rev=fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138#fb7cb744d3c8310fa5a9ce3a5a5cde6e9fb2b138"
dependencies = [
"anyhow",
"bip39",
@@ -3509,18 +3509,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
[[package]]
name = "thiserror"
version = "1.0.44"
version = "1.0.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.44"
version = "1.0.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
dependencies = [
"proc-macro2",
"quote",

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

View File

@@ -174,7 +174,7 @@ pub fn make_event_loop(
expected_sequence,
do_log,
) {
Ok((vls_b, lss_b, sequence)) => {
Ok((vls_b, lss_b, sequence, _cmd)) => {
if lss_b.len() == 0 {
// no muts, respond directly back!
mqtt_pub(&mut mqtt, client_id, topics::VLS_RES, &vls_b);