Merge remote-tracking branch 'origin/master' into sistemd/basti-feedback

Author: sistemd

.github/workflows/release-60_post-crates-release-activities.yml

@@ -200,6 +200,10 @@ jobs:
           # Show git diff to see what changed
           git diff --stat
 
+      - name: Install newer Zepter
+        run: |
+          cargo install [email protected] --locked -q && zepter --version
+
       - name: Run Zepter - check issues
         run: |
           echo "Running zepter run check to identify issues..."
@@ -296,9 +300,6 @@ jobs:
             BASE_RELEASE="$FULL_RELEASE"
           fi
 
-          BASE_RELEASE_UPPER=$(echo "$BASE_RELEASE" | tr '[:lower:]' '[:upper:]')
-          echo "Base release branch (upper): $BASE_RELEASE_UPPER"
-
           # Check if PR already exists
           EXISTING_PR=$(gh pr list --head "$BRANCH_NAME" --base "$BASE_RELEASE" --json number --jq '.[0].number')
 
@@ -308,7 +309,7 @@ jobs:
           else
             echo "Creating PR from $BRANCH_NAME to $BASE_RELEASE..."
             gh pr create \
-              --title "[${BASE_RELEASE_UPPER}] Post crates release activities for $FULL_RELEASE" \
+              --title "[${BASE_RELEASE}] Post crates release activities for $FULL_RELEASE" \
               --body "Automated PR containing post-crates-release activities:
           - NODE_VERSION bumps (if selected)
           - Path dependencies replacement

Cargo.lock

@@ -899,7 +899,7 @@ linked-hash-map = { version = "0.5.4" }
 linked_hash_set = { version = "0.1.4" }
 linregress = { version = "0.5.1" }
 lite-json = { version = "0.2.0", default-features = false }
-litep2p = { version = "0.12.3", features = ["rsa", "websocket"] }
+litep2p = { version = "0.13.0", features = ["rsa", "websocket"] }
 log = { version = "0.4.22", default-features = false }
 macro_magic = { version = "0.5.1" }
 maplit = { version = "1.0.2" }

Cargo.toml

@@ -14,7 +14,7 @@ pub const MAX_FEE_RECIPIENT_SIZE: usize = 20;
 pub const MAX_BRANCH_PROOF_SIZE: usize = 20;
 
 /// DomainType('0x07000000')
-/// <https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/beacon-chain.md#domain-types>
+/// <https://github.com/ethereum/consensus-specs/blob/master/specs/altair/beacon-chain.md#domains>
 pub const DOMAIN_SYNC_COMMITTEE: [u8; 4] = [7, 0, 0, 0];
 /// Validators public keys are 48 bytes.
 pub const PUBKEY_SIZE: usize = 48;

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

@@ -460,7 +460,7 @@ pub mod pallet {
 			Ok(())
 		}
 
-		/// Reference and strictly follows <https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/light-client/sync-protocol.md#apply_light_client_update
+		/// Reference and strictly follows <https://github.com/ethereum/consensus-specs/blob/master/specs/altair/light-client/sync-protocol.md#apply_light_client_update>
 		/// Applies a finalized beacon header update to the beacon client. If a next sync committee
 		/// is present in the update, verify the sync committee by converting it to a
 		/// SyncCommitteePrepared type. Stores the provided finalized header. Updates are free
@@ -675,8 +675,11 @@ pub mod pallet {
 			validators_root: H256,
 			signature_slot: u64,
 		) -> Result<H256, DispatchError> {
+			// Per Ethereum Altair light-client spec, fork version is derived from signature_slot -
+			// 1. See: https://github.com/ethereum/consensus-specs/blob/dev/specs/altair/light-client/sync-protocol.md#validate_light_client_update
+			// In validate_light_client_update: fork_version_slot = max(signature_slot, 1) - 1
 			let fork_version = Self::compute_fork_version(compute_epoch(
-				signature_slot,
+				signature_slot.saturating_sub(1),
 				config::SLOTS_PER_EPOCH as u64,
 			));
 			let domain_type = config::DOMAIN_SYNC_COMMITTEE.to_vec();

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

@@ -3,7 +3,7 @@
 pub use crate::mock::*;
 use crate::{
 	config::{EPOCHS_PER_SYNC_COMMITTEE_PERIOD, SLOTS_PER_EPOCH, SLOTS_PER_HISTORICAL_ROOT},
-	functions::compute_period,
+	functions::{compute_epoch, compute_period},
 	mock::{
 		get_message_verification_payload, load_checkpoint_update_fixture,
 		load_finalized_header_update_fixture, load_next_finalized_header_update_fixture,
@@ -974,3 +974,83 @@ fn verify_message_invalid_topic() {
 		);
 	});
 }
+
+#[test]
+fn signing_root_uses_previous_slot_for_fork_version() {
+	new_tester().execute_with(|| {
+		// Use a signature_slot at a fork boundary (first slot of the fulu epoch).
+		// In mock.rs: electra.epoch = 0, fulu.epoch = 100000000
+		let fulu_epoch = ChainForkVersions::get().fulu.epoch;
+		let signature_slot: u64 = fulu_epoch * (SLOTS_PER_EPOCH as u64);
+
+		// Verify this is the first slot of the epoch
+		assert_eq!(signature_slot % (SLOTS_PER_EPOCH as u64), 0);
+
+		let header = BeaconHeader {
+			slot: signature_slot - 1,
+			proposer_index: 0,
+			parent_root: H256::repeat_byte(0x11),
+			state_root: H256::repeat_byte(0x22),
+			body_root: H256::repeat_byte(0x33),
+		};
+
+		let validators_root = H256::repeat_byte(0x44);
+
+		// Get fork versions for comparison
+		let fork_version_at_signature_slot = EthereumBeaconClient::compute_fork_version(
+			compute_epoch(signature_slot, SLOTS_PER_EPOCH as u64),
+		);
+		let fork_version_at_previous_slot = EthereumBeaconClient::compute_fork_version(
+			compute_epoch(signature_slot.saturating_sub(1), SLOTS_PER_EPOCH as u64),
+		);
+
+		// At the fork boundary, these should differ
+		assert_ne!(
+			fork_version_at_signature_slot, fork_version_at_previous_slot,
+			"Test setup error: fork versions should differ at fork boundary"
+		);
+
+		// Compute signing roots using both fork versions
+		let domain_type = crate::config::DOMAIN_SYNC_COMMITTEE.to_vec();
+
+		let domain_with_previous_slot = EthereumBeaconClient::compute_domain(
+			domain_type.clone(),
+			fork_version_at_previous_slot,
+			validators_root,
+		)
+		.unwrap();
+
+		let signing_root_with_previous_slot =
+			EthereumBeaconClient::compute_signing_root(&header, domain_with_previous_slot).unwrap();
+
+		// The pallet's signing_root should use the previous slot's fork version (per spec)
+		let pallet_signing_root =
+			EthereumBeaconClient::signing_root(&header, validators_root, signature_slot).unwrap();
+
+		assert_eq!(
+			pallet_signing_root, signing_root_with_previous_slot,
+			"signing_root should use fork version from signature_slot - 1"
+		);
+	});
+}
+
+#[test]
+fn signing_root_handles_signature_slot_zero() {
+	// Per spec: fork_version_slot = max(signature_slot, 1) - 1
+	// When signature_slot = 0, saturating_sub(1) = 0, which matches max(0, 1) - 1 = 0
+	new_tester().execute_with(|| {
+		let header = BeaconHeader {
+			slot: 0,
+			proposer_index: 0,
+			parent_root: H256::repeat_byte(0x11),
+			state_root: H256::repeat_byte(0x22),
+			body_root: H256::repeat_byte(0x33),
+		};
+
+		let validators_root = H256::repeat_byte(0x44);
+
+		// Should not panic and should use epoch 0 fork version
+		let result = EthereumBeaconClient::signing_root(&header, validators_root, 0);
+		assert!(result.is_ok(), "signing_root should handle signature_slot = 0");
+	});
+}

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

@@ -4,7 +4,7 @@ use sp_core::H256;
 use sp_io::hashing::sha2_256;
 
 /// Specified by <https://github.com/ethereum/consensus-specs/blob/fe9c1a8cbf0c2da8a4f349efdcd77dd7ac8445c4/specs/phase0/beacon-chain.md?plain=1#L742>
-/// with improvements from <https://github.com/ethereum/consensus-specs/blob/dev/ssz/merkle-proofs.md>
+/// with improvements from <https://github.com/ethereum/consensus-specs/blob/master/ssz/merkle-proofs.md>
 pub fn verify_merkle_branch(
 	leaf: H256,
 	branch: &[H256],

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

@@ -600,7 +600,7 @@ pub mod deneb {
 	use sp_std::prelude::*;
 
 	/// ExecutionPayloadHeader
-	/// <https://github.com/ethereum/consensus-specs/blob/dev/specs/deneb/beacon-chain.md#executionpayloadheader>
+	/// <https://github.com/ethereum/consensus-specs/blob/master/specs/deneb/beacon-chain.md#executionpayloadheader>
 	#[derive(
 		Default,
 		Encode,

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

@@ -1118,7 +1118,11 @@ impl<T: Config> Pallet<T> {
 	fn messages_collection_size_limit() -> usize {
 		let max_block_weight = <T as frame_system::Config>::BlockWeights::get().max_block;
 		let max_block_pov = max_block_weight.proof_size();
-		(max_block_pov / 6).saturated_into()
+
+		let remaining_proof_size =
+			frame_system::Pallet::<T>::remaining_block_weight().remaining().proof_size();
+
+		(max_block_pov / 6).min(remaining_proof_size).saturated_into()
 	}
 
 	/// Updates inherent data to only include the messages that weren't already processed

cumulus/pallets/parachain-system/src/lib.rs

@@ -63,7 +63,7 @@ pallet-scheduler = { workspace = true }
 pallet-session = { workspace = true }
 pallet-staking = { workspace = true }
 pallet-staking-async = { workspace = true }
-pallet-staking-async-rc-client = { workspace = true }
+pallet-staking-async-rc-client = { workspace = true, features = ["xcm-sender"] }
 pallet-staking-runtime-api = { workspace = true }
 pallet-state-trie-migration = { workspace = true }
 pallet-sudo = { workspace = true }
@@ -94,6 +94,12 @@ sp-storage = { workspace = true }
 sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
 
+# Consensus primitives for Relay Chain SessionKeys validation
+sp-authority-discovery = { workspace = true }
+sp-consensus-babe = { workspace = true }
+sp-consensus-beefy = { workspace = true }
+sp-consensus-grandpa = { workspace = true }
+
 # num-traits feature needed for dex integer sq root:
 primitive-types = { features = ["codec", "num-traits", "scale-info"], workspace = true }
 
@@ -102,6 +108,7 @@ pallet-xcm = { workspace = true }
 pallet-xcm-benchmarks = { optional = true, workspace = true }
 pallet-xcm-precompiles = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
+polkadot-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
 westend-runtime-constants = { workspace = true }
 xcm = { workspace = true }
@@ -143,6 +150,7 @@ asset-test-utils = { workspace = true, default-features = true }
 pallet-revive-fixtures = { workspace = true, default-features = true }
 parachains-runtimes-test-utils = { workspace = true, default-features = true }
 sp-tracing = { workspace = true, default-features = true }
+westend-runtime = { workspace = true, default-features = true }
 
 [build-dependencies]
 substrate-wasm-builder = { optional = true, workspace = true, default-features = true }
@@ -211,12 +219,14 @@ runtime-benchmarks = [
 	"pallet-xcm/runtime-benchmarks",
 	"parachains-common/runtime-benchmarks",
 	"polkadot-parachain-primitives/runtime-benchmarks",
+	"polkadot-primitives/runtime-benchmarks",
 	"polkadot-runtime-common/runtime-benchmarks",
 	"snowbridge-pallet-system-frontend/runtime-benchmarks",
 	"snowbridge-runtime-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"sp-staking/runtime-benchmarks",
 	"westend-runtime-constants/runtime-benchmarks",
+	"westend-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
 	"xcm-runtime-apis/runtime-benchmarks",
@@ -289,6 +299,7 @@ try-runtime = [
 	"snowbridge-pallet-system-frontend/try-runtime",
 	"snowbridge-runtime-common/try-runtime",
 	"sp-runtime/try-runtime",
+	"westend-runtime/try-runtime",
 ]
 std = [
 	"alloy-core/std",
@@ -373,6 +384,7 @@ std = [
 	"parachain-info/std",
 	"parachains-common/std",
 	"polkadot-parachain-primitives/std",
+	"polkadot-primitives/std",
 	"polkadot-runtime-common/std",
 	"primitive-types/std",
 	"scale-info/std",
@@ -382,8 +394,12 @@ std = [
 	"snowbridge-runtime-common/std",
 	"sp-api/std",
 	"sp-arithmetic/std",
+	"sp-authority-discovery/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
+	"sp-consensus-babe/std",
+	"sp-consensus-beefy/std",
+	"sp-consensus-grandpa/std",
 	"sp-core/std",
 	"sp-genesis-builder/std",
 	"sp-inherents/std",