feat(cli)!: remove default chain ID, endpoint URL (#1792)

## Summary Removes the default RPC URL and chain IDs the CLI. ## Background It is a safety issue to interact with the wrong chain, and so these defaults should not be enshrined in the app. ## Changes - Remove the default value from all `--sequencer.chain-id` arguments. - Remove the default value from all `--sequencer-url` arguments. ## Testing All smoke tests already explicitly provided chain ID and RPC URL and thus keep working. Ran manually: omitting either arguments now results in errors like this: ``` error: the following required arguments were not provided: --sequencer-url <SEQUENCER_URL> ``` ## Changelogs "Changelogs updated." ## Breaking Changelist - All invocations of the CLI for interacting with Astria network `astria-dusk-10` at `"https://rpc.sequencer.dusk-10.devnet.astria.org"` no longer work. Chain ID and RPC URL now need to be set explicitly by providing an environment variable or command line argumient. Invocations that already had the chain ID and RPC URL present continue working unchanged.
astriaorg · Dec 6, 2024 · 88adcb3 · 88adcb3
1 parent eac2759
commit 88adcb3
Show file tree

Hide file tree

Showing 18 changed files with 32 additions and 138 deletions.
diff --git a/crates/astria-cli/CHANGELOG.md b/crates/astria-cli/CHANGELOG.md
@@ -18,6 +18,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed ICS20 withdrawal source when using channel with more than one
   port/channel combo. [#1768](https://github.com/astriaorg/astria/pull/1768)
 
+### Changed
+
+- Removed default values from `--sequencer.chain-id` and `--sequencer-url` arguments
+  [#1792](https://github.com/astriaorg/astria/pull/1792)
+
 ## [0.5.1] - 2024-10-23
 
 ### Added

diff --git a/crates/astria-cli/src/lib.rs b/crates/astria-cli/src/lib.rs
@@ -15,9 +15,6 @@ use clap::{
 };
 use color_eyre::eyre;
 
-const DEFAULT_SEQUENCER_RPC: &str = "https://rpc.sequencer.dusk-10.devnet.astria.org";
-const DEFAULT_SEQUENCER_CHAIN_ID: &str = "astria-dusk-10";
-
 /// Run commands against the Astria network.
 #[derive(Debug, Parser)]
 #[command(name = "astria-cli", version, about)]

diff --git a/crates/astria-cli/src/sequencer/account.rs b/crates/astria-cli/src/sequencer/account.rs
@@ -121,11 +121,7 @@ impl Nonce {
 #[derive(clap::Args, Debug)]
 struct ArgsInner {
     /// The url of the Sequencer node
-    #[arg(
-        long,
-        env = "SEQUENCER_URL",
-        default_value = crate::DEFAULT_SEQUENCER_RPC
-    )]
+    #[arg(long, env = "SEQUENCER_URL")]
     sequencer_url: String,
     /// The address of the Sequencer account
     address: Address,

diff --git a/crates/astria-cli/src/sequencer/balance.rs b/crates/astria-cli/src/sequencer/balance.rs
@@ -31,11 +31,7 @@ enum SubCommand {
 #[derive(clap::Args, Debug)]
 struct Get {
     /// The url of the Sequencer node
-    #[arg(
-        long,
-        env = "SEQUENCER_URL",
-        default_value = crate::DEFAULT_SEQUENCER_RPC
-    )]
+    #[arg(long, env = "SEQUENCER_URL")]
     sequencer_url: String,
     /// The address of the Sequencer account
     address: Address,

diff --git a/crates/astria-cli/src/sequencer/block_height.rs b/crates/astria-cli/src/sequencer/block_height.rs
@@ -30,18 +30,10 @@ enum SubCommand {
 #[derive(clap::Args, Debug)]
 struct Get {
     /// The url of the Sequencer node
-    #[arg(
-        long,
-        env = "SEQUENCER_URL",
-        default_value = crate::DEFAULT_SEQUENCER_RPC
-    )]
+    #[arg(long, env = "SEQUENCER_URL")]
     sequencer_url: String,
     /// The chain id of the sequencing chain being used
-    #[arg(
-        long = "sequencer.chain-id",
-        env = "ROLLUP_SEQUENCER_CHAIN_ID",
-        default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID
-    )]
+    #[arg(long = "sequencer.chain-id", env = "ROLLUP_SEQUENCER_CHAIN_ID")]
     sequencer_chain_id: String,
 }
 

diff --git a/crates/astria-cli/src/sequencer/bridge_account.rs b/crates/astria-cli/src/sequencer/bridge_account.rs
@@ -30,11 +30,7 @@ enum SubCommand {
 #[derive(Debug, clap::Args)]
 struct Get {
     /// The url of the Sequencer node
-    #[arg(
-        long,
-        env = "SEQUENCER_URL",
-        default_value = crate::DEFAULT_SEQUENCER_RPC
-    )]
+    #[arg(long, env = "SEQUENCER_URL")]
     pub(crate) sequencer_url: String,
     /// The bridge account address on the Sequencer
     pub(crate) address: Address,

diff --git a/crates/astria-cli/src/sequencer/bridge_lock.rs b/crates/astria-cli/src/sequencer/bridge_lock.rs
@@ -34,18 +34,10 @@ pub(super) struct Command {
     #[arg(long, env = "SEQUENCER_PRIVATE_KEY")]
     private_key: String,
     /// The url of the Sequencer node
-    #[arg(
-        long,
-        env = "SEQUENCER_URL",
-        default_value = crate::DEFAULT_SEQUENCER_RPC
-    )]
+    #[arg(long, env = "SEQUENCER_URL")]
     sequencer_url: String,
     /// The chain id of the sequencing chain being used
-    #[arg(
-        long = "sequencer.chain-id",
-        env = "ROLLUP_SEQUENCER_CHAIN_ID",
-        default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID
-    )]
+    #[arg(long = "sequencer.chain-id", env = "ROLLUP_SEQUENCER_CHAIN_ID")]
     sequencer_chain_id: String,
     /// The asset to lock.
     #[arg(long, default_value = "nria")]

diff --git a/crates/astria-cli/src/sequencer/bridge_sudo_change.rs b/crates/astria-cli/src/sequencer/bridge_sudo_change.rs
@@ -39,18 +39,10 @@ pub(crate) struct Command {
     #[arg(long, env = "SEQUENCER_PRIVATE_KEY")]
     pub(crate) private_key: String,
     /// The url of the Sequencer node
-    #[arg(
-        long,
-        env = "SEQUENCER_URL",
-        default_value = crate::DEFAULT_SEQUENCER_RPC
-    )]
+    #[arg(long, env = "SEQUENCER_URL")]
     pub(crate) sequencer_url: String,
     /// The chain id of the sequencing chain being used
-    #[arg(
-        long = "sequencer.chain-id",
-        env = "ROLLUP_SEQUENCER_CHAIN_ID",
-        default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID
-    )]
+    #[arg(long = "sequencer.chain-id", env = "ROLLUP_SEQUENCER_CHAIN_ID")]
     pub(crate) sequencer_chain_id: String,
     /// The asset to pay the transfer fees with.
     #[arg(long, default_value = "nria")]

diff --git a/crates/astria-cli/src/sequencer/fee_assets.rs b/crates/astria-cli/src/sequencer/fee_assets.rs
@@ -30,11 +30,7 @@ enum SubCommand {
 #[derive(clap::Args, Debug)]
 struct Get {
     /// The url of the Sequencer node
-    #[arg(
-        long,
-        env = "SEQUENCER_URL",
-        default_value = crate::DEFAULT_SEQUENCER_RPC
-    )]
+    #[arg(long, env = "SEQUENCER_URL")]
     sequencer_url: String,
 }
 

diff --git a/crates/astria-cli/src/sequencer/ics20_withdrawal.rs b/crates/astria-cli/src/sequencer/ics20_withdrawal.rs
@@ -67,18 +67,10 @@ pub(super) struct Command {
     #[arg(long, env = "SEQUENCER_PRIVATE_KEY")]
     private_key: String,
     /// The url of the Sequencer node
-    #[arg(
-         long,
-         env = "SEQUENCER_URL",
-         default_value = crate::DEFAULT_SEQUENCER_RPC
-     )]
+    #[arg(long, env = "SEQUENCER_URL")]
     sequencer_url: String,
     /// The chain id of the sequencing chain being used
-    #[arg(
-         long = "sequencer.chain-id",
-         env = "ROLLUP_SEQUENCER_CHAIN_ID",
-         default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID
-     )]
+    #[arg(long = "sequencer.chain-id", env = "ROLLUP_SEQUENCER_CHAIN_ID")]
     sequencer_chain_id: String,
     /// The asset to withdraw
     #[arg(long, default_value = "nria")]

diff --git a/crates/astria-cli/src/sequencer/init_bridge_account.rs b/crates/astria-cli/src/sequencer/init_bridge_account.rs
@@ -22,18 +22,10 @@ pub(super) struct Command {
     #[arg(long, env = "SEQUENCER_PRIVATE_KEY")]
     private_key: String,
     /// The url of the Sequencer node
-    #[arg(
-        long,
-        env = "SEQUENCER_URL",
-        default_value = crate::DEFAULT_SEQUENCER_RPC
-    )]
+    #[arg(long, env = "SEQUENCER_URL")]
     sequencer_url: String,
     /// The chain id of the sequencing chain being used
-    #[arg(
-        long = "sequencer.chain-id",
-        env = "ROLLUP_SEQUENCER_CHAIN_ID",
-        default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID
-    )]
+    #[arg(long = "sequencer.chain-id", env = "ROLLUP_SEQUENCER_CHAIN_ID")]
     sequencer_chain_id: String,
     /// Plaintext rollup name (to be hashed into a rollup ID)
     /// to initialize the bridge account with.

diff --git a/crates/astria-cli/src/sequencer/submit.rs b/crates/astria-cli/src/sequencer/submit.rs
@@ -17,11 +17,7 @@ use color_eyre::eyre::{
 #[derive(clap::Args, Debug)]
 pub(super) struct Command {
     /// The URL at which the Sequencer node is listening for ABCI commands.
-    #[arg(
-        long,
-        env = "SEQUENCER_URL",
-        default_value = crate::DEFAULT_SEQUENCER_RPC
-    )]
+    #[arg(long, env = "SEQUENCER_URL")]
     sequencer_url: String,
     /// The source to read the pbjson formatted astra.protocol.transaction.v1.Transaction (use `-`
     /// to pass via STDIN).

diff --git a/crates/astria-cli/src/sequencer/sudo/fee_asset.rs b/crates/astria-cli/src/sequencer/sudo/fee_asset.rs
@@ -98,18 +98,10 @@ struct ArgsInner {
     #[arg(long, env = "SEQUENCER_PRIVATE_KEY")]
     private_key: String,
     /// The url of the Sequencer node
-    #[arg(
-        long,
-        env = "SEQUENCER_URL",
-        default_value = crate::DEFAULT_SEQUENCER_RPC
-    )]
+    #[arg(long, env = "SEQUENCER_URL")]
     sequencer_url: String,
     /// The chain id of the sequencing chain being used
-    #[arg(
-        long = "sequencer.chain-id",
-        env = "ROLLUP_SEQUENCER_CHAIN_ID",
-        default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID
-    )]
+    #[arg(long = "sequencer.chain-id", env = "ROLLUP_SEQUENCER_CHAIN_ID")]
     sequencer_chain_id: String,
     /// Asset's denomination string
     #[arg(long)]

diff --git a/crates/astria-cli/src/sequencer/sudo/ibc_relayer.rs b/crates/astria-cli/src/sequencer/sudo/ibc_relayer.rs
@@ -95,18 +95,10 @@ struct ArgsInner {
     #[arg(long, env = "SEQUENCER_PRIVATE_KEY")]
     private_key: String,
     /// The url of the Sequencer node
-    #[arg(
-        long,
-        env = "SEQUENCER_URL",
-        default_value = crate::DEFAULT_SEQUENCER_RPC
-    )]
+    #[arg(long, env = "SEQUENCER_URL")]
     sequencer_url: String,
     /// The chain id of the sequencing chain being used
-    #[arg(
-        long = "sequencer.chain-id",
-        env = "ROLLUP_SEQUENCER_CHAIN_ID",
-        default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID
-    )]
+    #[arg(long = "sequencer.chain-id", env = "ROLLUP_SEQUENCER_CHAIN_ID")]
     sequencer_chain_id: String,
     /// The address to add or remove as an IBC relayer
     #[arg(long)]

diff --git a/crates/astria-cli/src/sequencer/sudo/ibc_sudo_change.rs b/crates/astria-cli/src/sequencer/sudo/ibc_sudo_change.rs
@@ -24,18 +24,10 @@ pub(super) struct Command {
     #[arg(long, env = "SEQUENCER_PRIVATE_KEY")]
     private_key: String,
     /// The url of the Sequencer node
-    #[arg(
-        long,
-        env = "SEQUENCER_URL",
-        default_value = crate::DEFAULT_SEQUENCER_RPC
-    )]
+    #[arg(long, env = "SEQUENCER_URL")]
     sequencer_url: String,
     /// The chain id of the sequencing chain being used
-    #[arg(
-        long = "sequencer.chain-id",
-        env = "ROLLUP_SEQUENCER_CHAIN_ID",
-        default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID
-    )]
+    #[arg(long = "sequencer.chain-id", env = "ROLLUP_SEQUENCER_CHAIN_ID")]
     sequencer_chain_id: String,
     /// The new address to take over sudo privileges
     #[arg(long)]

diff --git a/crates/astria-cli/src/sequencer/sudo/sudo_address_change.rs b/crates/astria-cli/src/sequencer/sudo/sudo_address_change.rs
@@ -24,18 +24,10 @@ pub(super) struct Command {
     #[arg(long, env = "SEQUENCER_PRIVATE_KEY")]
     private_key: String,
     /// The url of the Sequencer node
-    #[arg(
-        long,
-        env = "SEQUENCER_URL",
-        default_value = crate::DEFAULT_SEQUENCER_RPC
-    )]
+    #[arg(long, env = "SEQUENCER_URL")]
     sequencer_url: String,
     /// The chain id of the sequencing chain being used
-    #[arg(
-        long = "sequencer.chain-id",
-        env = "ROLLUP_SEQUENCER_CHAIN_ID",
-        default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID
-    )]
+    #[arg(long = "sequencer.chain-id", env = "ROLLUP_SEQUENCER_CHAIN_ID")]
     sequencer_chain_id: String,
     /// The new address to take over sudo privileges
     #[arg(long)]

diff --git a/crates/astria-cli/src/sequencer/sudo/validator_update.rs b/crates/astria-cli/src/sequencer/sudo/validator_update.rs
@@ -12,18 +12,10 @@ use crate::utils::submit_transaction;
 #[derive(clap::Args, Debug)]
 pub(super) struct Command {
     /// The url of the Sequencer node
-    #[arg(
-        long,
-        env = "SEQUENCER_URL",
-        default_value = crate::DEFAULT_SEQUENCER_RPC
-    )]
+    #[arg(long, env = "SEQUENCER_URL")]
     sequencer_url: String,
     /// The chain id of the sequencing chain being used
-    #[arg(
-        long = "sequencer.chain-id",
-        env = "ROLLUP_SEQUENCER_CHAIN_ID",
-        default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID
-    )]
+    #[arg(long = "sequencer.chain-id", env = "ROLLUP_SEQUENCER_CHAIN_ID")]
     sequencer_chain_id: String,
     /// The bech32m prefix that will be used for constructing addresses using the private key
     #[arg(long, default_value = "astria")]

diff --git a/crates/astria-cli/src/sequencer/transfer.rs b/crates/astria-cli/src/sequencer/transfer.rs
@@ -33,18 +33,10 @@ pub(super) struct Command {
     // that overwrite the key on drop and don't reveal it when printing.
     private_key: String,
     /// The url of the Sequencer node
-    #[arg(
-        long,
-        env = "SEQUENCER_URL",
-        default_value = crate::DEFAULT_SEQUENCER_RPC
-    )]
+    #[arg(long, env = "SEQUENCER_URL")]
     sequencer_url: String,
     /// The chain id of the sequencing chain being used
-    #[arg(
-        long = "sequencer.chain-id",
-        env = "ROLLUP_SEQUENCER_CHAIN_ID",
-        default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID
-    )]
+    #[arg(long = "sequencer.chain-id", env = "ROLLUP_SEQUENCER_CHAIN_ID")]
     sequencer_chain_id: String,
     /// The asset to transer.
     #[arg(long, default_value = "nria")]