From 2a19cdebb2948e05a25c87ef1ad9dfd8fc834dd9 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Fri, 25 Oct 2024 12:55:11 -0700 Subject: [PATCH 1/3] chore(cli): update cli to default to dusk-11 --- crates/astria-cli/src/lib.rs | 4 ++-- crates/astria-cli/src/sequencer/block_height.rs | 2 +- crates/astria-cli/src/sequencer/bridge_lock.rs | 2 +- crates/astria-cli/src/sequencer/ics20_withdrawal.rs | 2 +- crates/astria-cli/src/sequencer/init_bridge_account.rs | 2 +- crates/astria-cli/src/sequencer/sudo/fee_asset.rs | 2 +- crates/astria-cli/src/sequencer/sudo/ibc_relayer.rs | 2 +- crates/astria-cli/src/sequencer/sudo/sudo_address_change.rs | 2 +- crates/astria-cli/src/sequencer/sudo/validator_update.rs | 2 +- crates/astria-cli/src/sequencer/transfer.rs | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/crates/astria-cli/src/lib.rs b/crates/astria-cli/src/lib.rs index e4d7a90ba8..fad98a0c01 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 6e9f1df628..7c805f066a 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 884064a3bd..525ff1d297 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 c1053f9881..fda5503a16 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 9a7e806d05..ed891d6ea2 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 dff0b8ddee..7d392b7062 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 1e3d735899..080ae0a182 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 9591fb5fa7..f604c961fa 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 869769f4d9..fc20e09668 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 885a9a4e2f..e92d35c6a4 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, From e1c49a4779d121f3876295303776497849d284d3 Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Fri, 25 Oct 2024 13:17:22 -0700 Subject: [PATCH 2/3] update changelist --- crates/astria-cli/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/crates/astria-cli/CHANGELOG.md b/crates/astria-cli/CHANGELOG.md index fc5b1be487..66c77721ca 100644 --- a/crates/astria-cli/CHANGELOG.md +++ b/crates/astria-cli/CHANGELOG.md @@ -9,6 +9,10 @@ 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 From db9e918e0666baee4b713a65bad48a05cd0a5ddd Mon Sep 17 00:00:00 2001 From: Jordan Oroshiba Date: Fri, 25 Oct 2024 13:18:47 -0700 Subject: [PATCH 3/3] lint --- crates/astria-cli/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/astria-cli/CHANGELOG.md b/crates/astria-cli/CHANGELOG.md index 66c77721ca..cf667a7bbc 100644 --- a/crates/astria-cli/CHANGELOG.md +++ b/crates/astria-cli/CHANGELOG.md @@ -10,6 +10,7 @@ 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)