BACKPORT-CONFLICT

Author: claravanstaden

bridges/snowbridge/pallets/ethereum-client/src/benchmarking/mod.rs

@@ -118,6 +118,7 @@ mod benchmarks {
 			capella: Fork { version: hex!("03000000"), epoch: 0 },
 			deneb: Fork { version: hex!("04000000"), epoch: 0 },
 			electra: Fork { version: hex!("05000000"), epoch: 80000000000 },
+			fulu: Fork { version: hex!("06000000"), epoch: 80000000001 },
 		};
 		let finalized_root_gindex = EthereumBeaconClient::<T>::finalized_root_gindex_at_slot(
 			update.attested_header.slot,

bridges/snowbridge/pallets/ethereum-client/src/lib.rs

@@ -627,6 +627,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.fulu.epoch {
+				return fork_versions.fulu.version
+			}
 			if epoch >= fork_versions.electra.epoch {
 				return fork_versions.electra.version
 			}

bridges/snowbridge/pallets/ethereum-client/src/mock.rs

@@ -137,6 +137,10 @@ parameter_types! {
 		electra: Fork {
 			version: hex!("05000000"),
 			epoch: 0,
+		},
+		fulu: Fork {
+			version: hex!("06000000"),
+			epoch: 100000000,
 		}
 	};
 }

bridges/snowbridge/pallets/ethereum-client/src/tests.rs

@@ -230,6 +230,7 @@ fn compute_fork_version() {
 		capella: Fork { version: [0, 0, 0, 3], epoch: 30 },
 		deneb: Fork { version: [0, 0, 0, 4], epoch: 40 },
 		electra: Fork { version: [0, 0, 0, 5], epoch: 50 },
+		fulu: Fork { version: [0, 0, 0, 6], epoch: 60 },
 	};
 	new_tester().execute_with(|| {
 		assert_eq!(EthereumBeaconClient::select_fork_version(&mock_fork_versions, 0), [0, 0, 0, 0]);

bridges/snowbridge/pallets/inbound-queue/src/mock.rs

@@ -64,28 +64,32 @@ impl pallet_balances::Config for Test {
 parameter_types! {
 	pub const ChainForkVersions: ForkVersions = ForkVersions {
 		genesis: Fork {
-			version: [0, 0, 0, 1], // 0x00000001
+			version: hex!("00000001"),
 			epoch: 0,
 		},
 		altair: Fork {
-			version: [1, 0, 0, 1], // 0x01000001
+			version: hex!("01000001"),
 			epoch: 0,
 		},
 		bellatrix: Fork {
-			version: [2, 0, 0, 1], // 0x02000001
+			version: hex!("02000001"),
 			epoch: 0,
 		},
 		capella: Fork {
-			version: [3, 0, 0, 1], // 0x03000001
+			version: hex!("03000001"),
 			epoch: 0,
 		},
 		deneb: Fork {
-			version: [4, 0, 0, 1], // 0x04000001
+			version: hex!("04000001"),
 			epoch: 0,
 		},
 		electra: Fork {
-			version: [5, 0, 0, 0], // 0x05000000
+			version: hex!("05000000"),
 			epoch: 80000000000,
+		},
+		fulu: Fork {
+			version: hex!("06000000"),
+			epoch: 80000000001,
 		}
 	};
 }

bridges/snowbridge/primitives/beacon/src/types.rs

@@ -37,6 +37,7 @@ pub struct ForkVersions {
 	pub capella: Fork,
 	pub deneb: Fork,
 	pub electra: Fork,
+	pub fulu: Fork,
 }
 
 #[derive(Clone, Encode, Decode, PartialEq, RuntimeDebug, TypeInfo)]

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_ethereum_config.rs

@@ -144,6 +144,10 @@ parameter_types! {
 		electra: Fork {
 			version: hex!("05000000"),
 			epoch: 0,
+		},
+		fulu: Fork {
+			version: hex!("06000000"),
+			epoch: 5000000,
 		}
 	};
 }
@@ -173,7 +177,11 @@ parameter_types! {
 		},
 		electra: Fork {
 			version: hex!("90000074"),
-			epoch: 222464, // https://github.com/ethereum/EIPs/pull/9322/files
+			epoch: 222464,
+		},
+		fulu: Fork {
+			version: hex!("90000075"),
+			epoch: 272640, // https://notes.ethereum.org/@bbusa/fusaka-bpo-timeline
 		},
 	};
 }

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/bridge_to_ethereum_config.rs

@@ -198,6 +198,43 @@ impl snowbridge_pallet_outbound_queue_v2::Config for Runtime {
 	type Helper = Runtime;
 }
 
+<<<<<<< HEAD
+=======
+#[cfg(not(any(feature = "std", feature = "fast-runtime", feature = "runtime-benchmarks", test)))]
+parameter_types! {
+	pub const ChainForkVersions: ForkVersions = ForkVersions {
+		genesis: Fork {
+			version: hex!("90000069"),
+			epoch: 0,
+		},
+		altair: Fork {
+			version: hex!("90000070"),
+			epoch: 50,
+		},
+		bellatrix: Fork {
+			version: hex!("90000071"),
+			epoch: 100,
+		},
+		capella: Fork {
+			version: hex!("90000072"),
+			epoch: 56832,
+		},
+		deneb: Fork {
+			version: hex!("90000073"),
+			epoch: 132608,
+		},
+		electra: Fork {
+			version: hex!("90000074"),
+			epoch: 222464,
+		},
+		fulu: Fork {
+			version: hex!("90000075"),
+			epoch: 272640, // https://notes.ethereum.org/@bbusa/fusaka-bpo-timeline
+		},
+	};
+}
+
+>>>>>>> c223162 (Snowbridge - Adds Fulu hardfork (#9938))
 #[cfg(any(feature = "std", feature = "fast-runtime", feature = "runtime-benchmarks", test))]
 parameter_types! {
 	pub const ChainForkVersions: ForkVersions = ForkVersions {
@@ -225,6 +262,10 @@ parameter_types! {
 			version: hex!("05000000"),
 			epoch: 0,
 		},
+		fulu: Fork {
+			version: hex!("06000000"),
+			epoch: 5000000,
+		}
 	};
 }
 

prdoc/pr_9938.prdoc

@@ -0,0 +1,15 @@
+title: 'Snowbridge - Adds Fulu hardfork'
+doc:
+- audience: Runtime Dev
+  description: Set fork version for Fulu hardfork on Sepolia.
+crates:
+- name: snowbridge-pallet-ethereum-client
+  bump: patch
+- name: snowbridge-pallet-inbound-queue
+  bump: patch
+- name: snowbridge-beacon-primitives
+  bump: patch
+- name: bridge-hub-westend-runtime
+  bump: patch
+- name: bridge-hub-rococo-runtime
+  bump: patch