From faa6874702f1fd26c84b78262df6906f01aef333 Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Thu, 5 Jun 2025 14:47:18 -0500 Subject: [PATCH 1/5] feat: adds remaining elastic networks for gas estimation during simulation script --- crates/cli/src/utils/cmd.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/crates/cli/src/utils/cmd.rs b/crates/cli/src/utils/cmd.rs index 1396d964db8aa..4c1206b33480a 100644 --- a/crates/cli/src/utils/cmd.rs +++ b/crates/cli/src/utils/cmd.rs @@ -162,7 +162,7 @@ pub fn init_progress(len: u64, label: &str) -> indicatif::ProgressBar { /// True if the network calculates gas costs differently. pub fn has_different_gas_calc(chain_id: u64) -> bool { if let Some(chain) = Chain::from(chain_id).named() { - return chain.is_arbitrum() || + return chain.is_arbitrum() || chain.is_elastic() || matches!( chain, NamedChain::Acala | @@ -179,10 +179,7 @@ pub fn has_different_gas_calc(chain_id: u64) -> bool { NamedChain::Moonbeam | NamedChain::MoonbeamDev | NamedChain::Moonriver | - NamedChain::Metis | - NamedChain::Abstract | - NamedChain::ZkSync | - NamedChain::ZkSyncTestnet + NamedChain::Metis ); } false From c4206d05b2a07f8f701830d17935421614192798 Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Thu, 5 Jun 2025 14:52:23 -0500 Subject: [PATCH 2/5] chore: run fmt --- crates/cli/src/utils/cmd.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/cli/src/utils/cmd.rs b/crates/cli/src/utils/cmd.rs index 4c1206b33480a..a691908b5bdda 100644 --- a/crates/cli/src/utils/cmd.rs +++ b/crates/cli/src/utils/cmd.rs @@ -162,7 +162,8 @@ pub fn init_progress(len: u64, label: &str) -> indicatif::ProgressBar { /// True if the network calculates gas costs differently. pub fn has_different_gas_calc(chain_id: u64) -> bool { if let Some(chain) = Chain::from(chain_id).named() { - return chain.is_arbitrum() || chain.is_elastic() || + return chain.is_arbitrum() || + chain.is_elastic() || matches!( chain, NamedChain::Acala | From 517b522b6cd0b2050b3a952e41434623d4680a91 Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Mon, 9 Jun 2025 08:30:14 -0500 Subject: [PATCH 3/5] chore: run rustfmt --- crates/cli/src/utils/cmd.rs | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/crates/cli/src/utils/cmd.rs b/crates/cli/src/utils/cmd.rs index a691908b5bdda..e446942d1c3a8 100644 --- a/crates/cli/src/utils/cmd.rs +++ b/crates/cli/src/utils/cmd.rs @@ -162,25 +162,25 @@ pub fn init_progress(len: u64, label: &str) -> indicatif::ProgressBar { /// True if the network calculates gas costs differently. pub fn has_different_gas_calc(chain_id: u64) -> bool { if let Some(chain) = Chain::from(chain_id).named() { - return chain.is_arbitrum() || - chain.is_elastic() || - matches!( + return chain.is_arbitrum() + || chain.is_elastic() + || matches!( chain, - NamedChain::Acala | - NamedChain::AcalaMandalaTestnet | - NamedChain::AcalaTestnet | - NamedChain::Etherlink | - NamedChain::EtherlinkTestnet | - NamedChain::Karura | - NamedChain::KaruraTestnet | - NamedChain::Mantle | - NamedChain::MantleSepolia | - NamedChain::MantleTestnet | - NamedChain::Moonbase | - NamedChain::Moonbeam | - NamedChain::MoonbeamDev | - NamedChain::Moonriver | - NamedChain::Metis + NamedChain::Acala + | NamedChain::AcalaMandalaTestnet + | NamedChain::AcalaTestnet + | NamedChain::Etherlink + | NamedChain::EtherlinkTestnet + | NamedChain::Karura + | NamedChain::KaruraTestnet + | NamedChain::Mantle + | NamedChain::MantleSepolia + | NamedChain::MantleTestnet + | NamedChain::Moonbase + | NamedChain::Moonbeam + | NamedChain::MoonbeamDev + | NamedChain::Moonriver + | NamedChain::Metis ); } false @@ -393,7 +393,7 @@ pub async fn handle_traces( .sources(sources) .build(); debugger.try_run_tui()?; - return Ok(()) + return Ok(()); } decoder.debug_identifier = Some(DebugTraceIdentifier::new(sources)); From e046ec1a07bf3030602e5a5e1821c90aa0bc54ea Mon Sep 17 00:00:00 2001 From: Dustin Brickwood Date: Mon, 9 Jun 2025 08:32:53 -0500 Subject: [PATCH 4/5] chore: run rustfmt --- crates/cli/src/utils/cmd.rs | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/crates/cli/src/utils/cmd.rs b/crates/cli/src/utils/cmd.rs index e446942d1c3a8..cce1a256bb4e7 100644 --- a/crates/cli/src/utils/cmd.rs +++ b/crates/cli/src/utils/cmd.rs @@ -162,25 +162,25 @@ pub fn init_progress(len: u64, label: &str) -> indicatif::ProgressBar { /// True if the network calculates gas costs differently. pub fn has_different_gas_calc(chain_id: u64) -> bool { if let Some(chain) = Chain::from(chain_id).named() { - return chain.is_arbitrum() - || chain.is_elastic() - || matches!( + return chain.is_arbitrum() || + chain.is_elastic() || + matches!( chain, - NamedChain::Acala - | NamedChain::AcalaMandalaTestnet - | NamedChain::AcalaTestnet - | NamedChain::Etherlink - | NamedChain::EtherlinkTestnet - | NamedChain::Karura - | NamedChain::KaruraTestnet - | NamedChain::Mantle - | NamedChain::MantleSepolia - | NamedChain::MantleTestnet - | NamedChain::Moonbase - | NamedChain::Moonbeam - | NamedChain::MoonbeamDev - | NamedChain::Moonriver - | NamedChain::Metis + NamedChain::Acala | + NamedChain::AcalaMandalaTestnet | + NamedChain::AcalaTestnet | + NamedChain::Etherlink | + NamedChain::EtherlinkTestnet | + NamedChain::Karura | + NamedChain::KaruraTestnet | + NamedChain::Mantle | + NamedChain::MantleSepolia | + NamedChain::MantleTestnet | + NamedChain::Moonbase | + NamedChain::Moonbeam | + NamedChain::MoonbeamDev | + NamedChain::Moonriver | + NamedChain::Metis ); } false From 20cc15b4327d7560d6f22189595c4f1cf838b6b0 Mon Sep 17 00:00:00 2001 From: zerosnacks <95942363+zerosnacks@users.noreply.github.com> Date: Mon, 9 Jun 2025 17:02:33 +0200 Subject: [PATCH 5/5] Update crates/cli/src/utils/cmd.rs --- crates/cli/src/utils/cmd.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/cli/src/utils/cmd.rs b/crates/cli/src/utils/cmd.rs index cce1a256bb4e7..21f411d446235 100644 --- a/crates/cli/src/utils/cmd.rs +++ b/crates/cli/src/utils/cmd.rs @@ -393,7 +393,7 @@ pub async fn handle_traces( .sources(sources) .build(); debugger.try_run_tui()?; - return Ok(()); + return Ok(()) } decoder.debug_identifier = Some(DebugTraceIdentifier::new(sources));