Merge branch 'master' into skunert/check-weight-ignore-mandatory

.github/workflows/misc-sync-templates.yml

@@ -148,12 +148,12 @@ jobs:
           token: ${{ steps.app_token.outputs.token }}
           add-paths: |
             ./*
-          title: "[Don't merge] Update the ${{ matrix.template }} template"
+          title: "[Don't merge] Update the ${{ matrix.template }} template to ${{ github.event.inputs.crate_release_version }}"
           body: "The template has NOT been successfully built and needs to be inspected."
-          branch: "update-template/${{ github.event_name }}"
+          branch: "update-template/${{ github.event.inputs.crate_release_version }}"
       - name: Push changes
         run: |
           git add -A .
-          git commit --allow-empty -m "Update template triggered by ${{ github.event_name }}"
+          git commit --allow-empty -m "Update to ${{ github.event.inputs.crate_release_version }} triggered by ${{ github.event_name }}"
           git push
         working-directory: "${{ env.template-path }}"

README.md

@@ -9,6 +9,7 @@
 ![GitHub stars](https://img.shields.io/github/stars/paritytech/polkadot-sdk)  ![GitHub
 forks](https://img.shields.io/github/forks/paritytech/polkadot-sdk)
 
+<!-- markdownlint-disable-next-line MD013 -->
 [![StackExchange](https://img.shields.io/badge/StackExchange-Community%20&%20Support-222222?logo=stackexchange)](https://substrate.stackexchange.com/)&nbsp;&nbsp;![GitHub contributors](https://img.shields.io/github/contributors/paritytech/polkadot-sdk)&nbsp;&nbsp;![GitHub commit activity](https://img.shields.io/github/commit-activity/m/paritytech/polkadot-sdk)
 
 ![GitHub lines of code](https://tokei.rs/b1/github/paritytech/polkadot-sdk)&nbsp;&nbsp;
@@ -30,7 +31,7 @@ forks](https://img.shields.io/github/forks/paritytech/polkadot-sdk)
 
 ## 🚀 Releases
 
-> [!NOTE] 
+> [!NOTE]
 > Our release process is still Work-In-Progress and may not yet reflect the aspired outline
 > here.
 
@@ -62,9 +63,10 @@ Conduct](./docs/contributor/CODE_OF_CONDUCT.md).
 
 ### 👾 Ready to Contribute?
 
-Take a look at the issues labeled with [`mentor`](https://github.com/paritytech/polkadot-sdk/labels/C1-mentor) (or alternatively [this](https://mentor.tasty.limo/) page, created by one of
-the maintainers) label to get started! We always recognize valuable contributions by proposing an
-on-chain tip to the Polkadot network as a token of our appreciation.
+Take a look at the issues labeled with [`mentor`](https://github.com/paritytech/polkadot-sdk/labels/C1-mentor)
+(or alternatively [this](https://mentor.tasty.limo/) page, created by one of the maintainers) label to get started!
+We always recognize valuable contributions by proposing an on-chain tip to the Polkadot network as a token of our
+appreciation.
 
 ## Polkadot Fellowship
 

bridges/docs/running-relayer.md

@@ -139,7 +139,7 @@ your transactions that are **validated** on top of block, where it is active get
 becomes expired when the block with the number you have specified during registration is "mined". It is the
 `validTill` parameter of the `register` call (see below). After that `validTill` block, you may unregister and get
 your reserved funds back. There's also an intermediate point between those blocks - it is the `validTill - LEASE`,
-where `LEASE` is the the chain constant, controlled by the governance. Initially it is set to `300` blocks.
+where `LEASE` is the chain constant, controlled by the governance. Initially it is set to `300` blocks.
 All your transactions, **validated** between the `validTill - LEASE` and `validTill` blocks do not get the
 priority boost. Also, it is forbidden to specify `validTill` such that the `validTill - currentBlock` is less
 than the `LEASE`.
@@ -156,7 +156,7 @@ than the `LEASE`.
 | 700               | Inactive           | Your message delivery transactions are not boosted     |
 | 701               | Inactive           | Your message delivery transactions are not boosted     |
 | ...               | Inactive           | Your message delivery transactions are not boosted     |
-| 1000              | Expired            | Your may submit a tx with the `deregister` call        |
+| 1000              | Expired            | You may submit a tx with the `deregister` call         |
 
 </details>
 
@@ -230,7 +230,7 @@ your relayer account. Then:
 
 - set the `bridgedChainId` to `bhpd`;
 
-- check the both variants of the `owner` field: `ThisChain` is used to pay for message delivery transactions
+- check both variants of the `owner` field: `ThisChain` is used to pay for message delivery transactions
   and `BridgedChain` is used to pay for message confirmation transactions.
 
 If check shows that you have some rewards, you can craft the claim transaction, with similar parameters.

bridges/modules/grandpa/src/call_ext.rs

@@ -18,12 +18,8 @@ use crate::{
 	weights::WeightInfo, BestFinalized, BridgedBlockNumber, BridgedHeader, Config,
 	CurrentAuthoritySet, Error, FreeHeadersRemaining, Pallet,
 };
-use bp_header_chain::{
-	justification::GrandpaJustification, max_expected_submit_finality_proof_arguments_size,
-	ChainWithGrandpa, GrandpaConsensusLogReader,
-};
+use bp_header_chain::{justification::GrandpaJustification, submit_finality_proof_limits_extras};
 use bp_runtime::{BlockNumberOf, Chain, OwnedBridgeModule};
-use codec::Encode;
 use frame_support::{
 	dispatch::CallableCallFor,
 	traits::{Get, IsSubType},
@@ -303,53 +299,31 @@ pub(crate) fn submit_finality_proof_info_from_args<T: Config<I>, I: 'static>(
 	current_set_id: Option<SetId>,
 	is_free_execution_expected: bool,
 ) -> SubmitFinalityProofInfo<BridgedBlockNumber<T, I>> {
-	let block_number = *finality_target.number();
-
-	// the `submit_finality_proof` call will reject justifications with invalid, duplicate,
-	// unknown and extra signatures. It'll also reject justifications with less than necessary
-	// signatures. So we do not care about extra weight because of additional signatures here.
-	let precommits_len = justification.commit.precommits.len().saturated_into();
-	let required_precommits = precommits_len;
+	// check if call exceeds limits. In other words - whether some size or weight is included
+	// in the call
+	let extras =
+		submit_finality_proof_limits_extras::<T::BridgedChain>(finality_target, justification);
 
 	// We do care about extra weight because of more-than-expected headers in the votes
 	// ancestries. But we have problems computing extra weight for additional headers (weight of
 	// additional header is too small, so that our benchmarks aren't detecting that). So if there
 	// are more than expected headers in votes ancestries, we will treat the whole call weight
 	// as an extra weight.
-	let votes_ancestries_len = justification.votes_ancestries.len().saturated_into();
-	let extra_weight =
-		if votes_ancestries_len > T::BridgedChain::REASONABLE_HEADERS_IN_JUSTIFICATION_ANCESTRY {
-			T::WeightInfo::submit_finality_proof(precommits_len, votes_ancestries_len)
-		} else {
-			Weight::zero()
-		};
-
-	// check if the `finality_target` is a mandatory header. If so, we are ready to refund larger
-	// size
-	let is_mandatory_finality_target =
-		GrandpaConsensusLogReader::<BridgedBlockNumber<T, I>>::find_scheduled_change(
-			finality_target.digest(),
-		)
-		.is_some();
-
-	// we can estimate extra call size easily, without any additional significant overhead
-	let actual_call_size: u32 = finality_target
-		.encoded_size()
-		.saturating_add(justification.encoded_size())
-		.saturated_into();
-	let max_expected_call_size = max_expected_submit_finality_proof_arguments_size::<T::BridgedChain>(
-		is_mandatory_finality_target,
-		required_precommits,
-	);
-	let extra_size = actual_call_size.saturating_sub(max_expected_call_size);
+	let extra_weight = if extras.is_weight_limit_exceeded {
+		let precommits_len = justification.commit.precommits.len().saturated_into();
+		let votes_ancestries_len = justification.votes_ancestries.len().saturated_into();
+		T::WeightInfo::submit_finality_proof(precommits_len, votes_ancestries_len)
+	} else {
+		Weight::zero()
+	};
 
 	SubmitFinalityProofInfo {
-		block_number,
+		block_number: *finality_target.number(),
 		current_set_id,
-		is_mandatory: is_mandatory_finality_target,
+		is_mandatory: extras.is_mandatory_finality_target,
 		is_free_execution_expected,
 		extra_weight,
-		extra_size,
+		extra_size: extras.extra_size,
 	}
 }