Modify EIP-3607 restrictions to account for EIP-7702 delegations

.gitignore

@@ -13,12 +13,15 @@ pwasm-libc/Cargo.lock
 node/runtime/wasm/target/
 **/._*
 **/.criterion/
-.vscode
 polkadot.*
 .DS_Store
-.idea/
 .cargo-remote.toml
 
+# Editors
+.vscode
+.idea/
+.zed
+
 # Added by cargo
 /target
 

Cargo.toml

@@ -59,7 +59,7 @@ derive_more = "1.0"
 environmental = { version = "1.1.4", default-features = false }
 ethereum = { version = "0.18.2", default-features = false }
 ethereum-types = { version = "0.15", default-features = false }
-evm = { version = "0.43.2", default-features = false }
+evm = { git = "https://github.com/rust-ethereum/evm.git", branch = "v0.x", default-features = false }
 futures = "0.3.31"
 hash-db = { version = "0.16.0", default-features = false }
 hex = { version = "0.4.3", default-features = false, features = ["alloc"] }

frame/ethereum/src/lib.rs

@@ -559,12 +559,23 @@ impl<T: Config> Pallet<T> {
 
 		// EIP-3607: https://eips.ethereum.org/EIPS/eip-3607
 		// Do not allow transactions for which `tx.sender` has any code deployed.
+		// Exception: Allow transactions from EOAs whose code is a valid delegation indicator (0xef0100 || address).
 		//
 		// This check should be done on the transaction validation (here) **and**
 		// on transaction execution, otherwise a contract tx will be included in
 		// the mempool and pollute the mempool forever.
-		if !pallet_evm::AccountCodes::<T>::get(origin).is_empty() {
-			return Err(InvalidTransaction::BadSigner.into());
+		if let Some(metadata) = pallet_evm::AccountCodesMetadata::<T>::get(origin) {
+			if metadata.size > 0 {
+				// Account has code, check if it's a valid delegation
+				let is_delegation = metadata.size
+					== evm::delegation::EIP_7702_DELEGATION_SIZE as u64
+					&& pallet_evm::AccountCodes::<T>::get(origin)
+						.starts_with(evm::delegation::EIP_7702_DELEGATION_PREFIX);
+
+				if !is_delegation {
+					return Err(InvalidTransaction::BadSigner.into());
+				}
+			}
 		}
 
 		let priority = match (