Support Dencun consensus upgrade

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "contracts/lib/prb-math"]
 	path = contracts/lib/prb-math
 	url = https://github.com/PaulRBerg/prb-math
+[submodule "lodestar"]
+	path = lodestar
+	url = https://github.com/Snowfork/lodestar

_typos.toml

@@ -10,4 +10,7 @@ extend-exclude = [
     "polkadot-sdk/**",
     "smoketest/src/parachains",
     "smoketest/src/contracts",
+    "lodestar/**",
+    "go-ethereum/**",
+    "go.work.sum",
 ]

flake.nix

@@ -38,7 +38,8 @@
 
                     # typescript
                     nodePackages.pnpm
-                    nodejs-18_x
+                    nodePackages.yarn
+                    nodejs_20
 
                     # ethereum
                     foundry-bin

parachain/pallets/ethereum-client/src/benchmarking/fixtures_mainnet.rs

@@ -4,7 +4,7 @@ use crate::{CheckpointUpdate, ExecutionHeaderUpdate, Update};
 use hex_literal::hex;
 use primitives::{
 	updates::AncestryProof, BeaconHeader, ExecutionPayloadHeader, NextSyncCommitteeUpdate,
-	SyncAggregate, SyncCommittee,
+	SyncAggregate, SyncCommittee, VersionedExecutionPayloadHeader,
 };
 use sp_core::U256;
 use sp_std::{boxed::Box, vec};
@@ -1188,7 +1188,7 @@ pub fn make_execution_header_update() -> Box<ExecutionHeaderUpdate> {
             ],
             finalized_block_root: hex!("b4802863fc1d32778211ce6aac8109c73c516a003213f4f5333c80472d08fe4e").into(),
         }),
-        execution_header: ExecutionPayloadHeader {
+        execution_header: VersionedExecutionPayloadHeader::Capella(ExecutionPayloadHeader {
             parent_hash: hex!("9cffcba69c88a619483e13864704dde5db80e05f8d49018f615395ce09cd24ab").into(),
             fee_recipient: hex!("ff58d746a67c2e42bcc07d6b3f58406e8837e883").into(),
             state_root: hex!("6a4aafc93626778475a416721104229035e91f0db788d0099b57e756cd272f0a").into(),
@@ -1204,7 +1204,7 @@ pub fn make_execution_header_update() -> Box<ExecutionHeaderUpdate> {
             block_hash: hex!("795021134c2b7f9c00b498ff7b0971dbbe061561868f702d8ca68a05e5eb5a99").into(),
             transactions_root: hex!("3cb7c92fde5d511cc90cd67e375c4388794f4c01e375e8e8a06d003b5593fd12").into(),
             withdrawals_root: hex!("5f5155fd8e5cd24b7ecb1e039792b0caff01dfda2990786d9ffc88325b5d1ea8").into(),
-        },
+        }),
         execution_branch: vec![
             hex!("85ff3d1c2bc3dcdd5543bcd29a1224c6a8c24875224fbb1e3b69f0515ffaacda").into(),
             hex!("336488033fe5f3ef4ccc12af07b9370b92e553e35ecb4a337a1b1c0e4afe1e0e").into(),

parachain/pallets/ethereum-client/src/benchmarking/fixtures_minimal.rs

@@ -4,7 +4,7 @@ use crate::{CheckpointUpdate, ExecutionHeaderUpdate, Update};
 use hex_literal::hex;
 use primitives::{
 	updates::AncestryProof, BeaconHeader, ExecutionPayloadHeader, NextSyncCommitteeUpdate,
-	SyncAggregate, SyncCommittee,
+	SyncAggregate, SyncCommittee, VersionedExecutionPayloadHeader,
 };
 use sp_core::U256;
 use sp_std::{boxed::Box, vec};
@@ -221,7 +221,7 @@ pub fn make_execution_header_update() -> Box<ExecutionHeaderUpdate> {
             ],
             finalized_block_root: hex!("be7d9cc4483ed0065fc7c32e2a783ca3782d8dbd7bfe899fd7c0bcee82f11629").into(),
         }),
-        execution_header: ExecutionPayloadHeader {
+        execution_header: VersionedExecutionPayloadHeader::Capella(ExecutionPayloadHeader {
             parent_hash: hex!("96b27b6e0919c19a70c4a2f7136fd59d2e63a3ba0453a86775add3f2dd681cea").into(),
             fee_recipient: hex!("0000000000000000000000000000000000000000").into(),
             state_root: hex!("b847ee60946ebdb5bd92c22385da44b8a9aea4c6779f1a1402cc06e22b76fb4a").into(),
@@ -237,7 +237,7 @@ pub fn make_execution_header_update() -> Box<ExecutionHeaderUpdate> {
             block_hash: hex!("1871ded7b2b8b4b5b358c904104704811b15aeefc24e49daa2a1a68176d6553a").into(),
             transactions_root: hex!("7ffe241ea60187fdb0187bfa22de35d1f9bed7ab061d9401fd47e34a54fbede1").into(),
             withdrawals_root: hex!("28ba1834a3a7b657460ce79fa3a1d909ab8828fd557659d4d0554a9bdbc0ec30").into(),
-        },
+        }),
         execution_branch: vec![
             hex!("276d006ecfe51451787321ef00417b194e90b35d4106bd7d51372f39918a4531").into(),
             hex!("336488033fe5f3ef4ccc12af07b9370b92e553e35ecb4a337a1b1c0e4afe1e0e").into(),

parachain/pallets/ethereum-client/src/benchmarking/mod.rs

@@ -79,7 +79,7 @@ mod benchmarks {
 		let checkpoint_update = make_checkpoint();
 		let finalized_header_update = make_finalized_header_update();
 		let execution_header_update = make_execution_header_update();
-		let execution_header_hash = execution_header_update.execution_header.block_hash;
+		let execution_header_hash = execution_header_update.execution_header.block_hash();
 		EthereumBeaconClient::<T>::process_checkpoint_update(&checkpoint_update)?;
 		EthereumBeaconClient::<T>::process_update(&finalized_header_update)?;
 

parachain/pallets/ethereum-client/src/lib.rs

@@ -552,7 +552,7 @@ pub mod pallet {
 			let latest_execution_state: ExecutionHeaderState = Self::latest_execution_state();
 			ensure!(
 				latest_execution_state.block_number == 0 ||
-					update.execution_header.block_number ==
+					update.execution_header.block_number() ==
 						latest_execution_state.block_number + 1,
 				Error::<T>::ExecutionHeaderSkippedBlock
 			);
@@ -603,7 +603,7 @@ pub mod pallet {
 			}
 
 			Self::store_execution_header(
-				update.execution_header.block_hash,
+				update.execution_header.block_hash(),
 				update.execution_header.clone().into(),
 				update.header.slot,
 				block_root,
@@ -786,6 +786,9 @@ pub mod pallet {
 
 		/// Returns the fork version based on the current epoch.
 		pub(super) fn select_fork_version(fork_versions: &ForkVersions, epoch: u64) -> ForkVersion {
+			if epoch >= fork_versions.deneb.epoch {
+				return fork_versions.deneb.version
+			}
 			if epoch >= fork_versions.capella.epoch {
 				return fork_versions.capella.version
 			}
@@ -795,7 +798,6 @@ pub mod pallet {
 			if epoch >= fork_versions.altair.epoch {
 				return fork_versions.altair.version
 			}
-
 			fork_versions.genesis.version
 		}
 

parachain/pallets/ethereum-client/src/mock.rs

@@ -155,7 +155,7 @@ pub mod minimal {
 
 	parameter_types! {
 		pub const ExecutionHeadersPruneThreshold: u32 = 10;
-		pub const ChainForkVersions: ForkVersions = ForkVersions{
+		pub const ChainForkVersions: ForkVersions = ForkVersions {
 			genesis: Fork {
 				version: [0, 0, 0, 1], // 0x00000001
 				epoch: 0,
@@ -172,6 +172,10 @@ pub mod minimal {
 				version: [3, 0, 0, 1], // 0x03000001
 				epoch: 0,
 			},
+			deneb: Fork {
+				version: [4, 0, 0, 1], // 0x04000001
+				epoch: 4294967295,
+			},
 		};
 	}
 
@@ -263,6 +267,10 @@ pub mod mainnet {
 				version: [144, 0, 0, 114], // 0x90000072
 				epoch: 56832,
 			},
+			deneb: Fork {
+				version: [144, 0, 0, 115], // 0x90000073
+				epoch: 4294967295,
+			}
 		};
 		pub const ExecutionHeadersPruneThreshold: u32 = 8192;
 	}

parachain/pallets/ethereum-client/src/tests.rs

@@ -27,6 +27,7 @@ use frame_support::{assert_err, assert_noop, assert_ok};
 use hex_literal::hex;
 use primitives::{
 	CompactExecutionHeader, ExecutionHeaderState, Fork, ForkVersions, NextSyncCommitteeUpdate,
+	VersionedExecutionPayloadHeader,
 };
 use rand::{thread_rng, Rng};
 use snowbridge_core::{
@@ -280,6 +281,7 @@ fn compute_fork_version() {
 		altair: Fork { version: [0, 0, 0, 1], epoch: 10 },
 		bellatrix: Fork { version: [0, 0, 0, 2], epoch: 20 },
 		capella: Fork { version: [0, 0, 0, 3], epoch: 30 },
+		deneb: Fork { version: [0, 0, 0, 4], epoch: 40 },
 	};
 	new_tester().execute_with(|| {
 		assert_eq!(EthereumBeaconClient::select_fork_version(&mock_fork_versions, 0), [0, 0, 0, 0]);
@@ -740,7 +742,7 @@ fn submit_execution_header_update() {
 			Box::new(execution_header_update.clone())
 		));
 		assert!(<ExecutionHeaders<Test>>::contains_key(
-			execution_header_update.execution_header.block_hash
+			execution_header_update.execution_header.block_hash()
 		));
 	});
 }
@@ -799,8 +801,23 @@ fn submit_execution_header_update_that_skips_block() {
 	let finalized_header_update = load_finalized_header_update_fixture();
 	let execution_header_update = load_execution_header_update_fixture();
 	let mut skipped_block_execution_header_update = load_execution_header_update_fixture();
-	skipped_block_execution_header_update.execution_header.block_number =
-		execution_header_update.execution_header.block_number + 2;
+	let mut skipped_execution_header =
+		skipped_block_execution_header_update.execution_header.clone();
+
+	skipped_execution_header = match skipped_execution_header {
+		VersionedExecutionPayloadHeader::Capella(execution_payload_header) => {
+			let mut mut_execution_payload_header = execution_payload_header.clone();
+			mut_execution_payload_header.block_number = execution_payload_header.block_number + 2;
+			VersionedExecutionPayloadHeader::Capella(mut_execution_payload_header)
+		},
+		VersionedExecutionPayloadHeader::Deneb(execution_payload_header) => {
+			let mut mut_execution_payload_header = execution_payload_header.clone();
+			mut_execution_payload_header.block_number = execution_payload_header.block_number + 2;
+			VersionedExecutionPayloadHeader::Deneb(mut_execution_payload_header)
+		},
+	};
+
+	skipped_block_execution_header_update.execution_header = skipped_execution_header;
 
 	new_tester().execute_with(|| {
 		assert_ok!(EthereumBeaconClient::process_checkpoint_update(&checkpoint));
@@ -813,7 +830,7 @@ fn submit_execution_header_update_that_skips_block() {
 			Box::new(execution_header_update.clone())
 		));
 		assert!(<ExecutionHeaders<Test>>::contains_key(
-			execution_header_update.execution_header.block_hash
+			execution_header_update.execution_header.block_hash()
 		));
 		assert_err!(
 			EthereumBeaconClient::submit_execution_header(

parachain/pallets/ethereum-client/tests/fixtures/execution-header-update.mainnet.json

@@ -25,21 +25,23 @@
     "finalized_block_root": "0xb4802863fc1d32778211ce6aac8109c73c516a003213f4f5333c80472d08fe4e"
   },
   "execution_header": {
-    "parent_hash": "0x9cffcba69c88a619483e13864704dde5db80e05f8d49018f615395ce09cd24ab",
-    "fee_recipient": "0xff58d746a67c2e42bcc07d6b3f58406e8837e883",
-    "state_root": "0x6a4aafc93626778475a416721104229035e91f0db788d0099b57e756cd272f0a",
-    "receipts_root": "0xe1ce670bdcf9acf4c62fee845cd7e81eabbb6db9ddbff56130020c6cf999a45d",
-    "logs_bloom": "0xa000980408008000328c1458805c005048b84812c134200090b40428568108a0648090105085100301844800090802484420800d020282019002040d083004031a20420240a4a8900a43296938c040802040220170860210910020036b8c482228c004440300021c82c0400110402a10800582424001c00000828310210020a18130504020790dca716194100880ea5501149104002bc05e189080901c4001010e0a040658a410072021230a5224265030082404000aa11f28162e216636000408842103d41010760972060060000500c20130b000000065401483200081a84934f020020120009618002269c884724616040000840e18080300024490000230",
-    "prev_randao": "0x5d9ac7ea788ecb534e98bc9079fa0bef199011dadadedaee5dc40e2cd702d664",
-    "block_number": 5025098,
-    "gas_limit": 30000000,
-    "gas_used": 13802943,
-    "timestamp": 1704437448,
-    "extra_data": "0x476f65726c69205365706f6c69612d4265706f6c696120513966",
-    "base_fee_per_gas": 19959019915,
-    "block_hash": "0x795021134c2b7f9c00b498ff7b0971dbbe061561868f702d8ca68a05e5eb5a99",
-    "transactions_root": "0x3cb7c92fde5d511cc90cd67e375c4388794f4c01e375e8e8a06d003b5593fd12",
-    "withdrawals_root": "0x5f5155fd8e5cd24b7ecb1e039792b0caff01dfda2990786d9ffc88325b5d1ea8"
+    "Capella": {
+      "parent_hash": "0x9cffcba69c88a619483e13864704dde5db80e05f8d49018f615395ce09cd24ab",
+      "fee_recipient": "0xff58d746a67c2e42bcc07d6b3f58406e8837e883",
+      "state_root": "0x6a4aafc93626778475a416721104229035e91f0db788d0099b57e756cd272f0a",
+      "receipts_root": "0xe1ce670bdcf9acf4c62fee845cd7e81eabbb6db9ddbff56130020c6cf999a45d",
+      "logs_bloom": "0xa000980408008000328c1458805c005048b84812c134200090b40428568108a0648090105085100301844800090802484420800d020282019002040d083004031a20420240a4a8900a43296938c040802040220170860210910020036b8c482228c004440300021c82c0400110402a10800582424001c00000828310210020a18130504020790dca716194100880ea5501149104002bc05e189080901c4001010e0a040658a410072021230a5224265030082404000aa11f28162e216636000408842103d41010760972060060000500c20130b000000065401483200081a84934f020020120009618002269c884724616040000840e18080300024490000230",
+      "prev_randao": "0x5d9ac7ea788ecb534e98bc9079fa0bef199011dadadedaee5dc40e2cd702d664",
+      "block_number": 5025098,
+      "gas_limit": 30000000,
+      "gas_used": 13802943,
+      "timestamp": 1704437448,
+      "extra_data": "0x476f65726c69205365706f6c69612d4265706f6c696120513966",
+      "base_fee_per_gas": 19959019915,
+      "block_hash": "0x795021134c2b7f9c00b498ff7b0971dbbe061561868f702d8ca68a05e5eb5a99",
+      "transactions_root": "0x3cb7c92fde5d511cc90cd67e375c4388794f4c01e375e8e8a06d003b5593fd12",
+      "withdrawals_root": "0x5f5155fd8e5cd24b7ecb1e039792b0caff01dfda2990786d9ffc88325b5d1ea8"
+    }
   },
   "execution_branch": [
     "0x85ff3d1c2bc3dcdd5543bcd29a1224c6a8c24875224fbb1e3b69f0515ffaacda",

parachain/pallets/ethereum-client/tests/fixtures/execution-header-update.minimal.json

@@ -18,21 +18,23 @@
     "finalized_block_root": "0xa6fdc5df11c1759d11c9f0353a666715e5677e9ffd7d414e44cff0970553f1c9"
   },
   "execution_header": {
-    "parent_hash": "0x6c9657f1267ad6040ea017ff6d02b55c4ba25cb092b8326d321dd98d01d1ee64",
-    "fee_recipient": "0x0000000000000000000000000000000000000000",
-    "state_root": "0x01f975f7cdff9b0a8844304aa59062fe18af0fef4636539312dfe20d238600ba",
-    "receipts_root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-    "logs_bloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "prev_randao": "0xcdfcab74bc26b3f4311afdc72d2d21d33a4b045187a01fa208a9d687a6d1d25c",
-    "block_number": 3622,
-    "gas_limit": 30000000,
-    "gas_used": 0,
-    "timestamp": 1685722543,
-    "extra_data": "0xd983010b02846765746888676f312e31392e358664617277696e",
-    "base_fee_per_gas": 7,
-    "block_hash": "0x38c80e0e26cb80730df627d32f50266bd0fe32fb12b7606300ad81aa2b4033db",
-    "transactions_root": "0x7ffe241ea60187fdb0187bfa22de35d1f9bed7ab061d9401fd47e34a54fbede1",
-    "withdrawals_root": "0x28ba1834a3a7b657460ce79fa3a1d909ab8828fd557659d4d0554a9bdbc0ec30"
+    "Capella": {
+      "parent_hash": "0x6c9657f1267ad6040ea017ff6d02b55c4ba25cb092b8326d321dd98d01d1ee64",
+      "fee_recipient": "0x0000000000000000000000000000000000000000",
+      "state_root": "0x01f975f7cdff9b0a8844304aa59062fe18af0fef4636539312dfe20d238600ba",
+      "receipts_root": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+      "logs_bloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+      "prev_randao": "0xcdfcab74bc26b3f4311afdc72d2d21d33a4b045187a01fa208a9d687a6d1d25c",
+      "block_number": 3622,
+      "gas_limit": 30000000,
+      "gas_used": 0,
+      "timestamp": 1685722543,
+      "extra_data": "0xd983010b02846765746888676f312e31392e358664617277696e",
+      "base_fee_per_gas": 7,
+      "block_hash": "0x38c80e0e26cb80730df627d32f50266bd0fe32fb12b7606300ad81aa2b4033db",
+      "transactions_root": "0x7ffe241ea60187fdb0187bfa22de35d1f9bed7ab061d9401fd47e34a54fbede1",
+      "withdrawals_root": "0x28ba1834a3a7b657460ce79fa3a1d909ab8828fd557659d4d0554a9bdbc0ec30"
+    }
   },
   "execution_branch": [
     "0x005b8d55b34b4323bfd4773c28b09eb53bc87959e65411ccd23728c7e42d5ff2",

parachain/pallets/inbound-queue/src/mock.rs

@@ -110,6 +110,10 @@ parameter_types! {
 			version: [3, 0, 0, 1], // 0x03000001
 			epoch: 0,
 		},
+		deneb: Fork {
+			version: [4, 0, 0, 1], // 0x04000001
+			epoch: 4294967295,
+		}
 	};
 }
 

parachain/primitives/beacon/src/lib.rs

@@ -18,6 +18,7 @@ pub use types::{
 	BeaconHeader, CompactBeaconState, CompactExecutionHeader, ExecutionHeaderState,
 	ExecutionPayloadHeader, FinalizedHeaderState, Fork, ForkData, ForkVersion, ForkVersions, Mode,
 	PublicKey, Signature, SigningData, SyncAggregate, SyncCommittee, SyncCommitteePrepared,
+	VersionedExecutionPayloadHeader,
 };
 pub use updates::{CheckpointUpdate, ExecutionHeaderUpdate, NextSyncCommitteeUpdate, Update};