Merge branch 'stable2409' into backport-5655-to-stable2409

.gitlab/pipeline/short-benchmarks.yml

@@ -26,6 +26,27 @@ short-benchmark-westend: &short-bench
   script:
     - ./artifacts/polkadot benchmark pallet --chain $RUNTIME-dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1
 
+short-benchmark-rococo: &short-bench
+  stage: short-benchmarks
+  extends:
+    - .docker-env
+    - .common-refs
+  needs:
+    - job: build-short-benchmark
+      artifacts: true
+  variables:
+    RUNTIME: rococo
+    # Enable debug assertions since we are running optimized builds for testing
+    # but still want to have debug assertions.
+    RUSTFLAGS: "-C debug-assertions -D warnings"
+    RUST_BACKTRACE: "full"
+    WASM_BUILD_NO_COLOR: 1
+    WASM_BUILD_RUSTFLAGS: "-C debug-assertions -D warnings"
+  tags:
+    - benchmark
+  script:
+    - ./artifacts/polkadot benchmark pallet --chain $RUNTIME-dev --pallet "*" --extrinsic "*" --steps 2 --repeat 1
+
 # run short-benchmarks for system parachain runtimes from cumulus
 
 .short-benchmark-cumulus: &short-bench-cumulus

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

@@ -179,6 +179,10 @@ pub mod pallet {
 	#[pallet::storage]
 	pub type NextSyncCommittee<T: Config> = StorageValue<_, SyncCommitteePrepared, ValueQuery>;
 
+	/// The last period where the next sync committee was updated for free.
+	#[pallet::storage]
+	pub type LatestSyncCommitteeUpdatePeriod<T: Config> = StorageValue<_, u64, ValueQuery>;
+
 	/// The current operating mode of the pallet.
 	#[pallet::storage]
 	#[pallet::getter(fn operating_mode)]
@@ -442,6 +446,13 @@ pub mod pallet {
 			let latest_finalized_state =
 				FinalizedBeaconState::<T>::get(LatestFinalizedBlockRoot::<T>::get())
 					.ok_or(Error::<T>::NotBootstrapped)?;
+
+			let pays_fee = Self::check_refundable(update, latest_finalized_state.slot);
+			let actual_weight = match update.next_sync_committee_update {
+				None => T::WeightInfo::submit(),
+				Some(_) => T::WeightInfo::submit_with_sync_committee(),
+			};
+
 			if let Some(next_sync_committee_update) = &update.next_sync_committee_update {
 				let store_period = compute_period(latest_finalized_state.slot);
 				let update_finalized_period = compute_period(update.finalized_header.slot);
@@ -465,17 +476,12 @@ pub mod pallet {
 					"💫 SyncCommitteeUpdated at period {}.",
 					update_finalized_period
 				);
+				<LatestSyncCommitteeUpdatePeriod<T>>::set(update_finalized_period);
 				Self::deposit_event(Event::SyncCommitteeUpdated {
 					period: update_finalized_period,
 				});
 			};
 
-			let pays_fee = Self::check_refundable(update, latest_finalized_state.slot);
-			let actual_weight = match update.next_sync_committee_update {
-				None => T::WeightInfo::submit(),
-				Some(_) => T::WeightInfo::submit_with_sync_committee(),
-			};
-
 			if update.finalized_header.slot > latest_finalized_state.slot {
 				Self::store_finalized_header(update.finalized_header, update.block_roots_root)?;
 			}
@@ -657,7 +663,14 @@ pub mod pallet {
 		/// successful sync committee updates are free.
 		pub(super) fn check_refundable(update: &Update, latest_slot: u64) -> Pays {
 			// If the sync committee was successfully updated, the update may be free.
-			if update.next_sync_committee_update.is_some() {
+			let update_period = compute_period(update.finalized_header.slot);
+			let latest_free_update_period = LatestSyncCommitteeUpdatePeriod::<T>::get();
+			// If the next sync committee is not known and this update sets it, the update is free.
+			// If the sync committee update is in a period that we have not received an update for,
+			// the update is free.
+			let refundable =
+				!<NextSyncCommittee<T>>::exists() || update_period > latest_free_update_period;
+			if update.next_sync_committee_update.is_some() && refundable {
 				return Pays::No;
 			}
 

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

@@ -59,6 +59,33 @@ pub fn load_next_finalized_header_update_fixture() -> snowbridge_beacon_primitiv
 	load_fixture("next-finalized-header-update.json".to_string()).unwrap()
 }
 
+pub fn load_sync_committee_update_period_0() -> Box<
+	snowbridge_beacon_primitives::Update<
+		{ config::SYNC_COMMITTEE_SIZE },
+		{ config::SYNC_COMMITTEE_BITS_SIZE },
+	>,
+> {
+	Box::new(load_fixture("sync-committee-update-period-0.json".to_string()).unwrap())
+}
+
+pub fn load_sync_committee_update_period_0_older_fixture() -> Box<
+	snowbridge_beacon_primitives::Update<
+		{ config::SYNC_COMMITTEE_SIZE },
+		{ config::SYNC_COMMITTEE_BITS_SIZE },
+	>,
+> {
+	Box::new(load_fixture("sync-committee-update-period-0-older.json".to_string()).unwrap())
+}
+
+pub fn load_sync_committee_update_period_0_newer_fixture() -> Box<
+	snowbridge_beacon_primitives::Update<
+		{ config::SYNC_COMMITTEE_SIZE },
+		{ config::SYNC_COMMITTEE_BITS_SIZE },
+	>,
+> {
+	Box::new(load_fixture("sync-committee-update-period-0-newer.json".to_string()).unwrap())
+}
+
 pub fn get_message_verification_payload() -> (Log, Proof) {
 	let inbound_fixture = snowbridge_pallet_ethereum_client_fixtures::make_inbound_fixture();
 	(inbound_fixture.message.event_log, inbound_fixture.message.proof)

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

@@ -1,19 +1,18 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
+pub use crate::mock::*;
 use crate::{
+	config::{EPOCHS_PER_SYNC_COMMITTEE_PERIOD, SLOTS_PER_EPOCH, SLOTS_PER_HISTORICAL_ROOT},
 	functions::compute_period,
 	mock::{
 		get_message_verification_payload, load_checkpoint_update_fixture,
 		load_finalized_header_update_fixture, load_next_finalized_header_update_fixture,
 		load_next_sync_committee_update_fixture, load_sync_committee_update_fixture,
 	},
 	sync_committee_sum, verify_merkle_branch, BeaconHeader, CompactBeaconState, Error,
-	FinalizedBeaconState, LatestFinalizedBlockRoot, NextSyncCommittee, SyncCommitteePrepared,
+	FinalizedBeaconState, LatestFinalizedBlockRoot, LatestSyncCommitteeUpdatePeriod,
+	NextSyncCommittee, SyncCommitteePrepared,
 };
-
-pub use crate::mock::*;
-
-use crate::config::{EPOCHS_PER_SYNC_COMMITTEE_PERIOD, SLOTS_PER_EPOCH, SLOTS_PER_HISTORICAL_ROOT};
 use frame_support::{assert_err, assert_noop, assert_ok, pallet_prelude::Pays};
 use hex_literal::hex;
 use snowbridge_beacon_primitives::{
@@ -374,7 +373,7 @@ fn submit_update_in_current_period() {
 		assert_ok!(EthereumBeaconClient::process_checkpoint_update(&checkpoint));
 		let result = EthereumBeaconClient::submit(RuntimeOrigin::signed(1), update.clone());
 		assert_ok!(result);
-		assert_eq!(result.unwrap().pays_fee, Pays::Yes);
+		assert_eq!(result.unwrap().pays_fee, Pays::No);
 		let block_root: H256 = update.finalized_header.hash_tree_root().unwrap();
 		assert!(<FinalizedBeaconState<Test>>::contains_key(block_root));
 	});
@@ -711,8 +710,56 @@ fn duplicate_sync_committee_updates_are_not_free() {
 		// Check that if the same update is submitted, the update is not free.
 		let second_result =
 			EthereumBeaconClient::submit(RuntimeOrigin::signed(1), sync_committee_update);
-		assert_err!(second_result, Error::<Test>::IrrelevantUpdate);
-		assert_eq!(second_result.unwrap_err().post_info.pays_fee, Pays::Yes);
+		assert_ok!(second_result);
+		assert_eq!(second_result.unwrap().pays_fee, Pays::Yes);
+	});
+}
+
+#[test]
+fn sync_committee_update_for_sync_committee_already_imported_are_not_free() {
+	let checkpoint = Box::new(load_checkpoint_update_fixture());
+	let sync_committee_update = Box::new(load_sync_committee_update_fixture()); // slot 129
+	let second_sync_committee_update = load_sync_committee_update_period_0(); // slot 128
+	let third_sync_committee_update = load_sync_committee_update_period_0_newer_fixture(); // slot 224
+	let fourth_sync_committee_update = load_sync_committee_update_period_0_older_fixture(); // slot 96
+	let fith_sync_committee_update = Box::new(load_next_sync_committee_update_fixture()); // slot 8259
+
+	new_tester().execute_with(|| {
+		assert_ok!(EthereumBeaconClient::process_checkpoint_update(&checkpoint));
+		assert_eq!(<LatestSyncCommitteeUpdatePeriod<Test>>::get(), 0);
+
+		// Check that setting the next sync committee for period 0 is free (it is not set yet).
+		let result =
+			EthereumBeaconClient::submit(RuntimeOrigin::signed(1), sync_committee_update.clone());
+		assert_ok!(result);
+		assert_eq!(result.unwrap().pays_fee, Pays::No);
+		assert_eq!(<LatestSyncCommitteeUpdatePeriod<Test>>::get(), 0);
+
+		// Check that setting the next sync committee for period 0 again is not free.
+		let second_result =
+			EthereumBeaconClient::submit(RuntimeOrigin::signed(1), second_sync_committee_update);
+		assert_eq!(second_result.unwrap().pays_fee, Pays::Yes);
+		assert_eq!(<LatestSyncCommitteeUpdatePeriod<Test>>::get(), 0);
+
+		// Check that setting an update with a sync committee that has already been set, but with a
+		// newer finalized header, is free.
+		let third_result =
+			EthereumBeaconClient::submit(RuntimeOrigin::signed(1), third_sync_committee_update);
+		assert_eq!(third_result.unwrap().pays_fee, Pays::No);
+		assert_eq!(<LatestSyncCommitteeUpdatePeriod<Test>>::get(), 0);
+
+		// Check that setting the next sync committee for period 0 again with an earlier slot is not
+		// free.
+		let fourth_result =
+			EthereumBeaconClient::submit(RuntimeOrigin::signed(1), fourth_sync_committee_update);
+		assert_err!(fourth_result, Error::<Test>::IrrelevantUpdate);
+		assert_eq!(fourth_result.unwrap_err().post_info.pays_fee, Pays::Yes);
+
+		// Check that setting the next sync committee for period 1 is free.
+		let fith_result =
+			EthereumBeaconClient::submit(RuntimeOrigin::signed(1), fith_sync_committee_update);
+		assert_eq!(fith_result.unwrap().pays_fee, Pays::No);
+		assert_eq!(<LatestSyncCommitteeUpdatePeriod<Test>>::get(), 1);
 	});
 }