diff --git a/crates/astria-cli/CHANGELOG.md b/crates/astria-cli/CHANGELOG.md index fc5b1be48..cf667a7bb 100644 --- a/crates/astria-cli/CHANGELOG.md +++ b/crates/astria-cli/CHANGELOG.md @@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changes + +- Default to dusk-11 network [#1755](https://github.com/astriaorg/astria/pull/1755) +- Change env var for sequencer chain id [#1755](https://github.com/astriaorg/astria/pull/1755) + ## [0.5.1] - 2024-10-23 ### Added diff --git a/crates/astria-cli/src/lib.rs b/crates/astria-cli/src/lib.rs index e4d7a90ba..fad98a0c0 100644 --- a/crates/astria-cli/src/lib.rs +++ b/crates/astria-cli/src/lib.rs @@ -15,8 +15,8 @@ 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"; +const DEFAULT_SEQUENCER_RPC: &str = "https://rpc.sequencer.dusk-11.devnet.astria.org"; +const DEFAULT_SEQUENCER_CHAIN_ID: &str = "astria-dusk-11"; /// Run commands against the Astria network. #[derive(Debug, Parser)] diff --git a/crates/astria-cli/src/sequencer/block_height.rs b/crates/astria-cli/src/sequencer/block_height.rs index 6e9f1df62..7c805f066 100644 --- a/crates/astria-cli/src/sequencer/block_height.rs +++ b/crates/astria-cli/src/sequencer/block_height.rs @@ -39,7 +39,7 @@ struct Get { /// The chain id of the sequencing chain being used #[arg( long = "sequencer.chain-id", - env = "ROLLUP_SEQUENCER_CHAIN_ID", + env = "SEQUENCER_CHAIN_ID", default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID )] sequencer_chain_id: String, diff --git a/crates/astria-cli/src/sequencer/bridge_lock.rs b/crates/astria-cli/src/sequencer/bridge_lock.rs index 884064a3b..525ff1d29 100644 --- a/crates/astria-cli/src/sequencer/bridge_lock.rs +++ b/crates/astria-cli/src/sequencer/bridge_lock.rs @@ -43,7 +43,7 @@ pub(super) struct Command { /// The chain id of the sequencing chain being used #[arg( long = "sequencer.chain-id", - env = "ROLLUP_SEQUENCER_CHAIN_ID", + env = "SEQUENCER_CHAIN_ID", default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID )] sequencer_chain_id: String, diff --git a/crates/astria-cli/src/sequencer/ics20_withdrawal.rs b/crates/astria-cli/src/sequencer/ics20_withdrawal.rs index c1053f988..fda5503a1 100644 --- a/crates/astria-cli/src/sequencer/ics20_withdrawal.rs +++ b/crates/astria-cli/src/sequencer/ics20_withdrawal.rs @@ -76,7 +76,7 @@ pub(super) struct Command { /// The chain id of the sequencing chain being used #[arg( long = "sequencer.chain-id", - env = "ROLLUP_SEQUENCER_CHAIN_ID", + env = "SEQUENCER_CHAIN_ID", default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID )] sequencer_chain_id: String, diff --git a/crates/astria-cli/src/sequencer/init_bridge_account.rs b/crates/astria-cli/src/sequencer/init_bridge_account.rs index 9a7e806d0..ed891d6ea 100644 --- a/crates/astria-cli/src/sequencer/init_bridge_account.rs +++ b/crates/astria-cli/src/sequencer/init_bridge_account.rs @@ -31,7 +31,7 @@ pub(super) struct Command { /// The chain id of the sequencing chain being used #[arg( long = "sequencer.chain-id", - env = "ROLLUP_SEQUENCER_CHAIN_ID", + env = "SEQUENCER_CHAIN_ID", default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID )] sequencer_chain_id: String, diff --git a/crates/astria-cli/src/sequencer/sudo/fee_asset.rs b/crates/astria-cli/src/sequencer/sudo/fee_asset.rs index dff0b8dde..7d392b706 100644 --- a/crates/astria-cli/src/sequencer/sudo/fee_asset.rs +++ b/crates/astria-cli/src/sequencer/sudo/fee_asset.rs @@ -107,7 +107,7 @@ struct ArgsInner { /// The chain id of the sequencing chain being used #[arg( long = "sequencer.chain-id", - env = "ROLLUP_SEQUENCER_CHAIN_ID", + env = "SEQUENCER_CHAIN_ID", default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID )] sequencer_chain_id: String, diff --git a/crates/astria-cli/src/sequencer/sudo/ibc_relayer.rs b/crates/astria-cli/src/sequencer/sudo/ibc_relayer.rs index 1e3d73589..080ae0a18 100644 --- a/crates/astria-cli/src/sequencer/sudo/ibc_relayer.rs +++ b/crates/astria-cli/src/sequencer/sudo/ibc_relayer.rs @@ -104,7 +104,7 @@ struct ArgsInner { /// The chain id of the sequencing chain being used #[arg( long = "sequencer.chain-id", - env = "ROLLUP_SEQUENCER_CHAIN_ID", + env = "SEQUENCER_CHAIN_ID", default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID )] sequencer_chain_id: String, diff --git a/crates/astria-cli/src/sequencer/sudo/sudo_address_change.rs b/crates/astria-cli/src/sequencer/sudo/sudo_address_change.rs index 9591fb5fa..f604c961f 100644 --- a/crates/astria-cli/src/sequencer/sudo/sudo_address_change.rs +++ b/crates/astria-cli/src/sequencer/sudo/sudo_address_change.rs @@ -33,7 +33,7 @@ pub(super) struct Command { /// The chain id of the sequencing chain being used #[arg( long = "sequencer.chain-id", - env = "ROLLUP_SEQUENCER_CHAIN_ID", + env = "SEQUENCER_CHAIN_ID", default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID )] sequencer_chain_id: String, diff --git a/crates/astria-cli/src/sequencer/sudo/validator_update.rs b/crates/astria-cli/src/sequencer/sudo/validator_update.rs index 869769f4d..fc20e0966 100644 --- a/crates/astria-cli/src/sequencer/sudo/validator_update.rs +++ b/crates/astria-cli/src/sequencer/sudo/validator_update.rs @@ -21,7 +21,7 @@ pub(super) struct Command { /// The chain id of the sequencing chain being used #[arg( long = "sequencer.chain-id", - env = "ROLLUP_SEQUENCER_CHAIN_ID", + env = "SEQUENCER_CHAIN_ID", default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID )] sequencer_chain_id: String, diff --git a/crates/astria-cli/src/sequencer/transfer.rs b/crates/astria-cli/src/sequencer/transfer.rs index 885a9a4e2..e92d35c6a 100644 --- a/crates/astria-cli/src/sequencer/transfer.rs +++ b/crates/astria-cli/src/sequencer/transfer.rs @@ -42,7 +42,7 @@ pub(super) struct Command { /// The chain id of the sequencing chain being used #[arg( long = "sequencer.chain-id", - env = "ROLLUP_SEQUENCER_CHAIN_ID", + env = "SEQUENCER_CHAIN_ID", default_value = crate::DEFAULT_SEQUENCER_CHAIN_ID )] sequencer_chain_id: String,