From 069e33166d5960dbf1802c280f4fc81b9f9cfc8b Mon Sep 17 00:00:00 2001 From: Lucas Soriano del Pino Date: Wed, 21 Feb 2024 17:11:50 +1100 Subject: [PATCH 1/2] chore: Update Cargo.lock after webapp version bump --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index da73fe89f..ca5a245fe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4863,7 +4863,7 @@ dependencies = [ [[package]] name = "webapp" -version = "0.2.0" +version = "0.3.0" dependencies = [ "anyhow", "atty", From 7ef011bc9241fb76b391069d5f478b303722cab1 Mon Sep 17 00:00:00 2001 From: Lucas Soriano del Pino Date: Wed, 21 Feb 2024 17:12:19 +1100 Subject: [PATCH 2/2] chore: Ensure backwards compatibility for electrs CLI argument Patch cd04992884b88d911c04b48c075e4c23883cfa0f changed the name of the `esplora` CLI argument to `electrs` for correctness. But the change was introduced in a backwards-incompatible manner. This patch solves that issue by introducing an alias for the CLI argument with the original name. All this applies to both the coordinator and the webapp. --- coordinator/src/cli.rs | 2 +- webapp/src/cli.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coordinator/src/cli.rs b/coordinator/src/cli.rs index dd47dccbf..ad34bae60 100644 --- a/coordinator/src/cli.rs +++ b/coordinator/src/cli.rs @@ -43,7 +43,7 @@ pub struct Opts { pub database: String, /// The address to connect to the Electrs API. - #[clap(long, default_value = "http://localhost:3000")] + #[clap(long, default_value = "http://localhost:3000", aliases = ["esplora"])] pub electrs: String, /// If enabled, tokio runtime can be locally debugged with tokio_console diff --git a/webapp/src/cli.rs b/webapp/src/cli.rs index 561ca5a69..a37af2ff1 100644 --- a/webapp/src/cli.rs +++ b/webapp/src/cli.rs @@ -28,7 +28,7 @@ pub struct Opts { pub network: Network, /// The address to connect to the Electrs API. - #[clap(long, default_value = "http://localhost:3000")] + #[clap(long, default_value = "http://localhost:3000", aliases = ["esplora"])] pub electrs: String, /// The endpoint of the p2p-derivatives oracle