chore(papyrus_base_layer): move default anvil l1 account address to common place (#6131)

Author: ArniStarkware

Cargo.lock

@@ -33,7 +33,6 @@ apollo_l1_provider_types = { workspace = true, features = ["testing"] }
 apollo_state_sync_types = { workspace = true, features = ["testing"] }
 assert_matches.workspace = true
 itertools.workspace = true
-mempool_test_utils.workspace = true
 papyrus_base_layer = { workspace = true, features = ["testing"] }
 pretty_assertions.workspace = true
 rstest.workspace = true

crates/apollo_l1_provider/Cargo.toml

@@ -9,7 +9,6 @@ use apollo_l1_provider_types::{Event, L1ProviderClient, MockL1ProviderClient};
 use apollo_state_sync_types::communication::MockStateSyncClient;
 use apollo_state_sync_types::state_sync_types::SyncBlock;
 use itertools::Itertools;
-use mempool_test_utils::starknet_api_test_utils::DEFAULT_ANVIL_L1_ACCOUNT_ADDRESS;
 use papyrus_base_layer::ethereum_base_layer_contract::{
     EthereumBaseLayerConfig,
     EthereumBaseLayerContract,
@@ -18,6 +17,7 @@ use papyrus_base_layer::ethereum_base_layer_contract::{
 use papyrus_base_layer::test_utils::{
     anvil_instance_from_config,
     ethereum_base_layer_config_for_anvil,
+    DEFAULT_ANVIL_L1_ACCOUNT_ADDRESS,
 };
 use papyrus_base_layer::MockBaseLayerContract;
 use starknet_api::block::BlockNumber;

crates/apollo_l1_provider/src/l1_scraper_tests.rs

@@ -9,6 +9,7 @@ use blockifier_test_utils::cairo_versions::{CairoVersion, RunnableCairo1};
 use blockifier_test_utils::calldata::create_trivial_calldata;
 use blockifier_test_utils::contracts::FeatureContract;
 use papyrus_base_layer::ethereum_base_layer_contract::L1ToL2MessageArgs;
+use papyrus_base_layer::test_utils::DEFAULT_ANVIL_L1_ACCOUNT_ADDRESS;
 use starknet_api::abi::abi_utils::selector_from_name;
 use starknet_api::block::GasPrice;
 use starknet_api::core::{ClassHash, CompiledClassHash, ContractAddress, Nonce};
@@ -54,12 +55,6 @@ pub const VALID_L1_DATA_GAS_MAX_PRICE_PER_UNIT: u128 = 100000000000;
 pub const VALID_ACCOUNT_BALANCE: Fee =
     Fee(VALID_L2_GAS_MAX_AMOUNT as u128 * VALID_L2_GAS_MAX_PRICE_PER_UNIT * 1000);
 
-// Default funded account, there are more fixed funded accounts,
-// see https://github.com/foundry-rs/foundry/tree/master/crates/anvil.
-// This address is the sender address of messages sent to L2 by Anvil.
-pub const DEFAULT_ANVIL_L1_ACCOUNT_ADDRESS: StarkHash =
-    StarkHash::from_hex_unchecked("0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266");
-
 // Utils.
 
 // TODO(Noam): Merge this into test_valid_resource_bounds

crates/mempool_test_utils/src/starknet_api_test_utils.rs

@@ -2,7 +2,6 @@ use assert_matches::assert_matches;
 use pretty_assertions::assert_eq;
 use starknet_api::block::{BlockHash, BlockHashAndNumber, BlockNumber};
 use starknet_api::core::EntryPointSelector;
-use starknet_api::hash::StarkHash;
 use starknet_api::transaction::L1HandlerTransaction;
 use starknet_api::{calldata, contract_address, felt};
 
@@ -17,6 +16,7 @@ use crate::test_utils::{
     anvil_instance_from_config,
     ethereum_base_layer_config_for_anvil,
     get_test_ethereum_node,
+    DEFAULT_ANVIL_L1_ACCOUNT_ADDRESS,
 };
 use crate::{BaseLayerContract, L1Event};
 
@@ -120,9 +120,6 @@ async fn events_from_other_contract() {
         "The two contracts should be different."
     );
 
-    // TODO(Arni): This constant is defined somewhere else. Move it to a share location and use it.
-    pub const DEFAULT_ANVIL_L1_ACCOUNT_ADDRESS: StarkHash =
-        StarkHash::from_hex_unchecked("0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266");
     let this_l1_handler = L1HandlerTransaction {
         contract_address: contract_address!("0x12"),
         entry_point_selector: EntryPointSelector(felt!("0x34")),

crates/papyrus_base_layer/src/base_layer_test.rs

@@ -9,6 +9,7 @@ use alloy::providers::Provider;
 use alloy::rpc::types::TransactionRequest;
 use colored::*;
 use ethers::utils::{Ganache, GanacheInstance};
+use starknet_api::hash::StarkHash;
 use tar::Archive;
 use tempfile::{tempdir, TempDir};
 use tracing::info;
@@ -33,6 +34,12 @@ const DEFAULT_ANVIL_PORT: u16 = 8545;
 pub const DEFAULT_ANVIL_L1_DEPLOYED_ADDRESS: &str = "0x5fbdb2315678afecb367f032d93f642f64180aa3";
 pub const DEFAULT_ANVIL_ADDITIONAL_ADDRESS_INDEX: usize = 3;
 
+// Default funded account, there are more fixed funded accounts,
+// see https://github.com/foundry-rs/foundry/tree/master/crates/anvil.
+// This address is the sender address of messages sent to L2 by Anvil.
+pub const DEFAULT_ANVIL_L1_ACCOUNT_ADDRESS: StarkHash =
+    StarkHash::from_hex_unchecked("0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266");
+
 // Returns a Ganache instance, preset with a Starknet core contract and some state updates:
 // Starknet contract address: 0xe2aF2c1AE11fE13aFDb7598D0836398108a4db0A
 //     Ethereum block number   starknet block number   starknet block hash