From fa9ed05bd86adbbf55ae5b0bf722dc0abe58d6c1 Mon Sep 17 00:00:00 2001 From: decentclock Date: Mon, 22 Aug 2022 15:38:21 -0600 Subject: [PATCH] Drop sphinx-key vls fork, point all deps to root vls --- Cargo.toml | 6 ------ auther/Cargo.toml | 4 ++-- broker/Cargo.toml | 12 ++++++------ crypter-ffi/Cargo.toml | 5 ----- crypter/Cargo.toml | 12 +++--------- parser/Cargo.toml | 2 +- signer/Cargo.toml | 2 +- sphinx-key/Cargo.toml | 6 ------ 8 files changed, 13 insertions(+), 36 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c6d525e..8ec5845 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,9 +14,3 @@ exclude = [ "crypter-ffi", "persister", ] - -[patch.crates-io] -# updates the "rand" create to use esp RNG -getrandom = { version = "0.2", git = "https://github.com/esp-rs-compat/getrandom.git" } -secp256k1 = { git = "https://github.com/Evanfeenstra/rust-secp256k1", branch = "v0.22.0-new-rand" } -lightning = { git = "https://github.com/Evanfeenstra/rust-lightning", branch = "v0.0.108-branch" } diff --git a/auther/Cargo.toml b/auther/Cargo.toml index 224546b..b1c9de2 100644 --- a/auther/Cargo.toml +++ b/auther/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Evan Feenstra "] edition = "2018" [dependencies] -secp256k1 = { version = "0.22.0", default-features = false, features = ["std", "rand-std", "bitcoin_hashes"] } +secp256k1 = { version = "0.24.0", default-features = false, features = ["std", "rand-std", "bitcoin_hashes"] } anyhow = {version = "1", features = ["backtrace"]} log = "0.4" base64 = { version = "0.13.0" } @@ -15,4 +15,4 @@ default = [ "no-std", "secp-recovery", "secp-lowmemory" ] no-std = ["secp256k1/alloc"] secp-lowmemory = ["secp256k1/lowmemory"] secp-recovery = ["secp256k1/recovery"] -rand = ["secp256k1/rand-std"] \ No newline at end of file +rand = ["secp256k1/rand-std"] diff --git a/broker/Cargo.toml b/broker/Cargo.toml index e33222a..2702f8e 100644 --- a/broker/Cargo.toml +++ b/broker/Cargo.toml @@ -6,16 +6,16 @@ default-run = "sphinx-key-broker" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -vls-protocol = { git = "https://gitlab.com/Evanfeenstra/validating-lightning-signer", branch = "sphinx-key-1.4" } -vls-proxy = { git = "https://gitlab.com/Evanfeenstra/validating-lightning-signer", branch = "sphinx-key-1.4" } -vls-frontend = { git = "https://gitlab.com/Evanfeenstra/validating-lightning-signer", branch = "sphinx-key-1.4" } -vls-protocol-client = { git = "https://gitlab.com/Evanfeenstra/validating-lightning-signer", branch = "sphinx-key-1.4" } +vls-protocol = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", branch = "2022-08-persist-reorg" } +vls-proxy = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", branch = "2022-08-persist-reorg" } +vls-frontend = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", branch = "2022-08-persist-reorg" } +vls-protocol-client = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", branch = "2022-08-persist-reorg" } rumqttd = { git = "https://github.com/Evanfeenstra/rumqtt", branch = "metrics" } pretty_env_logger = "0.4.0" confy = "0.4.0" tokio = { version = "1.4.0", features = ["rt", "rt-multi-thread", "macros"] } sphinx-key-parser = { path = "../parser" } -secp256k1 = { version = "0.20", features = ["rand-std", "bitcoin_hashes"] } +secp256k1 = { version = "0.24.0", features = ["rand-std", "bitcoin_hashes"] } anyhow = {version = "1", features = ["backtrace"]} log = "0.4" fern = { version = "0.6", features = ["colored"] } @@ -24,7 +24,7 @@ clap = "=3.0.0-beta.2" clap_derive = "=3.0.0-beta.5" chrono = "0.4" once_cell = "1.12.0" -bitcoin = "0.28.1" +bitcoin = "0.29.0" async-trait = "0.1" url = { version = "2.2" } diff --git a/crypter-ffi/Cargo.toml b/crypter-ffi/Cargo.toml index b7f4000..b6171bd 100644 --- a/crypter-ffi/Cargo.toml +++ b/crypter-ffi/Cargo.toml @@ -24,8 +24,3 @@ codegen-units = 1 # Reduce number of codegen units to increase optimizations. # panic = 'abort' # Abort on panic debug = true # Enable debug symbols. For example, we can use `dwarfdump` to check crash traces. -[patch.crates-io] -getrandom = { version = "0.2", git = "https://github.com/esp-rs-compat/getrandom.git" } -secp256k1 = { git = "https://github.com/Evanfeenstra/rust-secp256k1", branch = "v0.22.0-new-rand" } -lightning = { git = "https://github.com/Evanfeenstra/rust-lightning", branch = "v0.0.108-branch" } - diff --git a/crypter/Cargo.toml b/crypter/Cargo.toml index 63c80f0..b110ab2 100644 --- a/crypter/Cargo.toml +++ b/crypter/Cargo.toml @@ -6,18 +6,12 @@ edition = "2018" [dependencies] anyhow = {version = "1", features = ["backtrace"]} -secp256k1 = { version = "0.22.0", features = ["std", "rand-std", "lowmemory"] } +secp256k1 = { version = "0.24.0", features = ["std", "rand-std", "lowmemory"] } rand = "0.8.5" [dependencies.lightning] -version = "0.0.108" +git = "https://github.com/lightningdevkit/rust-lightning.git" +rev = "ea5b62fff69847941434fb51562e302eb4e7ff4b" default-features = false features = ["std", "grind_signatures"] -# [dev-dependencies] - -[patch.crates-io] -getrandom = { version = "0.2", git = "https://github.com/esp-rs-compat/getrandom.git" } -secp256k1 = { git = "https://github.com/Evanfeenstra/rust-secp256k1", branch = "v0.22.0-new-rand" } -lightning = { git = "https://github.com/Evanfeenstra/rust-lightning", branch = "v0.0.108-branch" } - diff --git a/parser/Cargo.toml b/parser/Cargo.toml index cda66fd..195ebe8 100644 --- a/parser/Cargo.toml +++ b/parser/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -vls-protocol = { git = "https://gitlab.com/Evanfeenstra/validating-lightning-signer", branch = "sphinx-key-1.4" } +vls-protocol = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", branch = "2022-08-persist-reorg" } serde = { version = "1.0", default-features = false } serde_bolt = { version = "0.2", default-features = false } diff --git a/signer/Cargo.toml b/signer/Cargo.toml index b33e5e9..36c446c 100644 --- a/signer/Cargo.toml +++ b/signer/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] sphinx-key-parser = { path = "../parser" } sphinx-key-persister = { path = "../persister" } -vls-protocol-signer = { git = "https://gitlab.com/Evanfeenstra/validating-lightning-signer", branch = "sphinx-key-1.4", default-features = false, features = ["std", "secp-lowmemory"] } +vls-protocol-signer = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", branch = "2022-08-persist-reorg", default-features = false, features = ["std", "secp-lowmemory"] } anyhow = {version = "1", features = ["backtrace"]} log = "0.4" rand = { version = "0.8" } diff --git a/sphinx-key/Cargo.toml b/sphinx-key/Cargo.toml index 15882d6..6148d88 100644 --- a/sphinx-key/Cargo.toml +++ b/sphinx-key/Cargo.toml @@ -37,12 +37,6 @@ serde_json = { version = "1.0.81", default-features = false } hex = "0.4.3" rmp-serde = "1.1.0" -[patch.crates-io] -# updates the "rand" create to use esp RNG -getrandom = { version = "0.2", git = "https://github.com/esp-rs-compat/getrandom.git" } -secp256k1 = { git = "https://github.com/Evanfeenstra/rust-secp256k1", branch = "v0.22.0-new-rand" } -lightning = { git = "https://github.com/Evanfeenstra/rust-lightning", branch = "v0.0.108-branch" } - [build-dependencies] embuild = "0.29" anyhow = "1"