From 8c1f9937d30e7734ff472c209f08e054ff350533 Mon Sep 17 00:00:00 2001 From: irriden Date: Fri, 14 Jul 2023 03:01:08 +0000 Subject: [PATCH] bump sphinx-rs --- Cargo.lock | 34 ++++++++++++++++------------------ broker/Cargo.lock | 32 +++++++++++++++----------------- broker/Cargo.toml | 4 ++-- sphinx-key/Cargo.toml | 6 +++--- 4 files changed, 36 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c8fe278..4f3997c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -190,8 +190,6 @@ checksum = "29b9e657de8ff1c3488a4ab77cb51d604eab53415ce34f0bc800f2eac9b13c28" dependencies = [ "bitcoin_hashes", "rand_core 0.4.2", - "serde", - "unicode-normalization", ] [[package]] @@ -1201,14 +1199,14 @@ checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "lss-connector" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=0843db9ff287f388653089ae95f45cac85fe7a66#0843db9ff287f388653089ae95f45cac85fe7a66" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=43bc5f621546093e1a72baa715097aedc5795690#43bc5f621546093e1a72baa715097aedc5795690" dependencies = [ "anyhow", "log", - "rmp-serde", + "rmp", + "rmp-utils", "secp256k1", "serde", - "serde-big-array", "sphinx-glyph", "vls-protocol-signer", ] @@ -1572,6 +1570,15 @@ dependencies = [ "serde", ] +[[package]] +name = "rmp-utils" +version = "0.1.0" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=43bc5f621546093e1a72baa715097aedc5795690#43bc5f621546093e1a72baa715097aedc5795690" +dependencies = [ + "anyhow", + "rmp", +] + [[package]] name = "rustc-demangle" version = "0.1.23" @@ -1673,15 +1680,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-big-array" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f" -dependencies = [ - "serde", -] - [[package]] name = "serde_bolt" version = "0.2.4" @@ -1781,7 +1779,7 @@ dependencies = [ [[package]] name = "sphinx-auther" version = "0.1.12" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=0843db9ff287f388653089ae95f45cac85fe7a66#0843db9ff287f388653089ae95f45cac85fe7a66" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=43bc5f621546093e1a72baa715097aedc5795690#43bc5f621546093e1a72baa715097aedc5795690" dependencies = [ "anyhow", "base64 0.21.2", @@ -1793,7 +1791,7 @@ dependencies = [ [[package]] name = "sphinx-crypter" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=0843db9ff287f388653089ae95f45cac85fe7a66#0843db9ff287f388653089ae95f45cac85fe7a66" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=43bc5f621546093e1a72baa715097aedc5795690#43bc5f621546093e1a72baa715097aedc5795690" dependencies = [ "anyhow", "chacha20poly1305", @@ -1804,7 +1802,7 @@ dependencies = [ [[package]] name = "sphinx-glyph" version = "0.1.2" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=0843db9ff287f388653089ae95f45cac85fe7a66#0843db9ff287f388653089ae95f45cac85fe7a66" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=43bc5f621546093e1a72baa715097aedc5795690#43bc5f621546093e1a72baa715097aedc5795690" dependencies = [ "anyhow", "hex", @@ -1856,7 +1854,7 @@ dependencies = [ [[package]] name = "sphinx-signer" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=0843db9ff287f388653089ae95f45cac85fe7a66#0843db9ff287f388653089ae95f45cac85fe7a66" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=43bc5f621546093e1a72baa715097aedc5795690#43bc5f621546093e1a72baa715097aedc5795690" dependencies = [ "anyhow", "bip39", diff --git a/broker/Cargo.lock b/broker/Cargo.lock index 68620da..1243d3f 100644 --- a/broker/Cargo.lock +++ b/broker/Cargo.lock @@ -340,8 +340,6 @@ checksum = "29b9e657de8ff1c3488a4ab77cb51d604eab53415ce34f0bc800f2eac9b13c28" dependencies = [ "bitcoin_hashes", "rand_core 0.4.2", - "serde", - "unicode-normalization", ] [[package]] @@ -1702,15 +1700,15 @@ dependencies = [ [[package]] name = "lss-connector" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs?rev=0843db9ff287f388653089ae95f45cac85fe7a66#0843db9ff287f388653089ae95f45cac85fe7a66" +source = "git+https://github.com/stakwork/sphinx-rs?rev=43bc5f621546093e1a72baa715097aedc5795690#43bc5f621546093e1a72baa715097aedc5795690" dependencies = [ "anyhow", "lightning-storage-server", "log", - "rmp-serde", + "rmp", + "rmp-utils", "secp256k1", "serde", - "serde-big-array", "sphinx-glyph", "tokio", "vls-frontend", @@ -2695,6 +2693,15 @@ dependencies = [ "serde", ] +[[package]] +name = "rmp-utils" +version = "0.1.0" +source = "git+https://github.com/stakwork/sphinx-rs?rev=43bc5f621546093e1a72baa715097aedc5795690#43bc5f621546093e1a72baa715097aedc5795690" +dependencies = [ + "anyhow", + "rmp", +] + [[package]] name = "rocket" version = "0.5.0-rc.3" @@ -3073,15 +3080,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-big-array" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f" -dependencies = [ - "serde", -] - [[package]] name = "serde_bolt" version = "0.2.4" @@ -3311,7 +3309,7 @@ dependencies = [ [[package]] name = "sphinx-auther" version = "0.1.12" -source = "git+https://github.com/stakwork/sphinx-rs?rev=0843db9ff287f388653089ae95f45cac85fe7a66#0843db9ff287f388653089ae95f45cac85fe7a66" +source = "git+https://github.com/stakwork/sphinx-rs?rev=43bc5f621546093e1a72baa715097aedc5795690#43bc5f621546093e1a72baa715097aedc5795690" dependencies = [ "anyhow", "base64 0.21.2", @@ -3323,7 +3321,7 @@ dependencies = [ [[package]] name = "sphinx-glyph" version = "0.1.2" -source = "git+https://github.com/stakwork/sphinx-rs?rev=0843db9ff287f388653089ae95f45cac85fe7a66#0843db9ff287f388653089ae95f45cac85fe7a66" +source = "git+https://github.com/stakwork/sphinx-rs?rev=43bc5f621546093e1a72baa715097aedc5795690#43bc5f621546093e1a72baa715097aedc5795690" dependencies = [ "anyhow", "hex", @@ -3369,7 +3367,7 @@ dependencies = [ [[package]] name = "sphinx-signer" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs?rev=0843db9ff287f388653089ae95f45cac85fe7a66#0843db9ff287f388653089ae95f45cac85fe7a66" +source = "git+https://github.com/stakwork/sphinx-rs?rev=43bc5f621546093e1a72baa715097aedc5795690#43bc5f621546093e1a72baa715097aedc5795690" dependencies = [ "anyhow", "bip39", diff --git a/broker/Cargo.toml b/broker/Cargo.toml index fef6f1d..946ca28 100644 --- a/broker/Cargo.toml +++ b/broker/Cargo.toml @@ -35,8 +35,8 @@ vls-protocol = { git = "https://gitlab.com/lightning-signer/validating-li 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 = "0843db9ff287f388653089ae95f45cac85fe7a66" } -sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "0843db9ff287f388653089ae95f45cac85fe7a66" } +lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "43bc5f621546093e1a72baa715097aedc5795690" } +sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "43bc5f621546093e1a72baa715097aedc5795690" } # 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 779e80d..8d668a2 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 = "0843db9ff287f388653089ae95f45cac85fe7a66" } +lss-connector = { git = "https://github.com/stakwork/sphinx-rs.git", default-features = false, rev = "43bc5f621546093e1a72baa715097aedc5795690" } # lss-connector = { path = "../../sphinx-rs/lss-connector", default-features = false } -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-crypter = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "43bc5f621546093e1a72baa715097aedc5795690" } +sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", optional = true, rev = "43bc5f621546093e1a72baa715097aedc5795690" } # sphinx-signer = { path = "../../sphinx-rs/signer", optional = true } anyhow.workspace = true