From 4079781e8a85e089c75830b85fa5566aa0a89880 Mon Sep 17 00:00:00 2001 From: Pawan Dhananjay Date: Mon, 27 May 2024 17:01:38 +0530 Subject: [PATCH 1/3] Rename deploy_block.txt to deposit_contract_block.txt --- common/eth2_config/src/lib.rs | 2 +- .../chiado/{deploy_block.txt => deposit_contract_block.txt} | 0 .../gnosis/{deploy_block.txt => deposit_contract_block.txt} | 0 .../holesky/{deploy_block.txt => deposit_contract_block.txt} | 0 .../mainnet/{deploy_block.txt => deposit_contract_block.txt} | 0 .../sepolia/{deploy_block.txt => deposit_contract_block.txt} | 0 common/eth2_network_config/src/lib.rs | 2 +- 7 files changed, 2 insertions(+), 2 deletions(-) rename common/eth2_network_config/built_in_network_configs/chiado/{deploy_block.txt => deposit_contract_block.txt} (100%) rename common/eth2_network_config/built_in_network_configs/gnosis/{deploy_block.txt => deposit_contract_block.txt} (100%) rename common/eth2_network_config/built_in_network_configs/holesky/{deploy_block.txt => deposit_contract_block.txt} (100%) rename common/eth2_network_config/built_in_network_configs/mainnet/{deploy_block.txt => deposit_contract_block.txt} (100%) rename common/eth2_network_config/built_in_network_configs/sepolia/{deploy_block.txt => deposit_contract_block.txt} (100%) diff --git a/common/eth2_config/src/lib.rs b/common/eth2_config/src/lib.rs index bf707c4d17b..e29953c9d5b 100644 --- a/common/eth2_config/src/lib.rs +++ b/common/eth2_config/src/lib.rs @@ -192,7 +192,7 @@ macro_rules! define_net { config_dir: ETH2_NET_DIR.config_dir, genesis_state_source: ETH2_NET_DIR.genesis_state_source, config: $this_crate::$include_file!($this_crate, "../", "config.yaml"), - deploy_block: $this_crate::$include_file!($this_crate, "../", "deploy_block.txt"), + deploy_block: $this_crate::$include_file!($this_crate, "../", "deposit_contract_block.txt"), boot_enr: $this_crate::$include_file!($this_crate, "../", "boot_enr.yaml"), genesis_state_bytes: $this_crate::$include_file!($this_crate, "../", "genesis.ssz"), } diff --git a/common/eth2_network_config/built_in_network_configs/chiado/deploy_block.txt b/common/eth2_network_config/built_in_network_configs/chiado/deposit_contract_block.txt similarity index 100% rename from common/eth2_network_config/built_in_network_configs/chiado/deploy_block.txt rename to common/eth2_network_config/built_in_network_configs/chiado/deposit_contract_block.txt diff --git a/common/eth2_network_config/built_in_network_configs/gnosis/deploy_block.txt b/common/eth2_network_config/built_in_network_configs/gnosis/deposit_contract_block.txt similarity index 100% rename from common/eth2_network_config/built_in_network_configs/gnosis/deploy_block.txt rename to common/eth2_network_config/built_in_network_configs/gnosis/deposit_contract_block.txt diff --git a/common/eth2_network_config/built_in_network_configs/holesky/deploy_block.txt b/common/eth2_network_config/built_in_network_configs/holesky/deposit_contract_block.txt similarity index 100% rename from common/eth2_network_config/built_in_network_configs/holesky/deploy_block.txt rename to common/eth2_network_config/built_in_network_configs/holesky/deposit_contract_block.txt diff --git a/common/eth2_network_config/built_in_network_configs/mainnet/deploy_block.txt b/common/eth2_network_config/built_in_network_configs/mainnet/deposit_contract_block.txt similarity index 100% rename from common/eth2_network_config/built_in_network_configs/mainnet/deploy_block.txt rename to common/eth2_network_config/built_in_network_configs/mainnet/deposit_contract_block.txt diff --git a/common/eth2_network_config/built_in_network_configs/sepolia/deploy_block.txt b/common/eth2_network_config/built_in_network_configs/sepolia/deposit_contract_block.txt similarity index 100% rename from common/eth2_network_config/built_in_network_configs/sepolia/deploy_block.txt rename to common/eth2_network_config/built_in_network_configs/sepolia/deposit_contract_block.txt diff --git a/common/eth2_network_config/src/lib.rs b/common/eth2_network_config/src/lib.rs index 1ead9a6bde8..95cb2acd40e 100644 --- a/common/eth2_network_config/src/lib.rs +++ b/common/eth2_network_config/src/lib.rs @@ -29,7 +29,7 @@ use url::Url; pub use eth2_config::GenesisStateSource; -pub const DEPLOY_BLOCK_FILE: &str = "deploy_block.txt"; +pub const DEPLOY_BLOCK_FILE: &str = "deposit_contract_block.txt"; pub const BOOT_ENR_FILE: &str = "boot_enr.yaml"; pub const GENESIS_STATE_FILE: &str = "genesis.ssz"; pub const BASE_CONFIG_FILE: &str = "config.yaml"; From ac93cbcf3d5b9afde075773793b0d1c4e30c99bd Mon Sep 17 00:00:00 2001 From: Pawan Dhananjay Date: Mon, 27 May 2024 17:14:49 +0530 Subject: [PATCH 2/3] fmt --- common/eth2_config/src/lib.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/eth2_config/src/lib.rs b/common/eth2_config/src/lib.rs index e29953c9d5b..e41ba0ad431 100644 --- a/common/eth2_config/src/lib.rs +++ b/common/eth2_config/src/lib.rs @@ -192,7 +192,11 @@ macro_rules! define_net { config_dir: ETH2_NET_DIR.config_dir, genesis_state_source: ETH2_NET_DIR.genesis_state_source, config: $this_crate::$include_file!($this_crate, "../", "config.yaml"), - deploy_block: $this_crate::$include_file!($this_crate, "../", "deposit_contract_block.txt"), + deploy_block: $this_crate::$include_file!( + $this_crate, + "../", + "deposit_contract_block.txt" + ), boot_enr: $this_crate::$include_file!($this_crate, "../", "boot_enr.yaml"), genesis_state_bytes: $this_crate::$include_file!($this_crate, "../", "genesis.ssz"), } From c9a9ef99bece514d75f2cf820d113bf124dbee93 Mon Sep 17 00:00:00 2001 From: Pawan Dhananjay Date: Tue, 28 May 2024 12:42:41 +0530 Subject: [PATCH 3/3] Change for prater too --- .../prater/{deploy_block.txt => deposit_contract_block.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename common/eth2_network_config/built_in_network_configs/prater/{deploy_block.txt => deposit_contract_block.txt} (100%) diff --git a/common/eth2_network_config/built_in_network_configs/prater/deploy_block.txt b/common/eth2_network_config/built_in_network_configs/prater/deposit_contract_block.txt similarity index 100% rename from common/eth2_network_config/built_in_network_configs/prater/deploy_block.txt rename to common/eth2_network_config/built_in_network_configs/prater/deposit_contract_block.txt