From 6be51c6218e7111be4822cab840df11f2518ede4 Mon Sep 17 00:00:00 2001 From: G8XSU <3442979+G8XSU@users.noreply.github.com> Date: Fri, 6 Sep 2024 22:01:10 -0700 Subject: [PATCH 1/3] Vss-client upgrade to 0.3.x --- Cargo.toml | 2 +- src/io/vss_store.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9d350e18c..d1fa50fd2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,7 +71,7 @@ libc = "0.2" uniffi = { version = "0.26.0", features = ["build"], optional = true } [target.'cfg(vss)'.dependencies] -vss-client = "0.2" +vss-client = "0.3" prost = { version = "0.11.6", default-features = false} [target.'cfg(windows)'.dependencies] diff --git a/src/io/vss_store.rs b/src/io/vss_store.rs index ec8f04b64..ba09b5988 100644 --- a/src/io/vss_store.rs +++ b/src/io/vss_store.rs @@ -61,7 +61,7 @@ impl VssStore { ) }) as _); - let client = VssClient::new(&base_url, retry_policy); + let client = VssClient::new(base_url, retry_policy); Self { client, store_id, runtime, storable_builder } } From 92612dce04b897969ae3942df8d763d7eb60b4db Mon Sep 17 00:00:00 2001 From: G8XSU <3442979+G8XSU@users.noreply.github.com> Date: Fri, 6 Sep 2024 22:03:40 -0700 Subject: [PATCH 2/3] Fix vss war name for vss-server binary in CI. --- .github/workflows/vss-integration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/vss-integration.yml b/.github/workflows/vss-integration.yml index df739abce..44b7f445d 100644 --- a/.github/workflows/vss-integration.yml +++ b/.github/workflows/vss-integration.yml @@ -68,7 +68,7 @@ jobs: ./gradlew --version ./gradlew build - docker cp app/build/libs/app-1.0.war tomcat:/usr/local/tomcat/webapps/vss.war + docker cp app/build/libs/vss-1.0.war tomcat:/usr/local/tomcat/webapps/vss.war cd ../ - name: Run VSS Integration tests against vss-instance. run: | From 7c7b98b9560e40ddb2f8a78ff40ddffa09e93890 Mon Sep 17 00:00:00 2001 From: G8XSU <3442979+G8XSU@users.noreply.github.com> Date: Thu, 12 Sep 2024 10:53:47 -0700 Subject: [PATCH 3/3] Fix lightning-liquidity to 0.1.0-alpha.4 until upgrade PR. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index d1fa50fd2..39f3b947d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ lightning-persister = { version = "0.0.123" } lightning-background-processor = { version = "0.0.123", features = ["futures"] } lightning-rapid-gossip-sync = { version = "0.0.123" } lightning-transaction-sync = { version = "0.0.123", features = ["esplora-async-https", "time"] } -lightning-liquidity = { version = "0.1.0-alpha.4", features = ["std"] } +lightning-liquidity = { version = "=0.1.0-alpha.4", features = ["std"] } #lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["std"] } #lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main" }