From 49c94b4dc946bb00510503cf16744d02c8fbbb4d Mon Sep 17 00:00:00 2001 From: Oliver Nordbjerg Date: Fri, 21 Jun 2024 23:38:23 +0200 Subject: [PATCH 1/4] feat: add eip-7251 system contract address/code --- crates/eips/src/eip7251.rs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/crates/eips/src/eip7251.rs b/crates/eips/src/eip7251.rs index 27c51210345..c4784c77fc1 100644 --- a/crates/eips/src/eip7251.rs +++ b/crates/eips/src/eip7251.rs @@ -4,9 +4,19 @@ #![allow(unknown_lints, non_local_definitions)] // TODO: remove when proptest-derive updates -use alloy_primitives::{Address, FixedBytes}; +use alloy_primitives::{address, bytes, Address, Bytes, FixedBytes}; use alloy_rlp::{RlpDecodable, RlpEncodable}; +/// The address for the EIP-7251 consolidation requests contract. +pub const CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS: Address = + address!("00b42dbF2194e931E80326D950320f7d9Dbeac02"); + +/// The code for the EIP-7251 consolidation requests contract. +pub static CONSOLIDATIONL_REQUEST_PREDEPLOY_CODE: Bytes = bytes!("0f5f395ff33373fffffffffffffffffffffffffffffffffffffffe146098573615156028575f545f5260205ff35b36606014156101445760115f54600182026001905f5b5f82111560595781019083028483029004916001019190603e565b90939004341061014457600154600101600155600354806004026004013381556001015f35815560010160203581556001016040359055600101600355005b6003546002548082038060011160ac575060015b5f5b81811460f15780607402838201600402600401805490600101805490600101805490600101549260601b84529083601401528260340152906054015260010160ae565b9101809214610103579060025561010e565b90505f6002555f6003555b5f548061049d141561011d57505f5b6001546001828201116101325750505f610138565b01600190035b5f555f6001556074025ff35b5f5ffd"); + +/// The [EIP-7685](https://eips.ethereum.org/EIPS/eip-7685) request type for consolidation requests. +pub const CONSOLIDATION_REQUEST_TYPE: u8 = 0x02; + /// This structure maps onto the consolidation request object from [EIP-7251](https://eips.ethereum.org/EIPS/eip-7251). #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, RlpEncodable, RlpDecodable, Default)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] From eaa7e903a644a665611fd44ad11ec70dbda4278f Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 21 Jun 2024 23:49:46 +0200 Subject: [PATCH 2/4] chore: typo Co-authored-by: DaniPopes <57450786+DaniPopes@users.noreply.github.com> --- crates/eips/src/eip7251.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/eips/src/eip7251.rs b/crates/eips/src/eip7251.rs index c4784c77fc1..561ffa45e32 100644 --- a/crates/eips/src/eip7251.rs +++ b/crates/eips/src/eip7251.rs @@ -12,7 +12,7 @@ pub const CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS: Address = address!("00b42dbF2194e931E80326D950320f7d9Dbeac02"); /// The code for the EIP-7251 consolidation requests contract. -pub static CONSOLIDATIONL_REQUEST_PREDEPLOY_CODE: Bytes = bytes!("0f5f395ff33373fffffffffffffffffffffffffffffffffffffffe146098573615156028575f545f5260205ff35b36606014156101445760115f54600182026001905f5b5f82111560595781019083028483029004916001019190603e565b90939004341061014457600154600101600155600354806004026004013381556001015f35815560010160203581556001016040359055600101600355005b6003546002548082038060011160ac575060015b5f5b81811460f15780607402838201600402600401805490600101805490600101805490600101549260601b84529083601401528260340152906054015260010160ae565b9101809214610103579060025561010e565b90505f6002555f6003555b5f548061049d141561011d57505f5b6001546001828201116101325750505f610138565b01600190035b5f555f6001556074025ff35b5f5ffd"); +pub static CONSOLIDATION_REQUEST_PREDEPLOY_CODE: Bytes = bytes!("0f5f395ff33373fffffffffffffffffffffffffffffffffffffffe146098573615156028575f545f5260205ff35b36606014156101445760115f54600182026001905f5b5f82111560595781019083028483029004916001019190603e565b90939004341061014457600154600101600155600354806004026004013381556001015f35815560010160203581556001016040359055600101600355005b6003546002548082038060011160ac575060015b5f5b81811460f15780607402838201600402600401805490600101805490600101805490600101549260601b84529083601401528260340152906054015260010160ae565b9101809214610103579060025561010e565b90505f6002555f6003555b5f548061049d141561011d57505f5b6001546001828201116101325750505f610138565b01600190035b5f555f6001556074025ff35b5f5ffd"); /// The [EIP-7685](https://eips.ethereum.org/EIPS/eip-7685) request type for consolidation requests. pub const CONSOLIDATION_REQUEST_TYPE: u8 = 0x02; From f4545562e23261a92466c743365eb87bebe576b8 Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 21 Jun 2024 23:49:59 +0200 Subject: [PATCH 3/4] chore: nit Co-authored-by: Matthias Seitz --- crates/eips/src/eip7251.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/eips/src/eip7251.rs b/crates/eips/src/eip7251.rs index 561ffa45e32..d5414afaeb9 100644 --- a/crates/eips/src/eip7251.rs +++ b/crates/eips/src/eip7251.rs @@ -7,7 +7,7 @@ use alloy_primitives::{address, bytes, Address, Bytes, FixedBytes}; use alloy_rlp::{RlpDecodable, RlpEncodable}; -/// The address for the EIP-7251 consolidation requests contract. +/// The address for the EIP-7251 consolidation requests contract: `0x00b42dbF2194e931E80326D950320f7d9Dbeac02` pub const CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS: Address = address!("00b42dbF2194e931E80326D950320f7d9Dbeac02"); From 8c0fccee36e8fcfe834aa162224c43ee0c62abd3 Mon Sep 17 00:00:00 2001 From: Oliver Nordbjerg Date: Fri, 21 Jun 2024 23:51:01 +0200 Subject: [PATCH 4/4] chore: fmt --- crates/eips/src/eip7251.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/eips/src/eip7251.rs b/crates/eips/src/eip7251.rs index d5414afaeb9..b135f89bdb6 100644 --- a/crates/eips/src/eip7251.rs +++ b/crates/eips/src/eip7251.rs @@ -7,7 +7,8 @@ use alloy_primitives::{address, bytes, Address, Bytes, FixedBytes}; use alloy_rlp::{RlpDecodable, RlpEncodable}; -/// The address for the EIP-7251 consolidation requests contract: `0x00b42dbF2194e931E80326D950320f7d9Dbeac02` +/// The address for the EIP-7251 consolidation requests contract: +/// `0x00b42dbF2194e931E80326D950320f7d9Dbeac02` pub const CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS: Address = address!("00b42dbF2194e931E80326D950320f7d9Dbeac02");