From 9079f36b99ee0910762ce6020ca9dfd6671f77b3 Mon Sep 17 00:00:00 2001
From: Alexander Samusev <41779041+alvicsam@users.noreply.github.com>
Date: Tue, 10 Sep 2024 11:48:09 +0200
Subject: [PATCH 01/12] [WIP][ci] GHA improvements (#5653)

Changes in PR:
- enables `Check Cargo Check Runtimes` (it was accidentally disabled)
- reorder jobs in test-misc to make it faster
- add `quick-benchmarks-omni` to `check-frame-omni-bencher` (the
workflow is currently disabled)
---
 .../workflows/check-cargo-check-runtimes.yml  | 33 ++++++++-----
 .../workflows/check-frame-omni-bencher.yml    | 48 ++++++++++++++++---
 .github/workflows/tests-misc.yml              | 11 +++--
 3 files changed, 68 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/check-cargo-check-runtimes.yml b/.github/workflows/check-cargo-check-runtimes.yml
index 6325033d214cd..ea0a4b943213a 100644
--- a/.github/workflows/check-cargo-check-runtimes.yml
+++ b/.github/workflows/check-cargo-check-runtimes.yml
@@ -2,27 +2,34 @@ name: Check Cargo Check Runtimes
 
 on:
   pull_request:
-    types: [opened, synchronize, reopened, ready_for_review, labeled]
+    types: [opened, synchronize, reopened, ready_for_review]
 
 # Jobs in this workflow depend on each other, only for limiting peak amount of spawned workers
 
 jobs:
-  # GitHub Actions allows using 'env' in a container context.
-  # However, env variables don't work for forks: https://github.com/orgs/community/discussions/44322
-  # This workaround sets the container image for each job using 'set-image' job output.
   set-image:
-    if: contains(github.event.label.name, 'GHA-migration') || contains(github.event.pull_request.labels.*.name, 'GHA-migration')
+    # GitHub Actions allows using 'env' in a container context.
+    # However, env variables don't work for forks: https://github.com/orgs/community/discussions/44322
+    # This workaround sets the container image for each job using 'set-image' job output.
     runs-on: ubuntu-latest
-    timeout-minutes: 20
     outputs:
       IMAGE: ${{ steps.set_image.outputs.IMAGE }}
+      RUNNER: ${{ steps.set_runner.outputs.RUNNER }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - id: set_image
         run: cat .github/env >> $GITHUB_OUTPUT
+      - id: set_runner
+        run: |
+          # Run merge queues on persistent runners
+          if [[ $GITHUB_REF_NAME == *"gh-readonly-queue"* ]]; then
+            echo "RUNNER=arc-runners-polkadot-sdk-beefy-persistent" >> $GITHUB_OUTPUT
+          else
+            echo "RUNNER=arc-runners-polkadot-sdk-beefy" >> $GITHUB_OUTPUT
+          fi
   check-runtime-assets:
-    runs-on: arc-runners-polkadot-sdk-beefy
+    runs-on: ${{ needs.set-image.outputs.RUNNER }}
     needs: [set-image]
     timeout-minutes: 20
     container:
@@ -36,7 +43,7 @@ jobs:
           root: cumulus/parachains/runtimes/assets
 
   check-runtime-collectives:
-    runs-on: arc-runners-polkadot-sdk-beefy
+    runs-on: ${{ needs.set-image.outputs.RUNNER }}
     needs: [check-runtime-assets, set-image]
     timeout-minutes: 20
     container:
@@ -50,7 +57,7 @@ jobs:
           root: cumulus/parachains/runtimes/collectives
 
   check-runtime-coretime:
-    runs-on: arc-runners-polkadot-sdk-beefy
+    runs-on: ${{ needs.set-image.outputs.RUNNER }}
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
     needs: [check-runtime-assets, set-image]
@@ -64,7 +71,7 @@ jobs:
           root: cumulus/parachains/runtimes/coretime
 
   check-runtime-bridge-hubs:
-    runs-on: arc-runners-polkadot-sdk-beefy
+    runs-on: ${{ needs.set-image.outputs.RUNNER }}
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
     needs: [set-image]
@@ -78,7 +85,7 @@ jobs:
           root: cumulus/parachains/runtimes/bridge-hubs
 
   check-runtime-contracts:
-    runs-on: arc-runners-polkadot-sdk-beefy
+    runs-on: ${{ needs.set-image.outputs.RUNNER }}
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
     needs: [check-runtime-collectives, set-image]
@@ -92,7 +99,7 @@ jobs:
           root: cumulus/parachains/runtimes/contracts
 
   check-runtime-starters:
-    runs-on: arc-runners-polkadot-sdk-beefy
+    runs-on: ${{ needs.set-image.outputs.RUNNER }}
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
     needs: [check-runtime-assets, set-image]
@@ -106,7 +113,7 @@ jobs:
           root: cumulus/parachains/runtimes/starters
 
   check-runtime-testing:
-    runs-on: arc-runners-polkadot-sdk-beefy
+    runs-on: ${{ needs.set-image.outputs.RUNNER }}
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
     needs: [check-runtime-starters, set-image]
diff --git a/.github/workflows/check-frame-omni-bencher.yml b/.github/workflows/check-frame-omni-bencher.yml
index e9db2d9129797..e035a30c7c224 100644
--- a/.github/workflows/check-frame-omni-bencher.yml
+++ b/.github/workflows/check-frame-omni-bencher.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - master
   pull_request:
-    types: [ opened, synchronize, reopened, ready_for_review, labeled ]
+    types: [opened, synchronize, reopened, ready_for_review, labeled]
   merge_group:
 
 concurrency:
@@ -28,19 +28,46 @@ jobs:
     # However, env variables don't work for forks: https://github.com/orgs/community/discussions/44322
     # This workaround sets the container image for each job using 'set-image' job output.
     runs-on: ubuntu-latest
-    needs: changes
-    if: ${{ needs.changes.outputs.rust }}
     outputs:
       IMAGE: ${{ steps.set_image.outputs.IMAGE }}
+      RUNNER: ${{ steps.set_runner.outputs.RUNNER }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - id: set_image
         run: cat .github/env >> $GITHUB_OUTPUT
+      - id: set_runner
+        run: |
+          # Run merge queues on persistent runners
+          if [[ $GITHUB_REF_NAME == *"gh-readonly-queue"* ]]; then
+            echo "RUNNER=arc-runners-polkadot-sdk-beefy-persistent" >> $GITHUB_OUTPUT
+          else
+            echo "RUNNER=arc-runners-polkadot-sdk-beefy" >> $GITHUB_OUTPUT
+          fi
+
+  quick-benchmarks-omni:
+    runs-on: ${{ needs.set-image.outputs.RUNNER }}
+    needs: [set-image, changes]
+    if: ${{ needs.changes.outputs.rust }}
+    env:
+      RUSTFLAGS: "-C debug-assertions"
+      RUST_BACKTRACE: "full"
+      WASM_BUILD_NO_COLOR: 1
+      WASM_BUILD_RUSTFLAGS: "-C debug-assertions"
+    timeout-minutes: 30
+    container:
+      image: ${{ needs.set-image.outputs.IMAGE }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: script
+        run: |
+          forklift cargo build --locked --quiet --release -p asset-hub-westend-runtime --features runtime-benchmarks
+          forklift cargo run --locked --release -p frame-omni-bencher --quiet -- v1 benchmark pallet --runtime target/release/wbuild/asset-hub-westend-runtime/asset_hub_westend_runtime.compact.compressed.wasm --all --steps 2 --repeat 1 --quiet
 
   run-frame-omni-bencher:
-    runs-on: arc-runners-polkadot-sdk-beefy
-    needs: [ set-image, changes ] # , build-frame-omni-bencher ]
+    runs-on: ${{ needs.set-image.outputs.RUNNER }}
+    needs: [set-image, changes] # , build-frame-omni-bencher ]
     if: ${{ needs.changes.outputs.rust }}
     timeout-minutes: 30
     strategy:
@@ -81,5 +108,14 @@ jobs:
     runs-on: ubuntu-latest
     name: All benchmarks passed
     needs: run-frame-omni-bencher
+    if: always() && !cancelled()
     steps:
-      - run: echo '### Good job! All the benchmarks passed 🚀' >> $GITHUB_STEP_SUMMARY
+      - run: |
+          tee resultfile <<< '${{ toJSON(needs) }}'
+          FAILURES=$(cat resultfile | grep '"result": "failure"' | wc -l)
+          if [ $FAILURES -gt 0 ]; then
+            echo "### At least one required job failed ❌" >> $GITHUB_STEP_SUMMARY
+            exit 1
+          else
+            echo '### Good job! All the required jobs passed 🚀' >> $GITHUB_STEP_SUMMARY
+          fi
diff --git a/.github/workflows/tests-misc.yml b/.github/workflows/tests-misc.yml
index 97ad86e3998e2..e4f0d6575c539 100644
--- a/.github/workflows/tests-misc.yml
+++ b/.github/workflows/tests-misc.yml
@@ -93,7 +93,7 @@ jobs:
 
   test-frame-ui:
     timeout-minutes: 60
-    needs: [set-image, test-frame-examples-compile-to-wasm]
+    needs: [set-image]
     runs-on: ${{ needs.set-image.outputs.RUNNER }}
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
@@ -121,7 +121,7 @@ jobs:
 
   test-deterministic-wasm:
     timeout-minutes: 20
-    needs: [set-image]
+    needs: [set-image, test-frame-examples-compile-to-wasm]
     runs-on: ${{ needs.set-image.outputs.RUNNER }}
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
@@ -148,7 +148,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        branch: [ master, current ]
+        branch: [master, current]
     runs-on: ${{ needs.set-image.outputs.RUNNER }}
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
@@ -158,7 +158,7 @@ jobs:
         with:
           # if branch is master, use the branch, otherwise set empty string, so it uses the current context
           # either PR (including forks) or merge group (main repo)
-          ref: ${{ matrix.branch == 'master' && matrix.branch || '' }} 
+          ref: ${{ matrix.branch == 'master' && matrix.branch || '' }}
 
       - name: script
         run: |
@@ -181,7 +181,8 @@ jobs:
   node-bench-regression-guard:
     timeout-minutes: 20
     if: always() && !cancelled()
-    runs-on: arc-runners-polkadot-sdk
+    # runs-on: arc-runners-polkadot-sdk
+    runs-on: ubuntu-latest
     needs: [set-image, cargo-check-benches]
     steps:
       - name: Checkout

From d887804b235003282b26d4202f40c79fb302f16c Mon Sep 17 00:00:00 2001
From: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Date: Tue, 10 Sep 2024 15:28:28 +0200
Subject: [PATCH 02/12] [Bot] Use correct token in backport bot (#5654)

The backport bot does currently not trigger the CI when opening a MR,
like here: https://github.com/paritytech/polkadot-sdk/pull/5651
Devs need to push an empty commit manually. Now using a token that will
also trigger the CI.

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
---
 .github/workflows/command-backport.yml | 32 ++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/command-backport.yml b/.github/workflows/command-backport.yml
index 1ad68d96a63fb..85e7b77801d70 100644
--- a/.github/workflows/command-backport.yml
+++ b/.github/workflows/command-backport.yml
@@ -27,15 +27,24 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Generate token
+        id: generate_token
+        uses: tibdex/github-app-token@v2.1.0
+        with:
+          app_id: ${{ secrets.CMD_BOT_APP_ID }}
+          private_key: ${{ secrets.CMD_BOT_APP_KEY }}
+
       - name: Create backport pull requests
         uses: korthout/backport-action@v3
         id: backport
         with:
           target_branches: stable2407 stable2409
           merge_commits: skip
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_token: ${{ steps.generate_token.outputs.token }}
           pull_description: |
-            Backport #${pull_number} into `${target_branch}` (cc @${pull_author}).
+            Backport #${pull_number} into `${target_branch}` from ${pull_author}.
+
+            See the [documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md) on how to use this bot.
 
             <!--
               # To be used by other automation, do not modify:
@@ -47,6 +56,7 @@ jobs:
             {
               "conflict_resolution": "draft_commit_conflicts"
             }
+          copy_assignees: true
 
       - name: Label Backports
         if: ${{ steps.backport.outputs.created_pull_numbers != '' }}
@@ -64,3 +74,21 @@ jobs:
               });
               console.log(`Added A3-backport label to PR #${pullNumber}`);
             }
+
+      - name: Request Review
+        if: ${{ steps.backport.outputs.created_pull_numbers != '' }}
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const pullNumbers = '${{ steps.backport.outputs.created_pull_numbers }}'.split(' ');
+            const reviewer = '${{ github.event.pull_request.user.login }}';
+            
+            for (const pullNumber of pullNumbers) {
+              await github.pulls.createReviewRequest({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number: parseInt(pullNumber),
+                reviewers: [ reviewer ]
+              });
+              console.log(`Requested review from ${reviewer} for PR #${pullNumber}`);
+            }

From 1f1f20a87af49ad91ffa5c5c18c23426e9d62f76 Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Tue, 10 Sep 2024 17:23:27 +0300
Subject: [PATCH 03/12] Syncing strategy refactoring (#5469)

This is a step towards
https://github.com/paritytech/polkadot-sdk/issues/5333

The commits with code moving (but no other changes) and actual changes
are separated for easier review.

Essentially this results in `SyncingStrategy` trait replacing struct
(which is renamed to `PolkadotSyncingStrategy`, open for better name
suggestions). Technically it is already possible to replace
`PolkadotSyncingStrategy<B, Client>` with `Box<dyn SyncingStrategy<B>`
in syncing engine, but I decided to postpone such change until we
actually have an ability to customize it. It should also be possible to
swap `PolkadotSyncingStrategy` with just `ChainSync` that only supports
regular full sync from genesis (it also implements `SyncingStrategy`
trait).

While extracted trait still has a lot of non-generic stuff in it like
exposed knowledge of warp sync and `StrategyKey` with hardcoded set of
options, I believe this is a step in the right direction and will
address those in upcoming PRs.

With https://github.com/paritytech/polkadot-sdk/pull/5431 that landed
earlier warp sync configuration is more straightforward, but there are
still numerous things interleaved that will take some time to abstract
away nicely and expose in network config for developers. For now this is
an internal change even though data structures are technically public
and require major version bump.
---
 prdoc/pr_5469.prdoc                           |   11 +
 substrate/client/network/sync/src/engine.rs   |    9 +-
 substrate/client/network/sync/src/strategy.rs |  294 ++--
 .../network/sync/src/strategy/chain_sync.rs   | 1456 +++++++++--------
 .../sync/src/strategy/chain_sync/test.rs      |   30 +-
 5 files changed, 941 insertions(+), 859 deletions(-)
 create mode 100644 prdoc/pr_5469.prdoc

diff --git a/prdoc/pr_5469.prdoc b/prdoc/pr_5469.prdoc
new file mode 100644
index 0000000000000..1e6aa3c0c0726
--- /dev/null
+++ b/prdoc/pr_5469.prdoc
@@ -0,0 +1,11 @@
+title: Syncing strategy refactoring
+
+doc:
+  - audience: Node Dev
+    description: |
+      Mostly internal changes to syncing strategies that is a step towards making them configurable/extensible in the
+      future. It is unlikely that external developers will need to change their code.
+
+crates:
+  - name: sc-network-sync
+    bump: major
diff --git a/substrate/client/network/sync/src/engine.rs b/substrate/client/network/sync/src/engine.rs
index 4b6ccb085834f..86c1a7abf7446 100644
--- a/substrate/client/network/sync/src/engine.rs
+++ b/substrate/client/network/sync/src/engine.rs
@@ -33,7 +33,7 @@ use crate::{
 	},
 	strategy::{
 		warp::{EncodedProof, WarpProofRequest, WarpSyncConfig},
-		StrategyKey, SyncingAction, SyncingConfig, SyncingStrategy,
+		PolkadotSyncingStrategy, StrategyKey, SyncingAction, SyncingConfig, SyncingStrategy,
 	},
 	types::{
 		BadPeer, ExtendedPeerInfo, OpaqueStateRequest, OpaqueStateResponse, PeerRequest, SyncEvent,
@@ -189,7 +189,7 @@ pub struct Peer<B: BlockT> {
 
 pub struct SyncingEngine<B: BlockT, Client> {
 	/// Syncing strategy.
-	strategy: SyncingStrategy<B, Client>,
+	strategy: PolkadotSyncingStrategy<B, Client>,
 
 	/// Blockchain client.
 	client: Arc<Client>,
@@ -389,7 +389,8 @@ where
 			);
 
 		// Initialize syncing strategy.
-		let strategy = SyncingStrategy::new(syncing_config, client.clone(), warp_sync_config)?;
+		let strategy =
+			PolkadotSyncingStrategy::new(syncing_config, client.clone(), warp_sync_config)?;
 
 		let block_announce_protocol_name = block_announce_config.protocol_name().clone();
 		let (tx, service_rx) = tracing_unbounded("mpsc_chain_sync", 100_000);
@@ -697,7 +698,7 @@ where
 						number,
 					)
 				},
-				// Nothing to do, this is handled internally by `SyncingStrategy`.
+				// Nothing to do, this is handled internally by `PolkadotSyncingStrategy`.
 				SyncingAction::Finished => {},
 			}
 		}
diff --git a/substrate/client/network/sync/src/strategy.rs b/substrate/client/network/sync/src/strategy.rs
index ad3a9461c93b8..f8d6976bbaa0d 100644
--- a/substrate/client/network/sync/src/strategy.rs
+++ b/substrate/client/network/sync/src/strategy.rs
@@ -16,7 +16,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-//! [`SyncingStrategy`] is a proxy between [`crate::engine::SyncingEngine`]
+//! [`PolkadotSyncingStrategy`] is a proxy between [`crate::engine::SyncingEngine`]
 //! and specific syncing algorithms.
 
 pub mod chain_sync;
@@ -29,7 +29,7 @@ use crate::{
 	types::{BadPeer, OpaqueStateRequest, OpaqueStateResponse, SyncStatus},
 	LOG_TARGET,
 };
-use chain_sync::{ChainSync, ChainSyncAction, ChainSyncMode};
+use chain_sync::{ChainSync, ChainSyncMode};
 use log::{debug, error, info};
 use prometheus_endpoint::Registry;
 use sc_client_api::{BlockBackend, ProofProvider};
@@ -59,6 +59,108 @@ fn chain_sync_mode(sync_mode: SyncMode) -> ChainSyncMode {
 	}
 }
 
+/// Syncing strategy for syncing engine to use
+pub trait SyncingStrategy<B: BlockT>: Send
+where
+	B: BlockT,
+{
+	/// Notify syncing state machine that a new sync peer has connected.
+	fn add_peer(&mut self, peer_id: PeerId, best_hash: B::Hash, best_number: NumberFor<B>);
+
+	/// Notify that a sync peer has disconnected.
+	fn remove_peer(&mut self, peer_id: &PeerId);
+
+	/// Submit a validated block announcement.
+	///
+	/// Returns new best hash & best number of the peer if they are updated.
+	#[must_use]
+	fn on_validated_block_announce(
+		&mut self,
+		is_best: bool,
+		peer_id: PeerId,
+		announce: &BlockAnnounce<B::Header>,
+	) -> Option<(B::Hash, NumberFor<B>)>;
+
+	/// Configure an explicit fork sync request in case external code has detected that there is a
+	/// stale fork missing.
+	///
+	/// Note that this function should not be used for recent blocks.
+	/// Sync should be able to download all the recent forks normally.
+	///
+	/// Passing empty `peers` set effectively removes the sync request.
+	fn set_sync_fork_request(&mut self, peers: Vec<PeerId>, hash: &B::Hash, number: NumberFor<B>);
+
+	/// Request extra justification.
+	fn request_justification(&mut self, hash: &B::Hash, number: NumberFor<B>);
+
+	/// Clear extra justification requests.
+	fn clear_justification_requests(&mut self);
+
+	/// Report a justification import (successful or not).
+	fn on_justification_import(&mut self, hash: B::Hash, number: NumberFor<B>, success: bool);
+
+	/// Process block response.
+	fn on_block_response(
+		&mut self,
+		peer_id: PeerId,
+		key: StrategyKey,
+		request: BlockRequest<B>,
+		blocks: Vec<BlockData<B>>,
+	);
+
+	/// Process state response.
+	fn on_state_response(
+		&mut self,
+		peer_id: PeerId,
+		key: StrategyKey,
+		response: OpaqueStateResponse,
+	);
+
+	/// Process warp proof response.
+	fn on_warp_proof_response(
+		&mut self,
+		peer_id: &PeerId,
+		key: StrategyKey,
+		response: EncodedProof,
+	);
+
+	/// A batch of blocks that have been processed, with or without errors.
+	///
+	/// Call this when a batch of blocks that have been processed by the import queue, with or
+	/// without errors.
+	fn on_blocks_processed(
+		&mut self,
+		imported: usize,
+		count: usize,
+		results: Vec<(Result<BlockImportStatus<NumberFor<B>>, BlockImportError>, B::Hash)>,
+	);
+
+	/// Notify a syncing strategy that a block has been finalized.
+	fn on_block_finalized(&mut self, hash: &B::Hash, number: NumberFor<B>);
+
+	/// Inform sync about a new best imported block.
+	fn update_chain_info(&mut self, best_hash: &B::Hash, best_number: NumberFor<B>);
+
+	// Are we in major sync mode?
+	fn is_major_syncing(&self) -> bool;
+
+	/// Get the number of peers known to the syncing strategy.
+	fn num_peers(&self) -> usize;
+
+	/// Returns the current sync status.
+	fn status(&self) -> SyncStatus<B>;
+
+	/// Get the total number of downloaded blocks.
+	fn num_downloaded_blocks(&self) -> usize;
+
+	/// Get an estimate of the number of parallel sync requests.
+	fn num_sync_requests(&self) -> usize;
+
+	/// Get actions that should be performed by the owner on the strategy's behalf
+	#[must_use]
+	fn actions(&mut self) -> Result<Vec<SyncingAction<B>>, ClientError>;
+}
+
 /// Syncing configuration containing data for all strategies.
 #[derive(Clone, Debug)]
 pub struct SyncingConfig {
@@ -104,7 +206,7 @@ pub enum SyncingAction<B: BlockT> {
 		number: NumberFor<B>,
 		justifications: Justifications,
 	},
-	/// Strategy finished. Nothing to do, this is handled by `SyncingStrategy`.
+	/// Strategy finished. Nothing to do, this is handled by `PolkadotSyncingStrategy`.
 	Finished,
 }
 
@@ -140,26 +242,8 @@ impl<B: BlockT> From<StateStrategyAction<B>> for SyncingAction<B> {
 	}
 }
 
-impl<B: BlockT> From<ChainSyncAction<B>> for SyncingAction<B> {
-	fn from(action: ChainSyncAction<B>) -> Self {
-		match action {
-			ChainSyncAction::SendBlockRequest { peer_id, request } =>
-				SyncingAction::SendBlockRequest { peer_id, key: StrategyKey::ChainSync, request },
-			ChainSyncAction::SendStateRequest { peer_id, request } =>
-				SyncingAction::SendStateRequest { peer_id, key: StrategyKey::ChainSync, request },
-			ChainSyncAction::CancelRequest { peer_id } =>
-				SyncingAction::CancelRequest { peer_id, key: StrategyKey::ChainSync },
-			ChainSyncAction::DropPeer(bad_peer) => SyncingAction::DropPeer(bad_peer),
-			ChainSyncAction::ImportBlocks { origin, blocks } =>
-				SyncingAction::ImportBlocks { origin, blocks },
-			ChainSyncAction::ImportJustifications { peer_id, hash, number, justifications } =>
-				SyncingAction::ImportJustifications { peer_id, hash, number, justifications },
-		}
-	}
-}
-
-/// Proxy to specific syncing strategies.
-pub struct SyncingStrategy<B: BlockT, Client> {
+/// Proxy to specific syncing strategies used in Polkadot.
+pub struct PolkadotSyncingStrategy<B: BlockT, Client> {
 	/// Initial syncing configuration.
 	config: SyncingConfig,
 	/// Client used by syncing strategies.
@@ -171,11 +255,11 @@ pub struct SyncingStrategy<B: BlockT, Client> {
 	/// `ChainSync` strategy.`
 	chain_sync: Option<ChainSync<B, Client>>,
 	/// Connected peers and their best blocks used to seed a new strategy when switching to it in
-	/// [`SyncingStrategy::proceed_to_next`].
+	/// `PolkadotSyncingStrategy::proceed_to_next`.
 	peer_best_blocks: HashMap<PeerId, (B::Hash, NumberFor<B>)>,
 }
 
-impl<B: BlockT, Client> SyncingStrategy<B, Client>
+impl<B: BlockT, Client> SyncingStrategy<B> for PolkadotSyncingStrategy<B, Client>
 where
 	B: BlockT,
 	Client: HeaderBackend<B>
@@ -186,46 +270,7 @@ where
 		+ Sync
 		+ 'static,
 {
-	/// Initialize a new syncing strategy.
-	pub fn new(
-		config: SyncingConfig,
-		client: Arc<Client>,
-		warp_sync_config: Option<WarpSyncConfig<B>>,
-	) -> Result<Self, ClientError> {
-		if let SyncMode::Warp = config.mode {
-			let warp_sync_config = warp_sync_config
-				.expect("Warp sync configuration must be supplied in warp sync mode.");
-			let warp_sync = WarpSync::new(client.clone(), warp_sync_config);
-			Ok(Self {
-				config,
-				client,
-				warp: Some(warp_sync),
-				state: None,
-				chain_sync: None,
-				peer_best_blocks: Default::default(),
-			})
-		} else {
-			let chain_sync = ChainSync::new(
-				chain_sync_mode(config.mode),
-				client.clone(),
-				config.max_parallel_downloads,
-				config.max_blocks_per_request,
-				config.metrics_registry.as_ref(),
-				std::iter::empty(),
-			)?;
-			Ok(Self {
-				config,
-				client,
-				warp: None,
-				state: None,
-				chain_sync: Some(chain_sync),
-				peer_best_blocks: Default::default(),
-			})
-		}
-	}
-
-	/// Notify that a new peer has connected.
-	pub fn add_peer(&mut self, peer_id: PeerId, best_hash: B::Hash, best_number: NumberFor<B>) {
+	fn add_peer(&mut self, peer_id: PeerId, best_hash: B::Hash, best_number: NumberFor<B>) {
 		self.peer_best_blocks.insert(peer_id, (best_hash, best_number));
 
 		self.warp.as_mut().map(|s| s.add_peer(peer_id, best_hash, best_number));
@@ -233,8 +278,7 @@ where
 		self.chain_sync.as_mut().map(|s| s.add_peer(peer_id, best_hash, best_number));
 	}
 
-	/// Notify that a peer has disconnected.
-	pub fn remove_peer(&mut self, peer_id: &PeerId) {
+	fn remove_peer(&mut self, peer_id: &PeerId) {
 		self.warp.as_mut().map(|s| s.remove_peer(peer_id));
 		self.state.as_mut().map(|s| s.remove_peer(peer_id));
 		self.chain_sync.as_mut().map(|s| s.remove_peer(peer_id));
@@ -242,10 +286,7 @@ where
 		self.peer_best_blocks.remove(peer_id);
 	}
 
-	/// Submit a validated block announcement.
-	///
-	/// Returns new best hash & best number of the peer if they are updated.
-	pub fn on_validated_block_announce(
+	fn on_validated_block_announce(
 		&mut self,
 		is_best: bool,
 		peer_id: PeerId,
@@ -278,46 +319,35 @@ where
 		new_best
 	}
 
-	/// Configure an explicit fork sync request in case external code has detected that there is a
-	/// stale fork missing.
-	pub fn set_sync_fork_request(
-		&mut self,
-		peers: Vec<PeerId>,
-		hash: &B::Hash,
-		number: NumberFor<B>,
-	) {
+	fn set_sync_fork_request(&mut self, peers: Vec<PeerId>, hash: &B::Hash, number: NumberFor<B>) {
 		// Fork requests are only handled by `ChainSync`.
 		if let Some(ref mut chain_sync) = self.chain_sync {
 			chain_sync.set_sync_fork_request(peers.clone(), hash, number);
 		}
 	}
 
-	/// Request extra justification.
-	pub fn request_justification(&mut self, hash: &B::Hash, number: NumberFor<B>) {
+	fn request_justification(&mut self, hash: &B::Hash, number: NumberFor<B>) {
 		// Justifications can only be requested via `ChainSync`.
 		if let Some(ref mut chain_sync) = self.chain_sync {
 			chain_sync.request_justification(hash, number);
 		}
 	}
 
-	/// Clear extra justification requests.
-	pub fn clear_justification_requests(&mut self) {
+	fn clear_justification_requests(&mut self) {
 		// Justification requests can only be cleared by `ChainSync`.
 		if let Some(ref mut chain_sync) = self.chain_sync {
 			chain_sync.clear_justification_requests();
 		}
 	}
 
-	/// Report a justification import (successful or not).
-	pub fn on_justification_import(&mut self, hash: B::Hash, number: NumberFor<B>, success: bool) {
+	fn on_justification_import(&mut self, hash: B::Hash, number: NumberFor<B>, success: bool) {
 		// Only `ChainSync` is interested in justification import.
 		if let Some(ref mut chain_sync) = self.chain_sync {
 			chain_sync.on_justification_import(hash, number, success);
 		}
 	}
 
-	/// Process block response.
-	pub fn on_block_response(
+	fn on_block_response(
 		&mut self,
 		peer_id: PeerId,
 		key: StrategyKey,
@@ -329,7 +359,7 @@ where
 		} else if let (StrategyKey::ChainSync, Some(ref mut chain_sync)) =
 			(key, &mut self.chain_sync)
 		{
-			chain_sync.on_block_response(peer_id, request, blocks);
+			chain_sync.on_block_response(peer_id, key, request, blocks);
 		} else {
 			error!(
 				target: LOG_TARGET,
@@ -340,8 +370,7 @@ where
 		}
 	}
 
-	/// Process state response.
-	pub fn on_state_response(
+	fn on_state_response(
 		&mut self,
 		peer_id: PeerId,
 		key: StrategyKey,
@@ -352,7 +381,7 @@ where
 		} else if let (StrategyKey::ChainSync, Some(ref mut chain_sync)) =
 			(key, &mut self.chain_sync)
 		{
-			chain_sync.on_state_response(peer_id, response);
+			chain_sync.on_state_response(peer_id, key, response);
 		} else {
 			error!(
 				target: LOG_TARGET,
@@ -363,8 +392,7 @@ where
 		}
 	}
 
-	/// Process warp proof response.
-	pub fn on_warp_proof_response(
+	fn on_warp_proof_response(
 		&mut self,
 		peer_id: &PeerId,
 		key: StrategyKey,
@@ -382,8 +410,7 @@ where
 		}
 	}
 
-	/// A batch of blocks have been processed, with or without errors.
-	pub fn on_blocks_processed(
+	fn on_blocks_processed(
 		&mut self,
 		imported: usize,
 		count: usize,
@@ -397,24 +424,21 @@ where
 		}
 	}
 
-	/// Notify a syncing strategy that a block has been finalized.
-	pub fn on_block_finalized(&mut self, hash: &B::Hash, number: NumberFor<B>) {
+	fn on_block_finalized(&mut self, hash: &B::Hash, number: NumberFor<B>) {
 		// Only `ChainSync` is interested in block finalization notifications.
 		if let Some(ref mut chain_sync) = self.chain_sync {
 			chain_sync.on_block_finalized(hash, number);
 		}
 	}
 
-	/// Inform sync about a new best imported block.
-	pub fn update_chain_info(&mut self, best_hash: &B::Hash, best_number: NumberFor<B>) {
+	fn update_chain_info(&mut self, best_hash: &B::Hash, best_number: NumberFor<B>) {
 		// This is relevant to `ChainSync` only.
 		if let Some(ref mut chain_sync) = self.chain_sync {
 			chain_sync.update_chain_info(best_hash, best_number);
 		}
 	}
 
-	// Are we in major sync mode?
-	pub fn is_major_syncing(&self) -> bool {
+	fn is_major_syncing(&self) -> bool {
 		self.warp.is_some() ||
 			self.state.is_some() ||
 			match self.chain_sync {
@@ -423,13 +447,11 @@ where
 			}
 	}
 
-	/// Get the number of peers known to the syncing strategy.
-	pub fn num_peers(&self) -> usize {
+	fn num_peers(&self) -> usize {
 		self.peer_best_blocks.len()
 	}
 
-	/// Returns the current sync status.
-	pub fn status(&self) -> SyncStatus<B> {
+	fn status(&self) -> SyncStatus<B> {
 		// This function presumes that strategies are executed serially and must be refactored
 		// once we have parallel strategies.
 		if let Some(ref warp) = self.warp {
@@ -443,21 +465,17 @@ where
 		}
 	}
 
-	/// Get the total number of downloaded blocks.
-	pub fn num_downloaded_blocks(&self) -> usize {
+	fn num_downloaded_blocks(&self) -> usize {
 		self.chain_sync
 			.as_ref()
 			.map_or(0, |chain_sync| chain_sync.num_downloaded_blocks())
 	}
 
-	/// Get an estimate of the number of parallel sync requests.
-	pub fn num_sync_requests(&self) -> usize {
+	fn num_sync_requests(&self) -> usize {
 		self.chain_sync.as_ref().map_or(0, |chain_sync| chain_sync.num_sync_requests())
 	}
 
-	/// Get actions that should be performed by the owner on the strategy's behalf
-	#[must_use]
-	pub fn actions(&mut self) -> Result<Vec<SyncingAction<B>>, ClientError> {
+	fn actions(&mut self) -> Result<Vec<SyncingAction<B>>, ClientError> {
 		// This function presumes that strategies are executed serially and must be refactored once
 		// we have parallel strategies.
 		let actions: Vec<_> = if let Some(ref mut warp) = self.warp {
@@ -465,7 +483,7 @@ where
 		} else if let Some(ref mut state) = self.state {
 			state.actions().map(Into::into).collect()
 		} else if let Some(ref mut chain_sync) = self.chain_sync {
-			chain_sync.actions().map(Into::into).collect()
+			chain_sync.actions()?
 		} else {
 			unreachable!("At least one syncing strategy is always active; qed")
 		};
@@ -476,6 +494,56 @@ where
 
 		Ok(actions)
 	}
+}
+
+impl<B: BlockT, Client> PolkadotSyncingStrategy<B, Client>
+where
+	B: BlockT,
+	Client: HeaderBackend<B>
+		+ BlockBackend<B>
+		+ HeaderMetadata<B, Error = sp_blockchain::Error>
+		+ ProofProvider<B>
+		+ Send
+		+ Sync
+		+ 'static,
+{
+	/// Initialize a new syncing strategy.
+	pub fn new(
+		config: SyncingConfig,
+		client: Arc<Client>,
+		warp_sync_config: Option<WarpSyncConfig<B>>,
+	) -> Result<Self, ClientError> {
+		if let SyncMode::Warp = config.mode {
+			let warp_sync_config = warp_sync_config
+				.expect("Warp sync configuration must be supplied in warp sync mode.");
+			let warp_sync = WarpSync::new(client.clone(), warp_sync_config);
+			Ok(Self {
+				config,
+				client,
+				warp: Some(warp_sync),
+				state: None,
+				chain_sync: None,
+				peer_best_blocks: Default::default(),
+			})
+		} else {
+			let chain_sync = ChainSync::new(
+				chain_sync_mode(config.mode),
+				client.clone(),
+				config.max_parallel_downloads,
+				config.max_blocks_per_request,
+				config.metrics_registry.as_ref(),
+				std::iter::empty(),
+			)?;
+			Ok(Self {
+				config,
+				client,
+				warp: None,
+				state: None,
+				chain_sync: Some(chain_sync),
+				peer_best_blocks: Default::default(),
+			})
+		}
+	}
 
 	/// Proceed with the next strategy if the active one finished.
 	pub fn proceed_to_next(&mut self) -> Result<(), ClientError> {
diff --git a/substrate/client/network/sync/src/strategy/chain_sync.rs b/substrate/client/network/sync/src/strategy/chain_sync.rs
index cca83a5055cb2..a8ba5558d1bcb 100644
--- a/substrate/client/network/sync/src/strategy/chain_sync.rs
+++ b/substrate/client/network/sync/src/strategy/chain_sync.rs
@@ -35,7 +35,8 @@ use crate::{
 	strategy::{
 		disconnected_peers::DisconnectedPeers,
 		state_sync::{ImportResult, StateSync, StateSyncProvider},
-		warp::{WarpSyncPhase, WarpSyncProgress},
+		warp::{EncodedProof, WarpSyncPhase, WarpSyncProgress},
+		StrategyKey, SyncingAction, SyncingStrategy,
 	},
 	types::{BadPeer, OpaqueStateRequest, OpaqueStateResponse, SyncState, SyncStatus},
 	LOG_TARGET,
@@ -197,28 +198,6 @@ struct GapSync<B: BlockT> {
 	target: NumberFor<B>,
 }
 
-/// Action that the parent of [`ChainSync`] should perform after reporting a network or block event.
-#[derive(Debug)]
-pub enum ChainSyncAction<B: BlockT> {
-	/// Send block request to peer. Always implies dropping a stale block request to the same peer.
-	SendBlockRequest { peer_id: PeerId, request: BlockRequest<B> },
-	/// Send state request to peer.
-	SendStateRequest { peer_id: PeerId, request: OpaqueStateRequest },
-	/// Drop stale request.
-	CancelRequest { peer_id: PeerId },
-	/// Peer misbehaved. Disconnect, report it and cancel the block request to it.
-	DropPeer(BadPeer),
-	/// Import blocks.
-	ImportBlocks { origin: BlockOrigin, blocks: Vec<IncomingBlock<B>> },
-	/// Import justifications.
-	ImportJustifications {
-		peer_id: PeerId,
-		hash: B::Hash,
-		number: NumberFor<B>,
-		justifications: Justifications,
-	},
-}
-
 /// Sync operation mode.
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub enum ChainSyncMode {
@@ -233,6 +212,75 @@ pub enum ChainSyncMode {
 	},
 }
 
+/// All the data we have about a Peer that we are trying to sync with
+#[derive(Debug, Clone)]
+pub(crate) struct PeerSync<B: BlockT> {
+	/// Peer id of this peer.
+	pub peer_id: PeerId,
+	/// The common number is the block number that is a common point of
+	/// ancestry for both our chains (as far as we know).
+	pub common_number: NumberFor<B>,
+	/// The hash of the best block that we've seen for this peer.
+	pub best_hash: B::Hash,
+	/// The number of the best block that we've seen for this peer.
+	pub best_number: NumberFor<B>,
+	/// The state of syncing this peer is in for us, generally categories
+	/// into `Available` or "busy" with something as defined by `PeerSyncState`.
+	pub state: PeerSyncState<B>,
+}
+
+impl<B: BlockT> PeerSync<B> {
+	/// Update the `common_number` iff `new_common > common_number`.
+	fn update_common_number(&mut self, new_common: NumberFor<B>) {
+		if self.common_number < new_common {
+			trace!(
+				target: LOG_TARGET,
+				"Updating peer {} common number from={} => to={}.",
+				self.peer_id,
+				self.common_number,
+				new_common,
+			);
+			self.common_number = new_common;
+		}
+	}
+}
+
+struct ForkTarget<B: BlockT> {
+	number: NumberFor<B>,
+	parent_hash: Option<B::Hash>,
+	peers: HashSet<PeerId>,
+}
+
+/// The state of syncing between a Peer and ourselves.
+///
+/// Generally two categories, "busy" or `Available`. If busy, the enum
+/// defines what we are busy with.
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+pub(crate) enum PeerSyncState<B: BlockT> {
+	/// Available for sync requests.
+	Available,
+	/// Searching for ancestors the Peer has in common with us.
+	AncestorSearch { start: NumberFor<B>, current: NumberFor<B>, state: AncestorSearchState<B> },
+	/// Actively downloading new blocks, starting from the given Number.
+	DownloadingNew(NumberFor<B>),
+	/// Downloading a stale block with given Hash. Stale means that it is a
+	/// block with a number that is lower than our best number. It might be
+	/// from a fork and not necessarily already imported.
+	DownloadingStale(B::Hash),
+	/// Downloading justification for given block hash.
+	DownloadingJustification(B::Hash),
+	/// Downloading state.
+	DownloadingState,
+	/// Actively downloading block history after warp sync.
+	DownloadingGap(NumberFor<B>),
+}
+
+impl<B: BlockT> PeerSyncState<B> {
+	pub fn is_available(&self) -> bool {
+		matches!(self, Self::Available)
+	}
+}
+
 /// The main data structure which contains all the state for a chains
 /// active syncing strategy.
 pub struct ChainSync<B: BlockT, Client> {
@@ -280,77 +328,563 @@ pub struct ChainSync<B: BlockT, Client> {
 	/// Gap download process.
 	gap_sync: Option<GapSync<B>>,
 	/// Pending actions.
-	actions: Vec<ChainSyncAction<B>>,
+	actions: Vec<SyncingAction<B>>,
 	/// Prometheus metrics.
 	metrics: Option<Metrics>,
 }
 
-/// All the data we have about a Peer that we are trying to sync with
-#[derive(Debug, Clone)]
-pub(crate) struct PeerSync<B: BlockT> {
-	/// Peer id of this peer.
-	pub peer_id: PeerId,
-	/// The common number is the block number that is a common point of
-	/// ancestry for both our chains (as far as we know).
-	pub common_number: NumberFor<B>,
-	/// The hash of the best block that we've seen for this peer.
-	pub best_hash: B::Hash,
-	/// The number of the best block that we've seen for this peer.
-	pub best_number: NumberFor<B>,
-	/// The state of syncing this peer is in for us, generally categories
-	/// into `Available` or "busy" with something as defined by `PeerSyncState`.
-	pub state: PeerSyncState<B>,
-}
+impl<B, Client> SyncingStrategy<B> for ChainSync<B, Client>
+where
+	B: BlockT,
+	Client: HeaderBackend<B>
+		+ BlockBackend<B>
+		+ HeaderMetadata<B, Error = sp_blockchain::Error>
+		+ ProofProvider<B>
+		+ Send
+		+ Sync
+		+ 'static,
+{
+	fn add_peer(&mut self, peer_id: PeerId, best_hash: B::Hash, best_number: NumberFor<B>) {
+		match self.add_peer_inner(peer_id, best_hash, best_number) {
+			Ok(Some(request)) => self.actions.push(SyncingAction::SendBlockRequest {
+				peer_id,
+				key: StrategyKey::ChainSync,
+				request,
+			}),
+			Ok(None) => {},
+			Err(bad_peer) => self.actions.push(SyncingAction::DropPeer(bad_peer)),
+		}
+	}
+
+	fn remove_peer(&mut self, peer_id: &PeerId) {
+		self.blocks.clear_peer_download(peer_id);
+		if let Some(gap_sync) = &mut self.gap_sync {
+			gap_sync.blocks.clear_peer_download(peer_id)
+		}
+
+		if let Some(state) = self.peers.remove(peer_id) {
+			if !state.state.is_available() {
+				if let Some(bad_peer) =
+					self.disconnected_peers.on_disconnect_during_request(*peer_id)
+				{
+					self.actions.push(SyncingAction::DropPeer(bad_peer));
+				}
+			}
+		}
+
+		self.extra_justifications.peer_disconnected(peer_id);
+		self.allowed_requests.set_all();
+		self.fork_targets.retain(|_, target| {
+			target.peers.remove(peer_id);
+			!target.peers.is_empty()
+		});
+		if let Some(metrics) = &self.metrics {
+			metrics.fork_targets.set(self.fork_targets.len().try_into().unwrap_or(u64::MAX));
+		}
+
+		let blocks = self.ready_blocks();
+
+		if !blocks.is_empty() {
+			self.validate_and_queue_blocks(blocks, false);
+		}
+	}
+
+	fn on_validated_block_announce(
+		&mut self,
+		is_best: bool,
+		peer_id: PeerId,
+		announce: &BlockAnnounce<B::Header>,
+	) -> Option<(B::Hash, NumberFor<B>)> {
+		let number = *announce.header.number();
+		let hash = announce.header.hash();
+		let parent_status =
+			self.block_status(announce.header.parent_hash()).unwrap_or(BlockStatus::Unknown);
+		let known_parent = parent_status != BlockStatus::Unknown;
+		let ancient_parent = parent_status == BlockStatus::InChainPruned;
+
+		let known = self.is_known(&hash);
+		let peer = if let Some(peer) = self.peers.get_mut(&peer_id) {
+			peer
+		} else {
+			error!(target: LOG_TARGET, "💔 Called `on_validated_block_announce` with a bad peer ID {peer_id}");
+			return Some((hash, number))
+		};
+
+		if let PeerSyncState::AncestorSearch { .. } = peer.state {
+			trace!(target: LOG_TARGET, "Peer {} is in the ancestor search state.", peer_id);
+			return None
+		}
+
+		let peer_info = is_best.then(|| {
+			// update their best block
+			peer.best_number = number;
+			peer.best_hash = hash;
+
+			(hash, number)
+		});
+
+		// If the announced block is the best they have and is not ahead of us, our common number
+		// is either one further ahead or it's the one they just announced, if we know about it.
+		if is_best {
+			if known && self.best_queued_number >= number {
+				self.update_peer_common_number(&peer_id, number);
+			} else if announce.header.parent_hash() == &self.best_queued_hash ||
+				known_parent && self.best_queued_number >= number
+			{
+				self.update_peer_common_number(&peer_id, number.saturating_sub(One::one()));
+			}
+		}
+		self.allowed_requests.add(&peer_id);
+
+		// known block case
+		if known || self.is_already_downloading(&hash) {
+			trace!(target: LOG_TARGET, "Known block announce from {}: {}", peer_id, hash);
+			if let Some(target) = self.fork_targets.get_mut(&hash) {
+				target.peers.insert(peer_id);
+			}
+			return peer_info
+		}
+
+		if ancient_parent {
+			trace!(
+				target: LOG_TARGET,
+				"Ignored ancient block announced from {}: {} {:?}",
+				peer_id,
+				hash,
+				announce.header,
+			);
+			return peer_info
+		}
+
+		if self.status().state == SyncState::Idle {
+			trace!(
+				target: LOG_TARGET,
+				"Added sync target for block announced from {}: {} {:?}",
+				peer_id,
+				hash,
+				announce.summary(),
+			);
+			self.fork_targets
+				.entry(hash)
+				.or_insert_with(|| {
+					if let Some(metrics) = &self.metrics {
+						metrics.fork_targets.inc();
+					}
+
+					ForkTarget {
+						number,
+						parent_hash: Some(*announce.header.parent_hash()),
+						peers: Default::default(),
+					}
+				})
+				.peers
+				.insert(peer_id);
+		}
+
+		peer_info
+	}
+
+	// The implementation is similar to `on_validated_block_announce` with unknown parent hash.
+	fn set_sync_fork_request(
+		&mut self,
+		mut peers: Vec<PeerId>,
+		hash: &B::Hash,
+		number: NumberFor<B>,
+	) {
+		if peers.is_empty() {
+			peers = self
+				.peers
+				.iter()
+				// Only request blocks from peers who are ahead or on a par.
+				.filter(|(_, peer)| peer.best_number >= number)
+				.map(|(id, _)| *id)
+				.collect();
+
+			debug!(
+				target: LOG_TARGET,
+				"Explicit sync request for block {hash:?} with no peers specified. \
+				Syncing from these peers {peers:?} instead.",
+			);
+		} else {
+			debug!(
+				target: LOG_TARGET,
+				"Explicit sync request for block {hash:?} with {peers:?}",
+			);
+		}
+
+		if self.is_known(hash) {
+			debug!(target: LOG_TARGET, "Refusing to sync known hash {hash:?}");
+			return
+		}
+
+		trace!(target: LOG_TARGET, "Downloading requested old fork {hash:?}");
+		for peer_id in &peers {
+			if let Some(peer) = self.peers.get_mut(peer_id) {
+				if let PeerSyncState::AncestorSearch { .. } = peer.state {
+					continue
+				}
+
+				if number > peer.best_number {
+					peer.best_number = number;
+					peer.best_hash = *hash;
+				}
+				self.allowed_requests.add(peer_id);
+			}
+		}
+
+		self.fork_targets
+			.entry(*hash)
+			.or_insert_with(|| {
+				if let Some(metrics) = &self.metrics {
+					metrics.fork_targets.inc();
+				}
+
+				ForkTarget { number, peers: Default::default(), parent_hash: None }
+			})
+			.peers
+			.extend(peers);
+	}
+
+	fn request_justification(&mut self, hash: &B::Hash, number: NumberFor<B>) {
+		let client = &self.client;
+		self.extra_justifications
+			.schedule((*hash, number), |base, block| is_descendent_of(&**client, base, block))
+	}
+
+	fn clear_justification_requests(&mut self) {
+		self.extra_justifications.reset();
+	}
+
+	fn on_justification_import(&mut self, hash: B::Hash, number: NumberFor<B>, success: bool) {
+		let finalization_result = if success { Ok((hash, number)) } else { Err(()) };
+		self.extra_justifications
+			.try_finalize_root((hash, number), finalization_result, true);
+		self.allowed_requests.set_all();
+	}
+
+	fn on_block_response(
+		&mut self,
+		peer_id: PeerId,
+		key: StrategyKey,
+		request: BlockRequest<B>,
+		blocks: Vec<BlockData<B>>,
+	) {
+		if key != StrategyKey::ChainSync {
+			error!(
+				target: LOG_TARGET,
+				"`on_block_response()` called with unexpected key {key:?} for chain sync",
+			);
+			debug_assert!(false);
+		}
+		let block_response = BlockResponse::<B> { id: request.id, blocks };
+
+		let blocks_range = || match (
+			block_response
+				.blocks
+				.first()
+				.and_then(|b| b.header.as_ref().map(|h| h.number())),
+			block_response.blocks.last().and_then(|b| b.header.as_ref().map(|h| h.number())),
+		) {
+			(Some(first), Some(last)) if first != last => format!(" ({}..{})", first, last),
+			(Some(first), Some(_)) => format!(" ({})", first),
+			_ => Default::default(),
+		};
+		trace!(
+			target: LOG_TARGET,
+			"BlockResponse {} from {} with {} blocks {}",
+			block_response.id,
+			peer_id,
+			block_response.blocks.len(),
+			blocks_range(),
+		);
+
+		let res = if request.fields == BlockAttributes::JUSTIFICATION {
+			self.on_block_justification(peer_id, block_response)
+		} else {
+			self.on_block_data(&peer_id, Some(request), block_response)
+		};
+
+		if let Err(bad_peer) = res {
+			self.actions.push(SyncingAction::DropPeer(bad_peer));
+		}
+	}
+
+	fn on_state_response(
+		&mut self,
+		peer_id: PeerId,
+		key: StrategyKey,
+		response: OpaqueStateResponse,
+	) {
+		if key != StrategyKey::ChainSync {
+			error!(
+				target: LOG_TARGET,
+				"`on_state_response()` called with unexpected key {key:?} for chain sync",
+			);
+			debug_assert!(false);
+		}
+		if let Err(bad_peer) = self.on_state_data(&peer_id, response) {
+			self.actions.push(SyncingAction::DropPeer(bad_peer));
+		}
+	}
+
+	fn on_warp_proof_response(
+		&mut self,
+		_peer_id: &PeerId,
+		_key: StrategyKey,
+		_response: EncodedProof,
+	) {
+		error!(
+			target: LOG_TARGET,
+			"`on_warp_proof_response()` called for chain sync strategy",
+		);
+		debug_assert!(false);
+	}
+
+	fn on_blocks_processed(
+		&mut self,
+		imported: usize,
+		count: usize,
+		results: Vec<(Result<BlockImportStatus<NumberFor<B>>, BlockImportError>, B::Hash)>,
+	) {
+		trace!(target: LOG_TARGET, "Imported {imported} of {count}");
+
+		let mut has_error = false;
+		for (_, hash) in &results {
+			if self.queue_blocks.remove(hash) {
+				if let Some(metrics) = &self.metrics {
+					metrics.queued_blocks.dec();
+				}
+			}
+			self.blocks.clear_queued(hash);
+			if let Some(gap_sync) = &mut self.gap_sync {
+				gap_sync.blocks.clear_queued(hash);
+			}
+		}
+		for (result, hash) in results {
+			if has_error {
+				break
+			}
+
+			has_error |= result.is_err();
+
+			match result {
+				Ok(BlockImportStatus::ImportedKnown(number, peer_id)) =>
+					if let Some(peer) = peer_id {
+						self.update_peer_common_number(&peer, number);
+					},
+				Ok(BlockImportStatus::ImportedUnknown(number, aux, peer_id)) => {
+					if aux.clear_justification_requests {
+						trace!(
+							target: LOG_TARGET,
+							"Block imported clears all pending justification requests {number}: {hash:?}",
+						);
+						self.clear_justification_requests();
+					}
+
+					if aux.needs_justification {
+						trace!(
+							target: LOG_TARGET,
+							"Block imported but requires justification {number}: {hash:?}",
+						);
+						self.request_justification(&hash, number);
+					}
+
+					if aux.bad_justification {
+						if let Some(ref peer) = peer_id {
+							warn!("💔 Sent block with bad justification to import");
+							self.actions.push(SyncingAction::DropPeer(BadPeer(
+								*peer,
+								rep::BAD_JUSTIFICATION,
+							)));
+						}
+					}
+
+					if let Some(peer) = peer_id {
+						self.update_peer_common_number(&peer, number);
+					}
+					let state_sync_complete =
+						self.state_sync.as_ref().map_or(false, |s| s.target_hash() == hash);
+					if state_sync_complete {
+						info!(
+							target: LOG_TARGET,
+							"State sync is complete ({} MiB), restarting block sync.",
+							self.state_sync.as_ref().map_or(0, |s| s.progress().size / (1024 * 1024)),
+						);
+						self.state_sync = None;
+						self.mode = ChainSyncMode::Full;
+						self.restart();
+					}
+					let gap_sync_complete =
+						self.gap_sync.as_ref().map_or(false, |s| s.target == number);
+					if gap_sync_complete {
+						info!(
+							target: LOG_TARGET,
+							"Block history download is complete."
+						);
+						self.gap_sync = None;
+					}
+				},
+				Err(BlockImportError::IncompleteHeader(peer_id)) =>
+					if let Some(peer) = peer_id {
+						warn!(
+							target: LOG_TARGET,
+							"💔 Peer sent block with incomplete header to import",
+						);
+						self.actions
+							.push(SyncingAction::DropPeer(BadPeer(peer, rep::INCOMPLETE_HEADER)));
+						self.restart();
+					},
+				Err(BlockImportError::VerificationFailed(peer_id, e)) => {
+					let extra_message = peer_id
+						.map_or_else(|| "".into(), |peer| format!(" received from ({peer})"));
+
+					warn!(
+						target: LOG_TARGET,
+						"💔 Verification failed for block {hash:?}{extra_message}: {e:?}",
+					);
+
+					if let Some(peer) = peer_id {
+						self.actions
+							.push(SyncingAction::DropPeer(BadPeer(peer, rep::VERIFICATION_FAIL)));
+					}
+
+					self.restart();
+				},
+				Err(BlockImportError::BadBlock(peer_id)) =>
+					if let Some(peer) = peer_id {
+						warn!(
+							target: LOG_TARGET,
+							"💔 Block {hash:?} received from peer {peer} has been blacklisted",
+						);
+						self.actions.push(SyncingAction::DropPeer(BadPeer(peer, rep::BAD_BLOCK)));
+					},
+				Err(BlockImportError::MissingState) => {
+					// This may happen if the chain we were requesting upon has been discarded
+					// in the meantime because other chain has been finalized.
+					// Don't mark it as bad as it still may be synced if explicitly requested.
+					trace!(target: LOG_TARGET, "Obsolete block {hash:?}");
+				},
+				e @ Err(BlockImportError::UnknownParent) | e @ Err(BlockImportError::Other(_)) => {
+					warn!(target: LOG_TARGET, "💔 Error importing block {hash:?}: {}", e.unwrap_err());
+					self.state_sync = None;
+					self.restart();
+				},
+				Err(BlockImportError::Cancelled) => {},
+			};
+		}
+
+		self.allowed_requests.set_all();
+	}
+
+	fn on_block_finalized(&mut self, hash: &B::Hash, number: NumberFor<B>) {
+		let client = &self.client;
+		let r = self.extra_justifications.on_block_finalized(hash, number, |base, block| {
+			is_descendent_of(&**client, base, block)
+		});
+
+		if let ChainSyncMode::LightState { skip_proofs, .. } = &self.mode {
+			if self.state_sync.is_none() {
+				if !self.peers.is_empty() && self.queue_blocks.is_empty() {
+					self.attempt_state_sync(*hash, number, *skip_proofs);
+				} else {
+					self.pending_state_sync_attempt.replace((*hash, number, *skip_proofs));
+				}
+			}
+		}
+
+		if let Err(err) = r {
+			warn!(
+				target: LOG_TARGET,
+				"💔 Error cleaning up pending extra justification data requests: {err}",
+			);
+		}
+	}
+
+	fn update_chain_info(&mut self, best_hash: &B::Hash, best_number: NumberFor<B>) {
+		self.on_block_queued(best_hash, best_number);
+	}
+
+	fn is_major_syncing(&self) -> bool {
+		self.status().state.is_major_syncing()
+	}
+
+	fn num_peers(&self) -> usize {
+		self.peers.len()
+	}
+
+	fn status(&self) -> SyncStatus<B> {
+		let median_seen = self.median_seen();
+		let best_seen_block =
+			median_seen.and_then(|median| (median > self.best_queued_number).then_some(median));
+		let sync_state = if let Some(target) = median_seen {
+			// A chain is classified as downloading if the provided best block is
+			// more than `MAJOR_SYNC_BLOCKS` behind the best block or as importing
+			// if the same can be said about queued blocks.
+			let best_block = self.client.info().best_number;
+			if target > best_block && target - best_block > MAJOR_SYNC_BLOCKS.into() {
+				// If target is not queued, we're downloading, otherwise importing.
+				if target > self.best_queued_number {
+					SyncState::Downloading { target }
+				} else {
+					SyncState::Importing { target }
+				}
+			} else {
+				SyncState::Idle
+			}
+		} else {
+			SyncState::Idle
+		};
+
+		let warp_sync_progress = self.gap_sync.as_ref().map(|gap_sync| WarpSyncProgress {
+			phase: WarpSyncPhase::DownloadingBlocks(gap_sync.best_queued_number),
+			total_bytes: 0,
+		});
 
-impl<B: BlockT> PeerSync<B> {
-	/// Update the `common_number` iff `new_common > common_number`.
-	fn update_common_number(&mut self, new_common: NumberFor<B>) {
-		if self.common_number < new_common {
-			trace!(
-				target: LOG_TARGET,
-				"Updating peer {} common number from={} => to={}.",
-				self.peer_id,
-				self.common_number,
-				new_common,
-			);
-			self.common_number = new_common;
+		SyncStatus {
+			state: sync_state,
+			best_seen_block,
+			num_peers: self.peers.len() as u32,
+			queued_blocks: self.queue_blocks.len() as u32,
+			state_sync: self.state_sync.as_ref().map(|s| s.progress()),
+			warp_sync: warp_sync_progress,
 		}
 	}
-}
 
-struct ForkTarget<B: BlockT> {
-	number: NumberFor<B>,
-	parent_hash: Option<B::Hash>,
-	peers: HashSet<PeerId>,
-}
+	fn num_downloaded_blocks(&self) -> usize {
+		self.downloaded_blocks
+	}
 
-/// The state of syncing between a Peer and ourselves.
-///
-/// Generally two categories, "busy" or `Available`. If busy, the enum
-/// defines what we are busy with.
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
-pub(crate) enum PeerSyncState<B: BlockT> {
-	/// Available for sync requests.
-	Available,
-	/// Searching for ancestors the Peer has in common with us.
-	AncestorSearch { start: NumberFor<B>, current: NumberFor<B>, state: AncestorSearchState<B> },
-	/// Actively downloading new blocks, starting from the given Number.
-	DownloadingNew(NumberFor<B>),
-	/// Downloading a stale block with given Hash. Stale means that it is a
-	/// block with a number that is lower than our best number. It might be
-	/// from a fork and not necessarily already imported.
-	DownloadingStale(B::Hash),
-	/// Downloading justification for given block hash.
-	DownloadingJustification(B::Hash),
-	/// Downloading state.
-	DownloadingState,
-	/// Actively downloading block history after warp sync.
-	DownloadingGap(NumberFor<B>),
-}
+	fn num_sync_requests(&self) -> usize {
+		self.fork_targets
+			.values()
+			.filter(|f| f.number <= self.best_queued_number)
+			.count()
+	}
 
-impl<B: BlockT> PeerSyncState<B> {
-	pub fn is_available(&self) -> bool {
-		matches!(self, Self::Available)
+	fn actions(&mut self) -> Result<Vec<SyncingAction<B>>, ClientError> {
+		if !self.peers.is_empty() && self.queue_blocks.is_empty() {
+			if let Some((hash, number, skip_proofs)) = self.pending_state_sync_attempt.take() {
+				self.attempt_state_sync(hash, number, skip_proofs);
+			}
+		}
+
+		let block_requests = self.block_requests().into_iter().map(|(peer_id, request)| {
+			SyncingAction::SendBlockRequest { peer_id, key: StrategyKey::ChainSync, request }
+		});
+		self.actions.extend(block_requests);
+
+		let justification_requests =
+			self.justification_requests().into_iter().map(|(peer_id, request)| {
+				SyncingAction::SendBlockRequest { peer_id, key: StrategyKey::ChainSync, request }
+			});
+		self.actions.extend(justification_requests);
+
+		let state_request = self.state_request().into_iter().map(|(peer_id, request)| {
+			SyncingAction::SendStateRequest { peer_id, key: StrategyKey::ChainSync, request }
+		});
+		self.actions.extend(state_request);
+
+		Ok(std::mem::take(&mut self.actions))
 	}
 }
 
@@ -414,73 +948,6 @@ where
 		Ok(sync)
 	}
 
-	/// Returns the current sync status.
-	pub fn status(&self) -> SyncStatus<B> {
-		let median_seen = self.median_seen();
-		let best_seen_block =
-			median_seen.and_then(|median| (median > self.best_queued_number).then_some(median));
-		let sync_state = if let Some(target) = median_seen {
-			// A chain is classified as downloading if the provided best block is
-			// more than `MAJOR_SYNC_BLOCKS` behind the best block or as importing
-			// if the same can be said about queued blocks.
-			let best_block = self.client.info().best_number;
-			if target > best_block && target - best_block > MAJOR_SYNC_BLOCKS.into() {
-				// If target is not queued, we're downloading, otherwise importing.
-				if target > self.best_queued_number {
-					SyncState::Downloading { target }
-				} else {
-					SyncState::Importing { target }
-				}
-			} else {
-				SyncState::Idle
-			}
-		} else {
-			SyncState::Idle
-		};
-
-		let warp_sync_progress = self.gap_sync.as_ref().map(|gap_sync| WarpSyncProgress {
-			phase: WarpSyncPhase::DownloadingBlocks(gap_sync.best_queued_number),
-			total_bytes: 0,
-		});
-
-		SyncStatus {
-			state: sync_state,
-			best_seen_block,
-			num_peers: self.peers.len() as u32,
-			queued_blocks: self.queue_blocks.len() as u32,
-			state_sync: self.state_sync.as_ref().map(|s| s.progress()),
-			warp_sync: warp_sync_progress,
-		}
-	}
-
-	/// Get an estimate of the number of parallel sync requests.
-	pub fn num_sync_requests(&self) -> usize {
-		self.fork_targets
-			.values()
-			.filter(|f| f.number <= self.best_queued_number)
-			.count()
-	}
-
-	/// Get the total number of downloaded blocks.
-	pub fn num_downloaded_blocks(&self) -> usize {
-		self.downloaded_blocks
-	}
-
-	/// Get the number of peers known to the syncing state machine.
-	pub fn num_peers(&self) -> usize {
-		self.peers.len()
-	}
-
-	/// Notify syncing state machine that a new sync peer has connected.
-	pub fn add_peer(&mut self, peer_id: PeerId, best_hash: B::Hash, best_number: NumberFor<B>) {
-		match self.add_peer_inner(peer_id, best_hash, best_number) {
-			Ok(Some(request)) =>
-				self.actions.push(ChainSyncAction::SendBlockRequest { peer_id, request }),
-			Ok(None) => {},
-			Err(bad_peer) => self.actions.push(ChainSyncAction::DropPeer(bad_peer)),
-		}
-	}
-
 	#[must_use]
 	fn add_peer_inner(
 		&mut self,
@@ -550,138 +1017,53 @@ where
 						peer_id,
 						best_hash,
 						best_number
-					);
-
-					(
-						PeerSyncState::AncestorSearch {
-							current: common_best,
-							start: self.best_queued_number,
-							state: AncestorSearchState::ExponentialBackoff(One::one()),
-						},
-						Some(ancestry_request::<B>(common_best)),
-					)
-				};
-
-				self.allowed_requests.add(&peer_id);
-				self.peers.insert(
-					peer_id,
-					PeerSync {
-						peer_id,
-						common_number: Zero::zero(),
-						best_hash,
-						best_number,
-						state,
-					},
-				);
-
-				Ok(req)
-			},
-			Ok(BlockStatus::Queued) |
-			Ok(BlockStatus::InChainWithState) |
-			Ok(BlockStatus::InChainPruned) => {
-				debug!(
-					target: LOG_TARGET,
-					"New peer {peer_id} with known best hash {best_hash} ({best_number}).",
-				);
-				self.peers.insert(
-					peer_id,
-					PeerSync {
-						peer_id,
-						common_number: std::cmp::min(self.best_queued_number, best_number),
-						best_hash,
-						best_number,
-						state: PeerSyncState::Available,
-					},
-				);
-				self.allowed_requests.add(&peer_id);
-				Ok(None)
-			},
-		}
-	}
-
-	/// Inform sync about a new best imported block.
-	pub fn update_chain_info(&mut self, best_hash: &B::Hash, best_number: NumberFor<B>) {
-		self.on_block_queued(best_hash, best_number);
-	}
-
-	/// Request extra justification.
-	pub fn request_justification(&mut self, hash: &B::Hash, number: NumberFor<B>) {
-		let client = &self.client;
-		self.extra_justifications
-			.schedule((*hash, number), |base, block| is_descendent_of(&**client, base, block))
-	}
-
-	/// Clear extra justification requests.
-	pub fn clear_justification_requests(&mut self) {
-		self.extra_justifications.reset();
-	}
-
-	/// Configure an explicit fork sync request in case external code has detected that there is a
-	/// stale fork missing.
-	///
-	/// Note that this function should not be used for recent blocks.
-	/// Sync should be able to download all the recent forks normally.
-	///
-	/// Passing empty `peers` set effectively removes the sync request.
-	// The implementation is similar to `on_validated_block_announce` with unknown parent hash.
-	pub fn set_sync_fork_request(
-		&mut self,
-		mut peers: Vec<PeerId>,
-		hash: &B::Hash,
-		number: NumberFor<B>,
-	) {
-		if peers.is_empty() {
-			peers = self
-				.peers
-				.iter()
-				// Only request blocks from peers who are ahead or on a par.
-				.filter(|(_, peer)| peer.best_number >= number)
-				.map(|(id, _)| *id)
-				.collect();
-
-			debug!(
-				target: LOG_TARGET,
-				"Explicit sync request for block {hash:?} with no peers specified. \
-				Syncing from these peers {peers:?} instead.",
-			);
-		} else {
-			debug!(
-				target: LOG_TARGET,
-				"Explicit sync request for block {hash:?} with {peers:?}",
-			);
-		}
-
-		if self.is_known(hash) {
-			debug!(target: LOG_TARGET, "Refusing to sync known hash {hash:?}");
-			return;
-		}
-
-		trace!(target: LOG_TARGET, "Downloading requested old fork {hash:?}");
-		for peer_id in &peers {
-			if let Some(peer) = self.peers.get_mut(peer_id) {
-				if let PeerSyncState::AncestorSearch { .. } = peer.state {
-					continue;
-				}
-
-				if number > peer.best_number {
-					peer.best_number = number;
-					peer.best_hash = *hash;
-				}
-				self.allowed_requests.add(peer_id);
-			}
-		}
+					);
 
-		self.fork_targets
-			.entry(*hash)
-			.or_insert_with(|| {
-				if let Some(metrics) = &self.metrics {
-					metrics.fork_targets.inc();
-				}
+					(
+						PeerSyncState::AncestorSearch {
+							current: common_best,
+							start: self.best_queued_number,
+							state: AncestorSearchState::ExponentialBackoff(One::one()),
+						},
+						Some(ancestry_request::<B>(common_best)),
+					)
+				};
 
-				ForkTarget { number, peers: Default::default(), parent_hash: None }
-			})
-			.peers
-			.extend(peers);
+				self.allowed_requests.add(&peer_id);
+				self.peers.insert(
+					peer_id,
+					PeerSync {
+						peer_id,
+						common_number: Zero::zero(),
+						best_hash,
+						best_number,
+						state,
+					},
+				);
+
+				Ok(req)
+			},
+			Ok(BlockStatus::Queued) |
+			Ok(BlockStatus::InChainWithState) |
+			Ok(BlockStatus::InChainPruned) => {
+				debug!(
+					target: LOG_TARGET,
+					"New peer {peer_id} with known best hash {best_hash} ({best_number}).",
+				);
+				self.peers.insert(
+					peer_id,
+					PeerSync {
+						peer_id,
+						common_number: std::cmp::min(self.best_queued_number, best_number),
+						best_hash,
+						best_number,
+						state: PeerSyncState::Available,
+					},
+				);
+				self.allowed_requests.add(&peer_id);
+				Ok(None)
+			},
+		}
 	}
 
 	/// Submit a block response for processing.
@@ -857,8 +1239,9 @@ where
 								state: next_state,
 							};
 							let request = ancestry_request::<B>(next_num);
-							self.actions.push(ChainSyncAction::SendBlockRequest {
+							self.actions.push(SyncingAction::SendBlockRequest {
 								peer_id: *peer_id,
+								key: StrategyKey::ChainSync,
 								request,
 							});
 							return Ok(());
@@ -965,240 +1348,45 @@ where
 
 			// We only request one justification at a time
 			let justification = if let Some(block) = response.blocks.into_iter().next() {
-				if hash != block.hash {
-					warn!(
-						target: LOG_TARGET,
-						"💔 Invalid block justification provided by {}: requested: {:?} got: {:?}",
-						peer_id,
-						hash,
-						block.hash,
-					);
-					return Err(BadPeer(peer_id, rep::BAD_JUSTIFICATION));
-				}
-
-				block
-					.justifications
-					.or_else(|| legacy_justification_mapping(block.justification))
-			} else {
-				// we might have asked the peer for a justification on a block that we assumed it
-				// had but didn't (regardless of whether it had a justification for it or not).
-				trace!(
-					target: LOG_TARGET,
-					"Peer {peer_id:?} provided empty response for justification request {hash:?}",
-				);
-
-				None
-			};
-
-			if let Some((peer_id, hash, number, justifications)) =
-				self.extra_justifications.on_response(peer_id, justification)
-			{
-				self.actions.push(ChainSyncAction::ImportJustifications {
-					peer_id,
-					hash,
-					number,
-					justifications,
-				});
-				return Ok(());
-			}
-		}
-
-		Ok(())
-	}
-
-	/// Report a justification import (successful or not).
-	pub fn on_justification_import(&mut self, hash: B::Hash, number: NumberFor<B>, success: bool) {
-		let finalization_result = if success { Ok((hash, number)) } else { Err(()) };
-		self.extra_justifications
-			.try_finalize_root((hash, number), finalization_result, true);
-		self.allowed_requests.set_all();
-	}
-
-	/// Notify sync that a block has been finalized.
-	pub fn on_block_finalized(&mut self, hash: &B::Hash, number: NumberFor<B>) {
-		let client = &self.client;
-		let r = self.extra_justifications.on_block_finalized(hash, number, |base, block| {
-			is_descendent_of(&**client, base, block)
-		});
-
-		if let ChainSyncMode::LightState { skip_proofs, .. } = &self.mode {
-			if self.state_sync.is_none() {
-				if !self.peers.is_empty() && self.queue_blocks.is_empty() {
-					self.attempt_state_sync(*hash, number, *skip_proofs);
-				} else {
-					self.pending_state_sync_attempt.replace((*hash, number, *skip_proofs));
-				}
-			}
-		}
-
-		if let Err(err) = r {
-			warn!(
-				target: LOG_TARGET,
-				"💔 Error cleaning up pending extra justification data requests: {err}",
-			);
-		}
-	}
-
-	fn attempt_state_sync(
-		&mut self,
-		finalized_hash: B::Hash,
-		finalized_number: NumberFor<B>,
-		skip_proofs: bool,
-	) {
-		let mut heads: Vec<_> = self.peers.values().map(|peer| peer.best_number).collect();
-		heads.sort();
-		let median = heads[heads.len() / 2];
-		if finalized_number + STATE_SYNC_FINALITY_THRESHOLD.saturated_into() >= median {
-			if let Ok(Some(header)) = self.client.header(finalized_hash) {
-				log::debug!(
-					target: LOG_TARGET,
-					"Starting state sync for #{finalized_number} ({finalized_hash})",
-				);
-				self.state_sync =
-					Some(StateSync::new(self.client.clone(), header, None, None, skip_proofs));
-				self.allowed_requests.set_all();
-			} else {
-				log::error!(
-					target: LOG_TARGET,
-					"Failed to start state sync: header for finalized block \
-					  #{finalized_number} ({finalized_hash}) is not available",
-				);
-				debug_assert!(false);
-			}
-		}
-	}
-
-	/// Submit a validated block announcement.
-	///
-	/// Returns new best hash & best number of the peer if they are updated.
-	#[must_use]
-	pub fn on_validated_block_announce(
-		&mut self,
-		is_best: bool,
-		peer_id: PeerId,
-		announce: &BlockAnnounce<B::Header>,
-	) -> Option<(B::Hash, NumberFor<B>)> {
-		let number = *announce.header.number();
-		let hash = announce.header.hash();
-		let parent_status =
-			self.block_status(announce.header.parent_hash()).unwrap_or(BlockStatus::Unknown);
-		let known_parent = parent_status != BlockStatus::Unknown;
-		let ancient_parent = parent_status == BlockStatus::InChainPruned;
-
-		let known = self.is_known(&hash);
-		let peer = if let Some(peer) = self.peers.get_mut(&peer_id) {
-			peer
-		} else {
-			error!(target: LOG_TARGET, "💔 Called `on_validated_block_announce` with a bad peer ID {peer_id}");
-			return Some((hash, number));
-		};
-
-		if let PeerSyncState::AncestorSearch { .. } = peer.state {
-			trace!(target: LOG_TARGET, "Peer {} is in the ancestor search state.", peer_id);
-			return None;
-		}
-
-		let peer_info = is_best.then(|| {
-			// update their best block
-			peer.best_number = number;
-			peer.best_hash = hash;
-
-			(hash, number)
-		});
-
-		// If the announced block is the best they have and is not ahead of us, our common number
-		// is either one further ahead or it's the one they just announced, if we know about it.
-		if is_best {
-			if known && self.best_queued_number >= number {
-				self.update_peer_common_number(&peer_id, number);
-			} else if announce.header.parent_hash() == &self.best_queued_hash ||
-				known_parent && self.best_queued_number >= number
-			{
-				self.update_peer_common_number(&peer_id, number.saturating_sub(One::one()));
-			}
-		}
-		self.allowed_requests.add(&peer_id);
-
-		// known block case
-		if known || self.is_already_downloading(&hash) {
-			trace!(target: LOG_TARGET, "Known block announce from {}: {}", peer_id, hash);
-			if let Some(target) = self.fork_targets.get_mut(&hash) {
-				target.peers.insert(peer_id);
-			}
-			return peer_info;
-		}
-
-		if ancient_parent {
-			trace!(
-				target: LOG_TARGET,
-				"Ignored ancient block announced from {}: {} {:?}",
-				peer_id,
-				hash,
-				announce.header,
-			);
-			return peer_info;
-		}
-
-		if self.status().state == SyncState::Idle {
-			trace!(
-				target: LOG_TARGET,
-				"Added sync target for block announced from {}: {} {:?}",
-				peer_id,
-				hash,
-				announce.summary(),
-			);
-			self.fork_targets
-				.entry(hash)
-				.or_insert_with(|| {
-					if let Some(metrics) = &self.metrics {
-						metrics.fork_targets.inc();
-					}
-
-					ForkTarget {
-						number,
-						parent_hash: Some(*announce.header.parent_hash()),
-						peers: Default::default(),
-					}
-				})
-				.peers
-				.insert(peer_id);
-		}
-
-		peer_info
-	}
-
-	/// Notify that a sync peer has disconnected.
-	pub fn remove_peer(&mut self, peer_id: &PeerId) {
-		self.blocks.clear_peer_download(peer_id);
-		if let Some(gap_sync) = &mut self.gap_sync {
-			gap_sync.blocks.clear_peer_download(peer_id)
-		}
-
-		if let Some(state) = self.peers.remove(peer_id) {
-			if !state.state.is_available() {
-				if let Some(bad_peer) =
-					self.disconnected_peers.on_disconnect_during_request(*peer_id)
-				{
-					self.actions.push(ChainSyncAction::DropPeer(bad_peer));
+				if hash != block.hash {
+					warn!(
+						target: LOG_TARGET,
+						"💔 Invalid block justification provided by {}: requested: {:?} got: {:?}",
+						peer_id,
+						hash,
+						block.hash,
+					);
+					return Err(BadPeer(peer_id, rep::BAD_JUSTIFICATION));
 				}
-			}
-		}
 
-		self.extra_justifications.peer_disconnected(peer_id);
-		self.allowed_requests.set_all();
-		self.fork_targets.retain(|_, target| {
-			target.peers.remove(peer_id);
-			!target.peers.is_empty()
-		});
-		if let Some(metrics) = &self.metrics {
-			metrics.fork_targets.set(self.fork_targets.len().try_into().unwrap_or(u64::MAX));
-		}
+				block
+					.justifications
+					.or_else(|| legacy_justification_mapping(block.justification))
+			} else {
+				// we might have asked the peer for a justification on a block that we assumed it
+				// had but didn't (regardless of whether it had a justification for it or not).
+				trace!(
+					target: LOG_TARGET,
+					"Peer {peer_id:?} provided empty response for justification request {hash:?}",
+				);
 
-		let blocks = self.ready_blocks();
+				None
+			};
 
-		if !blocks.is_empty() {
-			self.validate_and_queue_blocks(blocks, false);
+			if let Some((peer_id, hash, number, justifications)) =
+				self.extra_justifications.on_response(peer_id, justification)
+			{
+				self.actions.push(SyncingAction::ImportJustifications {
+					peer_id,
+					hash,
+					number,
+					justifications,
+				});
+				return Ok(());
+			}
 		}
+
+		Ok(())
 	}
 
 	/// Returns the median seen block number.
@@ -1272,7 +1460,7 @@ where
 				.set(self.queue_blocks.len().try_into().unwrap_or(u64::MAX));
 		}
 
-		self.actions.push(ChainSyncAction::ImportBlocks { origin, blocks: new_blocks })
+		self.actions.push(SyncingAction::ImportBlocks { origin, blocks: new_blocks })
 	}
 
 	fn update_peer_common_number(&mut self, peer_id: &PeerId, new_common: NumberFor<B>) {
@@ -1351,7 +1539,10 @@ where
 				PeerSyncState::DownloadingGap(_) |
 				PeerSyncState::DownloadingState => {
 					// Cancel a request first, as `add_peer` may generate a new request.
-					self.actions.push(ChainSyncAction::CancelRequest { peer_id });
+					self.actions.push(SyncingAction::CancelRequest {
+						peer_id,
+						key: StrategyKey::ChainSync,
+					});
 					self.add_peer(peer_id, peer_sync.best_hash, peer_sync.best_number);
 				},
 				PeerSyncState::DownloadingJustification(_) => {
@@ -1467,53 +1658,6 @@ where
 			.collect()
 	}
 
-	/// Submit blocks received in a response.
-	pub fn on_block_response(
-		&mut self,
-		peer_id: PeerId,
-		request: BlockRequest<B>,
-		blocks: Vec<BlockData<B>>,
-	) {
-		let block_response = BlockResponse::<B> { id: request.id, blocks };
-
-		let blocks_range = || match (
-			block_response
-				.blocks
-				.first()
-				.and_then(|b| b.header.as_ref().map(|h| h.number())),
-			block_response.blocks.last().and_then(|b| b.header.as_ref().map(|h| h.number())),
-		) {
-			(Some(first), Some(last)) if first != last => format!(" ({}..{})", first, last),
-			(Some(first), Some(_)) => format!(" ({})", first),
-			_ => Default::default(),
-		};
-		trace!(
-			target: LOG_TARGET,
-			"BlockResponse {} from {} with {} blocks {}",
-			block_response.id,
-			peer_id,
-			block_response.blocks.len(),
-			blocks_range(),
-		);
-
-		let res = if request.fields == BlockAttributes::JUSTIFICATION {
-			self.on_block_justification(peer_id, block_response)
-		} else {
-			self.on_block_data(&peer_id, Some(request), block_response)
-		};
-
-		if let Err(bad_peer) = res {
-			self.actions.push(ChainSyncAction::DropPeer(bad_peer));
-		}
-	}
-
-	/// Submit a state received in a response.
-	pub fn on_state_response(&mut self, peer_id: PeerId, response: OpaqueStateResponse) {
-		if let Err(bad_peer) = self.on_state_data(&peer_id, response) {
-			self.actions.push(ChainSyncAction::DropPeer(bad_peer));
-		}
-	}
-
 	/// Get justification requests scheduled by sync to be sent out.
 	fn justification_requests(&mut self) -> Vec<(PeerId, BlockRequest<B>)> {
 		let peers = &mut self.peers;
@@ -1751,7 +1895,7 @@ where
 					state: Some(state),
 				};
 				debug!(target: LOG_TARGET, "State download is complete. Import is queued");
-				self.actions.push(ChainSyncAction::ImportBlocks { origin, blocks: vec![block] });
+				self.actions.push(SyncingAction::ImportBlocks { origin, blocks: vec![block] });
 				Ok(())
 			},
 			ImportResult::Continue => Ok(()),
@@ -1762,181 +1906,39 @@ where
 		}
 	}
 
-	/// A batch of blocks have been processed, with or without errors.
-	///
-	/// Call this when a batch of blocks have been processed by the import
-	/// queue, with or without errors.
-	pub fn on_blocks_processed(
+	fn attempt_state_sync(
 		&mut self,
-		imported: usize,
-		count: usize,
-		results: Vec<(Result<BlockImportStatus<NumberFor<B>>, BlockImportError>, B::Hash)>,
+		finalized_hash: B::Hash,
+		finalized_number: NumberFor<B>,
+		skip_proofs: bool,
 	) {
-		trace!(target: LOG_TARGET, "Imported {imported} of {count}");
-
-		let mut has_error = false;
-		for (_, hash) in &results {
-			if self.queue_blocks.remove(hash) {
-				if let Some(metrics) = &self.metrics {
-					metrics.queued_blocks.dec();
-				}
-			}
-			self.blocks.clear_queued(hash);
-			if let Some(gap_sync) = &mut self.gap_sync {
-				gap_sync.blocks.clear_queued(hash);
-			}
-		}
-		for (result, hash) in results {
-			if has_error {
-				break;
-			}
-
-			has_error |= result.is_err();
-
-			match result {
-				Ok(BlockImportStatus::ImportedKnown(number, peer_id)) => {
-					if let Some(peer) = peer_id {
-						self.update_peer_common_number(&peer, number);
-					}
-				},
-				Ok(BlockImportStatus::ImportedUnknown(number, aux, peer_id)) => {
-					if aux.clear_justification_requests {
-						trace!(
-							target: LOG_TARGET,
-							"Block imported clears all pending justification requests {number}: {hash:?}",
-						);
-						self.clear_justification_requests();
-					}
-
-					if aux.needs_justification {
-						trace!(
-							target: LOG_TARGET,
-							"Block imported but requires justification {number}: {hash:?}",
-						);
-						self.request_justification(&hash, number);
-					}
-
-					if aux.bad_justification {
-						if let Some(ref peer) = peer_id {
-							warn!("💔 Sent block with bad justification to import");
-							self.actions.push(ChainSyncAction::DropPeer(BadPeer(
-								*peer,
-								rep::BAD_JUSTIFICATION,
-							)));
-						}
-					}
-
-					if let Some(peer) = peer_id {
-						self.update_peer_common_number(&peer, number);
-					}
-					let state_sync_complete =
-						self.state_sync.as_ref().map_or(false, |s| s.target_hash() == hash);
-					if state_sync_complete {
-						info!(
-							target: LOG_TARGET,
-							"State sync is complete ({} MiB), restarting block sync.",
-							self.state_sync.as_ref().map_or(0, |s| s.progress().size / (1024 * 1024)),
-						);
-						self.state_sync = None;
-						self.mode = ChainSyncMode::Full;
-						self.restart();
-					}
-					let gap_sync_complete =
-						self.gap_sync.as_ref().map_or(false, |s| s.target == number);
-					if gap_sync_complete {
-						info!(
-							target: LOG_TARGET,
-							"Block history download is complete."
-						);
-						self.gap_sync = None;
-					}
-				},
-				Err(BlockImportError::IncompleteHeader(peer_id)) =>
-					if let Some(peer) = peer_id {
-						warn!(
-							target: LOG_TARGET,
-							"💔 Peer sent block with incomplete header to import",
-						);
-						self.actions
-							.push(ChainSyncAction::DropPeer(BadPeer(peer, rep::INCOMPLETE_HEADER)));
-						self.restart();
-					},
-				Err(BlockImportError::VerificationFailed(peer_id, e)) => {
-					let extra_message = peer_id
-						.map_or_else(|| "".into(), |peer| format!(" received from ({peer})"));
-
-					warn!(
-						target: LOG_TARGET,
-						"💔 Verification failed for block {hash:?}{extra_message}: {e:?}",
-					);
-
-					if let Some(peer) = peer_id {
-						self.actions
-							.push(ChainSyncAction::DropPeer(BadPeer(peer, rep::VERIFICATION_FAIL)));
-					}
-
-					self.restart();
-				},
-				Err(BlockImportError::BadBlock(peer_id)) =>
-					if let Some(peer) = peer_id {
-						warn!(
-							target: LOG_TARGET,
-							"💔 Block {hash:?} received from peer {peer} has been blacklisted",
-						);
-						self.actions.push(ChainSyncAction::DropPeer(BadPeer(peer, rep::BAD_BLOCK)));
-					},
-				Err(BlockImportError::MissingState) => {
-					// This may happen if the chain we were requesting upon has been discarded
-					// in the meantime because other chain has been finalized.
-					// Don't mark it as bad as it still may be synced if explicitly requested.
-					trace!(target: LOG_TARGET, "Obsolete block {hash:?}");
-				},
-				e @ Err(BlockImportError::UnknownParent) | e @ Err(BlockImportError::Other(_)) => {
-					warn!(target: LOG_TARGET, "💔 Error importing block {hash:?}: {}", e.unwrap_err());
-					self.state_sync = None;
-					self.restart();
-				},
-				Err(BlockImportError::Cancelled) => {},
-			};
-		}
-
-		self.allowed_requests.set_all();
-	}
-
-	/// Get pending actions to perform.
-	#[must_use]
-	pub fn actions(&mut self) -> impl Iterator<Item = ChainSyncAction<B>> {
-		if !self.peers.is_empty() && self.queue_blocks.is_empty() {
-			if let Some((hash, number, skip_proofs)) = self.pending_state_sync_attempt.take() {
-				self.attempt_state_sync(hash, number, skip_proofs);
+		let mut heads: Vec<_> = self.peers.values().map(|peer| peer.best_number).collect();
+		heads.sort();
+		let median = heads[heads.len() / 2];
+		if finalized_number + STATE_SYNC_FINALITY_THRESHOLD.saturated_into() >= median {
+			if let Ok(Some(header)) = self.client.header(finalized_hash) {
+				log::debug!(
+					target: LOG_TARGET,
+					"Starting state sync for #{finalized_number} ({finalized_hash})",
+				);
+				self.state_sync =
+					Some(StateSync::new(self.client.clone(), header, None, None, skip_proofs));
+				self.allowed_requests.set_all();
+			} else {
+				log::error!(
+					target: LOG_TARGET,
+					"Failed to start state sync: header for finalized block \
+					  #{finalized_number} ({finalized_hash}) is not available",
+				);
+				debug_assert!(false);
 			}
 		}
-
-		let block_requests = self
-			.block_requests()
-			.into_iter()
-			.map(|(peer_id, request)| ChainSyncAction::SendBlockRequest { peer_id, request });
-		self.actions.extend(block_requests);
-
-		let justification_requests = self
-			.justification_requests()
-			.into_iter()
-			.map(|(peer_id, request)| ChainSyncAction::SendBlockRequest { peer_id, request });
-		self.actions.extend(justification_requests);
-
-		let state_request = self
-			.state_request()
-			.into_iter()
-			.map(|(peer_id, request)| ChainSyncAction::SendStateRequest { peer_id, request });
-		self.actions.extend(state_request);
-
-		std::mem::take(&mut self.actions).into_iter()
 	}
 
 	/// A version of `actions()` that doesn't schedule extra requests. For testing only.
 	#[cfg(test)]
 	#[must_use]
-	fn take_actions(&mut self) -> impl Iterator<Item = ChainSyncAction<B>> {
+	fn take_actions(&mut self) -> impl Iterator<Item = SyncingAction<B>> {
 		std::mem::take(&mut self.actions).into_iter()
 	}
 }
diff --git a/substrate/client/network/sync/src/strategy/chain_sync/test.rs b/substrate/client/network/sync/src/strategy/chain_sync/test.rs
index 39d0c8f8d4d63..59436f387db6a 100644
--- a/substrate/client/network/sync/src/strategy/chain_sync/test.rs
+++ b/substrate/client/network/sync/src/strategy/chain_sync/test.rs
@@ -128,10 +128,10 @@ fn restart_doesnt_affect_peers_downloading_finality_data() {
 
 	// we wil send block requests to these peers
 	// for these blocks we don't know about
-	let actions = sync.actions().collect::<Vec<_>>();
+	let actions = sync.actions().unwrap();
 	assert_eq!(actions.len(), 2);
 	assert!(actions.iter().all(|action| match action {
-		ChainSyncAction::SendBlockRequest { peer_id, .. } =>
+		SyncingAction::SendBlockRequest { peer_id, .. } =>
 			peer_id == &peer_id1 || peer_id == &peer_id2,
 		_ => false,
 	}));
@@ -162,15 +162,15 @@ fn restart_doesnt_affect_peers_downloading_finality_data() {
 	sync.restart();
 
 	// which should make us cancel and send out again block requests to the first two peers
-	let actions = sync.actions().collect::<Vec<_>>();
+	let actions = sync.actions().unwrap();
 	assert_eq!(actions.len(), 4);
 	let mut cancelled_first = HashSet::new();
 	assert!(actions.iter().all(|action| match action {
-		ChainSyncAction::CancelRequest { peer_id, .. } => {
+		SyncingAction::CancelRequest { peer_id, .. } => {
 			cancelled_first.insert(peer_id);
 			peer_id == &peer_id1 || peer_id == &peer_id2
 		},
-		ChainSyncAction::SendBlockRequest { peer_id, .. } => {
+		SyncingAction::SendBlockRequest { peer_id, .. } => {
 			assert!(cancelled_first.remove(peer_id));
 			peer_id == &peer_id1 || peer_id == &peer_id2
 		},
@@ -329,7 +329,7 @@ fn do_ancestor_search_when_common_block_to_best_queued_gap_is_to_big() {
 		assert_eq!(actions.len(), 1);
 		assert!(matches!(
 			&actions[0],
-			ChainSyncAction::ImportBlocks{ origin: _, blocks } if blocks.len() == max_blocks_to_request as usize,
+			SyncingAction::ImportBlocks{ origin: _, blocks } if blocks.len() == max_blocks_to_request as usize,
 		));
 
 		best_block_num += max_blocks_to_request as u32;
@@ -476,7 +476,7 @@ fn can_sync_huge_fork() {
 		} else {
 			assert_eq!(actions.len(), 1);
 			match &actions[0] {
-				ChainSyncAction::SendBlockRequest { peer_id: _, request } => request.clone(),
+				SyncingAction::SendBlockRequest { peer_id: _, request, key: _ } => request.clone(),
 				action @ _ => panic!("Unexpected action: {action:?}"),
 			}
 		};
@@ -508,7 +508,7 @@ fn can_sync_huge_fork() {
 		assert_eq!(actions.len(), 1);
 		assert!(matches!(
 			&actions[0],
-			ChainSyncAction::ImportBlocks{ origin: _, blocks } if blocks.len() == sync.max_blocks_per_request as usize
+			SyncingAction::ImportBlocks{ origin: _, blocks } if blocks.len() == sync.max_blocks_per_request as usize
 		));
 
 		best_block_num += sync.max_blocks_per_request as u32;
@@ -610,7 +610,7 @@ fn syncs_fork_without_duplicate_requests() {
 		} else {
 			assert_eq!(actions.len(), 1);
 			match &actions[0] {
-				ChainSyncAction::SendBlockRequest { peer_id: _, request } => request.clone(),
+				SyncingAction::SendBlockRequest { peer_id: _, request, key: _ } => request.clone(),
 				action @ _ => panic!("Unexpected action: {action:?}"),
 			}
 		};
@@ -646,7 +646,7 @@ fn syncs_fork_without_duplicate_requests() {
 		assert_eq!(actions.len(), 1);
 		assert!(matches!(
 			&actions[0],
-			ChainSyncAction::ImportBlocks{ origin: _, blocks } if blocks.len() == max_blocks_to_request as usize
+			SyncingAction::ImportBlocks{ origin: _, blocks } if blocks.len() == max_blocks_to_request as usize
 		));
 
 		best_block_num += max_blocks_to_request as u32;
@@ -839,10 +839,10 @@ fn sync_restart_removes_block_but_not_justification_requests() {
 	let actions = sync.take_actions().collect::<Vec<_>>();
 	for action in actions.iter() {
 		match action {
-			ChainSyncAction::CancelRequest { peer_id } => {
+			SyncingAction::CancelRequest { peer_id, key: _ } => {
 				pending_responses.remove(&peer_id);
 			},
-			ChainSyncAction::SendBlockRequest { peer_id, .. } => {
+			SyncingAction::SendBlockRequest { peer_id, .. } => {
 				// we drop obsolete response, but don't register a new request, it's checked in
 				// the `assert!` below
 				pending_responses.remove(&peer_id);
@@ -852,7 +852,7 @@ fn sync_restart_removes_block_but_not_justification_requests() {
 	}
 	assert!(actions.iter().any(|action| {
 		match action {
-			ChainSyncAction::SendBlockRequest { peer_id, .. } => peer_id == &peers[0],
+			SyncingAction::SendBlockRequest { peer_id, .. } => peer_id == &peers[0],
 			_ => false,
 		}
 	}));
@@ -943,7 +943,7 @@ fn request_across_forks() {
 		assert_eq!(actions.len(), 1);
 		assert!(matches!(
 			&actions[0],
-			ChainSyncAction::ImportBlocks{ origin: _, blocks } if blocks.len() == 7_usize
+			SyncingAction::ImportBlocks{ origin: _, blocks } if blocks.len() == 7_usize
 		));
 		assert_eq!(sync.best_queued_number, 107);
 		assert_eq!(sync.best_queued_hash, block.hash());
@@ -988,7 +988,7 @@ fn request_across_forks() {
 		assert_eq!(actions.len(), 1);
 		assert!(matches!(
 			&actions[0],
-			ChainSyncAction::ImportBlocks{ origin: _, blocks } if blocks.len() == 1_usize
+			SyncingAction::ImportBlocks{ origin: _, blocks } if blocks.len() == 1_usize
 		));
 		assert!(sync.is_known(&block.header.parent_hash()));
 	}

From 278d1bf786d941fb85c9762391645f07da53736e Mon Sep 17 00:00:00 2001
From: Liu-Cheng Xu <xuliuchengxlc@gmail.com>
Date: Wed, 11 Sep 2024 00:20:40 +0800
Subject: [PATCH 04/12] Introduce `RpcParams` in sc-cli (#5601)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR is a pure refactoring by consolidating all the RPC related
parameters into a dedicated `RpcParams` struct, allowing us at subcoin
to build a custom run cmd without the need to duplicate code.

---------

Co-authored-by: Bastian Köcher <git@kchr.de>
Co-authored-by: Niklas Adolfsson <niklasadolfsson1@gmail.com>
---
 cumulus/client/cli/src/lib.rs                 |  10 +-
 prdoc/pr_5601.prdoc                           |  12 +
 substrate/client/cli/src/commands/run_cmd.rs  | 302 ++----------------
 substrate/client/cli/src/params/rpc_params.rs | 290 ++++++++++++++++-
 4 files changed, 327 insertions(+), 287 deletions(-)
 create mode 100644 prdoc/pr_5601.prdoc

diff --git a/cumulus/client/cli/src/lib.rs b/cumulus/client/cli/src/lib.rs
index 564d7b58c94dc..b08ad75c430d7 100644
--- a/cumulus/client/cli/src/lib.rs
+++ b/cumulus/client/cli/src/lib.rs
@@ -96,7 +96,7 @@ impl PurgeChainCmd {
 				Some('y') | Some('Y') => {},
 				_ => {
 					println!("Aborted");
-					return Ok(())
+					return Ok(());
 				},
 			}
 		}
@@ -432,19 +432,19 @@ impl sc_cli::CliConfiguration for NormalizedRunCmd {
 	}
 
 	fn rpc_max_request_size(&self) -> sc_cli::Result<u32> {
-		Ok(self.base.rpc_max_request_size)
+		self.base.rpc_max_request_size()
 	}
 
 	fn rpc_max_response_size(&self) -> sc_cli::Result<u32> {
-		Ok(self.base.rpc_max_response_size)
+		self.base.rpc_max_response_size()
 	}
 
 	fn rpc_max_subscriptions_per_connection(&self) -> sc_cli::Result<u32> {
-		Ok(self.base.rpc_max_subscriptions_per_connection)
+		self.base.rpc_max_subscriptions_per_connection()
 	}
 
 	fn rpc_buffer_capacity_per_connection(&self) -> sc_cli::Result<u32> {
-		Ok(self.base.rpc_message_buffer_capacity_per_connection)
+		Ok(self.base.rpc_params.rpc_message_buffer_capacity_per_connection)
 	}
 
 	fn rpc_batch_config(&self) -> sc_cli::Result<RpcBatchRequestConfig> {
diff --git a/prdoc/pr_5601.prdoc b/prdoc/pr_5601.prdoc
new file mode 100644
index 0000000000000..3a0ec9ee87147
--- /dev/null
+++ b/prdoc/pr_5601.prdoc
@@ -0,0 +1,12 @@
+title: Introduce `RpcParams` in sc-cli
+
+doc:
+  - audience: Node Dev
+    description: |
+      Refactors and consolidates all RPC-related parameters in the run command into a dedicated `RpcParams` struct. This change allows downstream users to build custom run command without duplicating code.
+
+crates:
+  - name: cumulus-client-cli
+    bump: none
+  - name: sc-cli
+    bump: major
diff --git a/substrate/client/cli/src/commands/run_cmd.rs b/substrate/client/cli/src/commands/run_cmd.rs
index f47baf2644e7e..f91d18aca7497 100644
--- a/substrate/client/cli/src/commands/run_cmd.rs
+++ b/substrate/client/cli/src/commands/run_cmd.rs
@@ -17,15 +17,12 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{
-	arg_enums::{Cors, RpcMethods},
 	error::{Error, Result},
 	params::{
 		ImportParams, KeystoreParams, NetworkParams, OffchainWorkerParams, RpcEndpoint,
 		SharedParams, TransactionPoolParams,
 	},
-	CliConfiguration, PrometheusParams, RuntimeParams, TelemetryParams,
-	RPC_DEFAULT_MAX_CONNECTIONS, RPC_DEFAULT_MAX_REQUEST_SIZE_MB, RPC_DEFAULT_MAX_RESPONSE_SIZE_MB,
-	RPC_DEFAULT_MAX_SUBS_PER_CONN, RPC_DEFAULT_MESSAGE_CAPACITY_PER_CONN,
+	CliConfiguration, PrometheusParams, RpcParams, RuntimeParams, TelemetryParams,
 };
 use clap::Parser;
 use regex::Regex;
@@ -36,10 +33,7 @@ use sc_service::{
 	ChainSpec, Role,
 };
 use sc_telemetry::TelemetryEndpoints;
-use std::{
-	net::{Ipv4Addr, Ipv6Addr, SocketAddr},
-	num::NonZeroU32,
-};
+use std::num::NonZeroU32;
 
 /// The `run` command used to run a node.
 #[derive(Debug, Clone, Parser)]
@@ -59,154 +53,16 @@ pub struct RunCmd {
 	#[arg(long)]
 	pub no_grandpa: bool,
 
-	/// Listen to all RPC interfaces (default: local).
-	///
-	/// Not all RPC methods are safe to be exposed publicly.
-	///
-	/// Use an RPC proxy server to filter out dangerous methods. More details:
-	/// <https://docs.substrate.io/build/remote-procedure-calls/#public-rpc-interfaces>.
-	///
-	/// Use `--unsafe-rpc-external` to suppress the warning if you understand the risks.
-	#[arg(long)]
-	pub rpc_external: bool,
-
-	/// Listen to all RPC interfaces.
-	///
-	/// Same as `--rpc-external`.
-	#[arg(long)]
-	pub unsafe_rpc_external: bool,
-
-	/// RPC methods to expose.
-	#[arg(
-		long,
-		value_name = "METHOD SET",
-		value_enum,
-		ignore_case = true,
-		default_value_t = RpcMethods::Auto,
-		verbatim_doc_comment
-	)]
-	pub rpc_methods: RpcMethods,
-
-	/// RPC rate limiting (calls/minute) for each connection.
-	///
-	/// This is disabled by default.
-	///
-	/// For example `--rpc-rate-limit 10` will maximum allow
-	/// 10 calls per minute per connection.
-	#[arg(long)]
-	pub rpc_rate_limit: Option<NonZeroU32>,
-
-	/// Disable RPC rate limiting for certain ip addresses.
-	///
-	/// Each IP address must be in CIDR notation such as `1.2.3.4/24`.
-	#[arg(long, num_args = 1..)]
-	pub rpc_rate_limit_whitelisted_ips: Vec<IpNetwork>,
-
-	/// Trust proxy headers for disable rate limiting.
-	///
-	/// By default the rpc server will not trust headers such `X-Real-IP`, `X-Forwarded-For` and
-	/// `Forwarded` and this option will make the rpc server to trust these headers.
-	///
-	/// For instance this may be secure if the rpc server is behind a reverse proxy and that the
-	/// proxy always sets these headers.
-	#[arg(long)]
-	pub rpc_rate_limit_trust_proxy_headers: bool,
-
-	/// Set the maximum RPC request payload size for both HTTP and WS in megabytes.
-	#[arg(long, default_value_t = RPC_DEFAULT_MAX_REQUEST_SIZE_MB)]
-	pub rpc_max_request_size: u32,
-
-	/// Set the maximum RPC response payload size for both HTTP and WS in megabytes.
-	#[arg(long, default_value_t = RPC_DEFAULT_MAX_RESPONSE_SIZE_MB)]
-	pub rpc_max_response_size: u32,
-
-	/// Set the maximum concurrent subscriptions per connection.
-	#[arg(long, default_value_t = RPC_DEFAULT_MAX_SUBS_PER_CONN)]
-	pub rpc_max_subscriptions_per_connection: u32,
-
-	/// Specify JSON-RPC server TCP port.
-	#[arg(long, value_name = "PORT")]
-	pub rpc_port: Option<u16>,
-
-	/// EXPERIMENTAL: Specify the JSON-RPC server interface and this option which can be enabled
-	/// several times if you want expose several RPC interfaces with different configurations.
-	///
-	/// The format for this option is:
-	/// `--experimental-rpc-endpoint" listen-addr=<ip:port>,<key=value>,..."` where each option is
-	/// separated by a comma and `listen-addr` is the only required param.
-	///
-	/// The following options are available:
-	///  • listen-addr: The socket address (ip:port) to listen on. Be careful to not expose the
-	///    server to the public internet unless you know what you're doing. (required)
-	///  • disable-batch-requests: Disable batch requests (optional)
-	///  • max-connections: The maximum number of concurrent connections that the server will
-	///    accept (optional)
-	///  • max-request-size: The maximum size of a request body in megabytes (optional)
-	///  • max-response-size: The maximum size of a response body in megabytes (optional)
-	///  • max-subscriptions-per-connection: The maximum number of subscriptions per connection
-	///    (optional)
-	///  • max-buffer-capacity-per-connection: The maximum buffer capacity per connection
-	///    (optional)
-	///  • max-batch-request-len: The maximum number of requests in a batch (optional)
-	///  • cors: The CORS allowed origins, this can enabled more than once (optional)
-	///  • methods: Which RPC methods to allow, valid values are "safe", "unsafe" and "auto"
-	///    (optional)
-	///  • optional: If the listen address is optional i.e the interface is not required to be
-	///    available For example this may be useful if some platforms doesn't support ipv6
-	///    (optional)
-	///  • rate-limit: The rate limit in calls per minute for each connection (optional)
-	///  • rate-limit-trust-proxy-headers: Trust proxy headers for disable rate limiting (optional)
-	///  • rate-limit-whitelisted-ips: Disable rate limiting for certain ip addresses, this can be
-	/// enabled more than once (optional)  • retry-random-port: If the port is already in use,
-	/// retry with a random port (optional)
-	///
-	/// Use with care, this flag is unstable and subject to change.
-	#[arg(
-		long,
-		num_args = 1..,
-		verbatim_doc_comment,
-		conflicts_with_all = &["rpc_external", "unsafe_rpc_external", "rpc_port", "rpc_cors", "rpc_rate_limit_trust_proxy_headers", "rpc_rate_limit", "rpc_rate_limit_whitelisted_ips", "rpc_message_buffer_capacity_per_connection", "rpc_disable_batch_requests", "rpc_max_subscriptions_per_connection", "rpc_max_request_size", "rpc_max_response_size"]
-	)]
-	pub experimental_rpc_endpoint: Vec<RpcEndpoint>,
-
-	/// Maximum number of RPC server connections.
-	#[arg(long, value_name = "COUNT", default_value_t = RPC_DEFAULT_MAX_CONNECTIONS)]
-	pub rpc_max_connections: u32,
-
-	/// The number of messages the RPC server is allowed to keep in memory.
-	///
-	/// If the buffer becomes full then the server will not process
-	/// new messages until the connected client start reading the
-	/// underlying messages.
-	///
-	/// This applies per connection which includes both
-	/// JSON-RPC methods calls and subscriptions.
-	#[arg(long, default_value_t = RPC_DEFAULT_MESSAGE_CAPACITY_PER_CONN)]
-	pub rpc_message_buffer_capacity_per_connection: u32,
-
-	/// Disable RPC batch requests
-	#[arg(long, alias = "rpc_no_batch_requests", conflicts_with_all = &["rpc_max_batch_request_len"])]
-	pub rpc_disable_batch_requests: bool,
-
-	/// Limit the max length per RPC batch request
-	#[arg(long, conflicts_with_all = &["rpc_disable_batch_requests"], value_name = "LEN")]
-	pub rpc_max_batch_request_len: Option<u32>,
-
-	/// Specify browser *origins* allowed to access the HTTP & WS RPC servers.
-	///
-	/// A comma-separated list of origins (protocol://domain or special `null`
-	/// value). Value of `all` will disable origin validation. Default is to
-	/// allow localhost and <https://polkadot.js.org> origins. When running in
-	/// `--dev` mode the default is to allow all origins.
-	#[arg(long, value_name = "ORIGINS")]
-	pub rpc_cors: Option<Cors>,
-
 	/// The human-readable name for this node.
 	///
 	/// It's used as network node name.
 	#[arg(long, value_name = "NAME")]
 	pub name: Option<String>,
 
+	#[allow(missing_docs)]
+	#[clap(flatten)]
+	pub rpc_params: RpcParams,
+
 	#[allow(missing_docs)]
 	#[clap(flatten)]
 	pub telemetry_params: TelemetryParams,
@@ -437,136 +293,51 @@ impl CliConfiguration for RunCmd {
 	}
 
 	fn rpc_max_connections(&self) -> Result<u32> {
-		Ok(self.rpc_max_connections)
+		Ok(self.rpc_params.rpc_max_connections)
 	}
 
 	fn rpc_cors(&self, is_dev: bool) -> Result<Option<Vec<String>>> {
-		Ok(self
-			.rpc_cors
-			.clone()
-			.unwrap_or_else(|| {
-				if is_dev {
-					log::warn!("Running in --dev mode, RPC CORS has been disabled.");
-					Cors::All
-				} else {
-					Cors::List(vec![
-						"http://localhost:*".into(),
-						"http://127.0.0.1:*".into(),
-						"https://localhost:*".into(),
-						"https://127.0.0.1:*".into(),
-						"https://polkadot.js.org".into(),
-					])
-				}
-			})
-			.into())
+		self.rpc_params.rpc_cors(is_dev)
 	}
 
 	fn rpc_addr(&self, default_listen_port: u16) -> Result<Option<Vec<RpcEndpoint>>> {
-		if !self.experimental_rpc_endpoint.is_empty() {
-			for endpoint in &self.experimental_rpc_endpoint {
-				// Technically, `0.0.0.0` isn't a public IP address, but it's a way to listen on
-				// all interfaces. Thus, we consider it as a public endpoint and warn about it.
-				if endpoint.rpc_methods == RpcMethods::Unsafe && endpoint.is_global() ||
-					endpoint.listen_addr.ip().is_unspecified()
-				{
-					log::warn!(
-						"It isn't safe to expose RPC publicly without a proxy server that filters \
-						 available set of RPC methods."
-					);
-				}
-			}
-
-			return Ok(Some(self.experimental_rpc_endpoint.clone()));
-		}
-
-		let (ipv4, ipv6) = rpc_interface(
-			self.rpc_external,
-			self.unsafe_rpc_external,
-			self.rpc_methods,
-			self.validator,
-		)?;
-
-		let cors = self.rpc_cors(self.is_dev()?)?;
-		let port = self.rpc_port.unwrap_or(default_listen_port);
-
-		Ok(Some(vec![
-			RpcEndpoint {
-				batch_config: self.rpc_batch_config()?,
-				max_connections: self.rpc_max_connections,
-				listen_addr: SocketAddr::new(std::net::IpAddr::V4(ipv4), port),
-				rpc_methods: self.rpc_methods,
-				rate_limit: self.rpc_rate_limit,
-				rate_limit_trust_proxy_headers: self.rpc_rate_limit_trust_proxy_headers,
-				rate_limit_whitelisted_ips: self.rpc_rate_limit_whitelisted_ips.clone(),
-				max_payload_in_mb: self.rpc_max_request_size,
-				max_payload_out_mb: self.rpc_max_response_size,
-				max_subscriptions_per_connection: self.rpc_max_subscriptions_per_connection,
-				max_buffer_capacity_per_connection: self.rpc_message_buffer_capacity_per_connection,
-				cors: cors.clone(),
-				retry_random_port: true,
-				is_optional: false,
-			},
-			RpcEndpoint {
-				batch_config: self.rpc_batch_config()?,
-				max_connections: self.rpc_max_connections,
-				listen_addr: SocketAddr::new(std::net::IpAddr::V6(ipv6), port),
-				rpc_methods: self.rpc_methods,
-				rate_limit: self.rpc_rate_limit,
-				rate_limit_trust_proxy_headers: self.rpc_rate_limit_trust_proxy_headers,
-				rate_limit_whitelisted_ips: self.rpc_rate_limit_whitelisted_ips.clone(),
-				max_payload_in_mb: self.rpc_max_request_size,
-				max_payload_out_mb: self.rpc_max_response_size,
-				max_subscriptions_per_connection: self.rpc_max_subscriptions_per_connection,
-				max_buffer_capacity_per_connection: self.rpc_message_buffer_capacity_per_connection,
-				cors: cors.clone(),
-				retry_random_port: true,
-				is_optional: true,
-			},
-		]))
+		self.rpc_params.rpc_addr(self.is_dev()?, self.validator, default_listen_port)
 	}
 
 	fn rpc_methods(&self) -> Result<sc_service::config::RpcMethods> {
-		Ok(self.rpc_methods.into())
+		Ok(self.rpc_params.rpc_methods.into())
 	}
 
 	fn rpc_max_request_size(&self) -> Result<u32> {
-		Ok(self.rpc_max_request_size)
+		Ok(self.rpc_params.rpc_max_request_size)
 	}
 
 	fn rpc_max_response_size(&self) -> Result<u32> {
-		Ok(self.rpc_max_response_size)
+		Ok(self.rpc_params.rpc_max_response_size)
 	}
 
 	fn rpc_max_subscriptions_per_connection(&self) -> Result<u32> {
-		Ok(self.rpc_max_subscriptions_per_connection)
+		Ok(self.rpc_params.rpc_max_subscriptions_per_connection)
 	}
 
 	fn rpc_buffer_capacity_per_connection(&self) -> Result<u32> {
-		Ok(self.rpc_message_buffer_capacity_per_connection)
+		Ok(self.rpc_params.rpc_message_buffer_capacity_per_connection)
 	}
 
 	fn rpc_batch_config(&self) -> Result<RpcBatchRequestConfig> {
-		let cfg = if self.rpc_disable_batch_requests {
-			RpcBatchRequestConfig::Disabled
-		} else if let Some(l) = self.rpc_max_batch_request_len {
-			RpcBatchRequestConfig::Limit(l)
-		} else {
-			RpcBatchRequestConfig::Unlimited
-		};
-
-		Ok(cfg)
+		self.rpc_params.rpc_batch_config()
 	}
 
 	fn rpc_rate_limit(&self) -> Result<Option<NonZeroU32>> {
-		Ok(self.rpc_rate_limit)
+		Ok(self.rpc_params.rpc_rate_limit)
 	}
 
 	fn rpc_rate_limit_whitelisted_ips(&self) -> Result<Vec<IpNetwork>> {
-		Ok(self.rpc_rate_limit_whitelisted_ips.clone())
+		Ok(self.rpc_params.rpc_rate_limit_whitelisted_ips.clone())
 	}
 
 	fn rpc_rate_limit_trust_proxy_headers(&self) -> Result<bool> {
-		Ok(self.rpc_rate_limit_trust_proxy_headers)
+		Ok(self.rpc_params.rpc_rate_limit_trust_proxy_headers)
 	}
 
 	fn transaction_pool(&self, is_dev: bool) -> Result<TransactionPoolOptions> {
@@ -600,57 +371,28 @@ pub fn is_node_name_valid(_name: &str) -> std::result::Result<(), &str> {
 	let name = _name.to_string();
 
 	if name.is_empty() {
-		return Err("Node name cannot be empty")
+		return Err("Node name cannot be empty");
 	}
 
 	if name.chars().count() >= crate::NODE_NAME_MAX_LENGTH {
-		return Err("Node name too long")
+		return Err("Node name too long");
 	}
 
 	let invalid_chars = r"[\\.@]";
 	let re = Regex::new(invalid_chars).unwrap();
 	if re.is_match(&name) {
-		return Err("Node name should not contain invalid chars such as '.' and '@'")
+		return Err("Node name should not contain invalid chars such as '.' and '@'");
 	}
 
 	let invalid_patterns = r"^https?:";
 	let re = Regex::new(invalid_patterns).unwrap();
 	if re.is_match(&name) {
-		return Err("Node name should not contain urls")
+		return Err("Node name should not contain urls");
 	}
 
 	Ok(())
 }
 
-fn rpc_interface(
-	is_external: bool,
-	is_unsafe_external: bool,
-	rpc_methods: RpcMethods,
-	is_validator: bool,
-) -> Result<(Ipv4Addr, Ipv6Addr)> {
-	if is_external && is_validator && rpc_methods != RpcMethods::Unsafe {
-		return Err(Error::Input(
-			"--rpc-external option shouldn't be used if the node is running as \
-			 a validator. Use `--unsafe-rpc-external` or `--rpc-methods=unsafe` if you understand \
-			 the risks. See the options description for more information."
-				.to_owned(),
-		))
-	}
-
-	if is_external || is_unsafe_external {
-		if rpc_methods == RpcMethods::Unsafe {
-			log::warn!(
-				"It isn't safe to expose RPC publicly without a proxy server that filters \
-				 available set of RPC methods."
-			);
-		}
-
-		Ok((Ipv4Addr::UNSPECIFIED, Ipv6Addr::UNSPECIFIED))
-	} else {
-		Ok((Ipv4Addr::LOCALHOST, Ipv6Addr::LOCALHOST))
-	}
-}
-
 #[cfg(test)]
 mod tests {
 	use super::*;
diff --git a/substrate/client/cli/src/params/rpc_params.rs b/substrate/client/cli/src/params/rpc_params.rs
index d0ec1fd004431..f9937b59bbaf4 100644
--- a/substrate/client/cli/src/params/rpc_params.rs
+++ b/substrate/client/cli/src/params/rpc_params.rs
@@ -17,12 +17,16 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::{
-	arg_enums::RpcMethods,
+	arg_enums::{Cors, RpcMethods},
 	params::{IpNetwork, RpcBatchRequestConfig},
 	RPC_DEFAULT_MAX_CONNECTIONS, RPC_DEFAULT_MAX_REQUEST_SIZE_MB, RPC_DEFAULT_MAX_RESPONSE_SIZE_MB,
 	RPC_DEFAULT_MAX_SUBS_PER_CONN, RPC_DEFAULT_MESSAGE_CAPACITY_PER_CONN,
 };
-use std::{net::SocketAddr, num::NonZeroU32};
+use clap::Args;
+use std::{
+	net::{Ipv4Addr, Ipv6Addr, SocketAddr},
+	num::NonZeroU32,
+};
 
 const RPC_LISTEN_ADDR: &str = "listen-addr";
 const RPC_CORS: &str = "cors";
@@ -40,6 +44,288 @@ const RPC_OPTIONAL: &str = "optional";
 const RPC_DISABLE_BATCH: &str = "disable-batch-requests";
 const RPC_BATCH_LIMIT: &str = "max-batch-request-len";
 
+/// Parameters of RPC.
+#[derive(Debug, Clone, Args)]
+pub struct RpcParams {
+	/// Listen to all RPC interfaces (default: local).
+	///
+	/// Not all RPC methods are safe to be exposed publicly.
+	///
+	/// Use an RPC proxy server to filter out dangerous methods. More details:
+	/// <https://docs.substrate.io/build/remote-procedure-calls/#public-rpc-interfaces>.
+	///
+	/// Use `--unsafe-rpc-external` to suppress the warning if you understand the risks.
+	#[arg(long)]
+	pub rpc_external: bool,
+
+	/// Listen to all RPC interfaces.
+	///
+	/// Same as `--rpc-external`.
+	#[arg(long)]
+	pub unsafe_rpc_external: bool,
+
+	/// RPC methods to expose.
+	#[arg(
+		long,
+		value_name = "METHOD SET",
+		value_enum,
+		ignore_case = true,
+		default_value_t = RpcMethods::Auto,
+		verbatim_doc_comment
+	)]
+	pub rpc_methods: RpcMethods,
+
+	/// RPC rate limiting (calls/minute) for each connection.
+	///
+	/// This is disabled by default.
+	///
+	/// For example `--rpc-rate-limit 10` will maximum allow
+	/// 10 calls per minute per connection.
+	#[arg(long)]
+	pub rpc_rate_limit: Option<NonZeroU32>,
+
+	/// Disable RPC rate limiting for certain ip addresses.
+	///
+	/// Each IP address must be in CIDR notation such as `1.2.3.4/24`.
+	#[arg(long, num_args = 1..)]
+	pub rpc_rate_limit_whitelisted_ips: Vec<IpNetwork>,
+
+	/// Trust proxy headers for disable rate limiting.
+	///
+	/// By default the rpc server will not trust headers such `X-Real-IP`, `X-Forwarded-For` and
+	/// `Forwarded` and this option will make the rpc server to trust these headers.
+	///
+	/// For instance this may be secure if the rpc server is behind a reverse proxy and that the
+	/// proxy always sets these headers.
+	#[arg(long)]
+	pub rpc_rate_limit_trust_proxy_headers: bool,
+
+	/// Set the maximum RPC request payload size for both HTTP and WS in megabytes.
+	#[arg(long, default_value_t = RPC_DEFAULT_MAX_REQUEST_SIZE_MB)]
+	pub rpc_max_request_size: u32,
+
+	/// Set the maximum RPC response payload size for both HTTP and WS in megabytes.
+	#[arg(long, default_value_t = RPC_DEFAULT_MAX_RESPONSE_SIZE_MB)]
+	pub rpc_max_response_size: u32,
+
+	/// Set the maximum concurrent subscriptions per connection.
+	#[arg(long, default_value_t = RPC_DEFAULT_MAX_SUBS_PER_CONN)]
+	pub rpc_max_subscriptions_per_connection: u32,
+
+	/// Specify JSON-RPC server TCP port.
+	#[arg(long, value_name = "PORT")]
+	pub rpc_port: Option<u16>,
+
+	/// EXPERIMENTAL: Specify the JSON-RPC server interface and this option which can be enabled
+	/// several times if you want expose several RPC interfaces with different configurations.
+	///
+	/// The format for this option is:
+	/// `--experimental-rpc-endpoint" listen-addr=<ip:port>,<key=value>,..."` where each option is
+	/// separated by a comma and `listen-addr` is the only required param.
+	///
+	/// The following options are available:
+	///  • listen-addr: The socket address (ip:port) to listen on. Be careful to not expose the
+	///    server to the public internet unless you know what you're doing. (required)
+	///  • disable-batch-requests: Disable batch requests (optional)
+	///  • max-connections: The maximum number of concurrent connections that the server will
+	///    accept (optional)
+	///  • max-request-size: The maximum size of a request body in megabytes (optional)
+	///  • max-response-size: The maximum size of a response body in megabytes (optional)
+	///  • max-subscriptions-per-connection: The maximum number of subscriptions per connection
+	///    (optional)
+	///  • max-buffer-capacity-per-connection: The maximum buffer capacity per connection
+	///    (optional)
+	///  • max-batch-request-len: The maximum number of requests in a batch (optional)
+	///  • cors: The CORS allowed origins, this can enabled more than once (optional)
+	///  • methods: Which RPC methods to allow, valid values are "safe", "unsafe" and "auto"
+	///    (optional)
+	///  • optional: If the listen address is optional i.e the interface is not required to be
+	///    available For example this may be useful if some platforms doesn't support ipv6
+	///    (optional)
+	///  • rate-limit: The rate limit in calls per minute for each connection (optional)
+	///  • rate-limit-trust-proxy-headers: Trust proxy headers for disable rate limiting (optional)
+	///  • rate-limit-whitelisted-ips: Disable rate limiting for certain ip addresses, this can be
+	/// enabled more than once (optional)  • retry-random-port: If the port is already in use,
+	/// retry with a random port (optional)
+	///
+	/// Use with care, this flag is unstable and subject to change.
+	#[arg(
+		long,
+		num_args = 1..,
+		verbatim_doc_comment,
+		conflicts_with_all = &["rpc_external", "unsafe_rpc_external", "rpc_port", "rpc_cors", "rpc_rate_limit_trust_proxy_headers", "rpc_rate_limit", "rpc_rate_limit_whitelisted_ips", "rpc_message_buffer_capacity_per_connection", "rpc_disable_batch_requests", "rpc_max_subscriptions_per_connection", "rpc_max_request_size", "rpc_max_response_size"]
+	)]
+	pub experimental_rpc_endpoint: Vec<RpcEndpoint>,
+
+	/// Maximum number of RPC server connections.
+	#[arg(long, value_name = "COUNT", default_value_t = RPC_DEFAULT_MAX_CONNECTIONS)]
+	pub rpc_max_connections: u32,
+
+	/// The number of messages the RPC server is allowed to keep in memory.
+	///
+	/// If the buffer becomes full then the server will not process
+	/// new messages until the connected client start reading the
+	/// underlying messages.
+	///
+	/// This applies per connection which includes both
+	/// JSON-RPC methods calls and subscriptions.
+	#[arg(long, default_value_t = RPC_DEFAULT_MESSAGE_CAPACITY_PER_CONN)]
+	pub rpc_message_buffer_capacity_per_connection: u32,
+
+	/// Disable RPC batch requests
+	#[arg(long, alias = "rpc_no_batch_requests", conflicts_with_all = &["rpc_max_batch_request_len"])]
+	pub rpc_disable_batch_requests: bool,
+
+	/// Limit the max length per RPC batch request
+	#[arg(long, conflicts_with_all = &["rpc_disable_batch_requests"], value_name = "LEN")]
+	pub rpc_max_batch_request_len: Option<u32>,
+
+	/// Specify browser *origins* allowed to access the HTTP & WS RPC servers.
+	///
+	/// A comma-separated list of origins (protocol://domain or special `null`
+	/// value). Value of `all` will disable origin validation. Default is to
+	/// allow localhost and <https://polkadot.js.org> origins. When running in
+	/// `--dev` mode the default is to allow all origins.
+	#[arg(long, value_name = "ORIGINS")]
+	pub rpc_cors: Option<Cors>,
+}
+
+impl RpcParams {
+	/// Returns the RPC CORS configuration.
+	pub fn rpc_cors(&self, is_dev: bool) -> crate::Result<Option<Vec<String>>> {
+		Ok(self
+			.rpc_cors
+			.clone()
+			.unwrap_or_else(|| {
+				if is_dev {
+					log::warn!("Running in --dev mode, RPC CORS has been disabled.");
+					Cors::All
+				} else {
+					Cors::List(vec![
+						"http://localhost:*".into(),
+						"http://127.0.0.1:*".into(),
+						"https://localhost:*".into(),
+						"https://127.0.0.1:*".into(),
+						"https://polkadot.js.org".into(),
+					])
+				}
+			})
+			.into())
+	}
+
+	/// Returns the RPC endpoints.
+	pub fn rpc_addr(
+		&self,
+		is_dev: bool,
+		is_validator: bool,
+		default_listen_port: u16,
+	) -> crate::Result<Option<Vec<RpcEndpoint>>> {
+		if !self.experimental_rpc_endpoint.is_empty() {
+			for endpoint in &self.experimental_rpc_endpoint {
+				// Technically, `0.0.0.0` isn't a public IP address, but it's a way to listen on
+				// all interfaces. Thus, we consider it as a public endpoint and warn about it.
+				if endpoint.rpc_methods == RpcMethods::Unsafe && endpoint.is_global() ||
+					endpoint.listen_addr.ip().is_unspecified()
+				{
+					eprintln!(
+						"It isn't safe to expose RPC publicly without a proxy server that filters \
+						 available set of RPC methods."
+					);
+				}
+			}
+
+			return Ok(Some(self.experimental_rpc_endpoint.clone()));
+		}
+
+		let (ipv4, ipv6) = rpc_interface(
+			self.rpc_external,
+			self.unsafe_rpc_external,
+			self.rpc_methods,
+			is_validator,
+		)?;
+
+		let cors = self.rpc_cors(is_dev)?;
+		let port = self.rpc_port.unwrap_or(default_listen_port);
+
+		Ok(Some(vec![
+			RpcEndpoint {
+				batch_config: self.rpc_batch_config()?,
+				max_connections: self.rpc_max_connections,
+				listen_addr: SocketAddr::new(std::net::IpAddr::V4(ipv4), port),
+				rpc_methods: self.rpc_methods,
+				rate_limit: self.rpc_rate_limit,
+				rate_limit_trust_proxy_headers: self.rpc_rate_limit_trust_proxy_headers,
+				rate_limit_whitelisted_ips: self.rpc_rate_limit_whitelisted_ips.clone(),
+				max_payload_in_mb: self.rpc_max_request_size,
+				max_payload_out_mb: self.rpc_max_response_size,
+				max_subscriptions_per_connection: self.rpc_max_subscriptions_per_connection,
+				max_buffer_capacity_per_connection: self.rpc_message_buffer_capacity_per_connection,
+				cors: cors.clone(),
+				retry_random_port: true,
+				is_optional: false,
+			},
+			RpcEndpoint {
+				batch_config: self.rpc_batch_config()?,
+				max_connections: self.rpc_max_connections,
+				listen_addr: SocketAddr::new(std::net::IpAddr::V6(ipv6), port),
+				rpc_methods: self.rpc_methods,
+				rate_limit: self.rpc_rate_limit,
+				rate_limit_trust_proxy_headers: self.rpc_rate_limit_trust_proxy_headers,
+				rate_limit_whitelisted_ips: self.rpc_rate_limit_whitelisted_ips.clone(),
+				max_payload_in_mb: self.rpc_max_request_size,
+				max_payload_out_mb: self.rpc_max_response_size,
+				max_subscriptions_per_connection: self.rpc_max_subscriptions_per_connection,
+				max_buffer_capacity_per_connection: self.rpc_message_buffer_capacity_per_connection,
+				cors: cors.clone(),
+				retry_random_port: true,
+				is_optional: true,
+			},
+		]))
+	}
+
+	/// Returns the configuration for batch RPC requests.
+	pub fn rpc_batch_config(&self) -> crate::Result<RpcBatchRequestConfig> {
+		let cfg = if self.rpc_disable_batch_requests {
+			RpcBatchRequestConfig::Disabled
+		} else if let Some(l) = self.rpc_max_batch_request_len {
+			RpcBatchRequestConfig::Limit(l)
+		} else {
+			RpcBatchRequestConfig::Unlimited
+		};
+
+		Ok(cfg)
+	}
+}
+
+fn rpc_interface(
+	is_external: bool,
+	is_unsafe_external: bool,
+	rpc_methods: RpcMethods,
+	is_validator: bool,
+) -> crate::Result<(Ipv4Addr, Ipv6Addr)> {
+	if is_external && is_validator && rpc_methods != RpcMethods::Unsafe {
+		return Err(crate::Error::Input(
+			"--rpc-external option shouldn't be used if the node is running as \
+			 a validator. Use `--unsafe-rpc-external` or `--rpc-methods=unsafe` if you understand \
+			 the risks. See the options description for more information."
+				.to_owned(),
+		));
+	}
+
+	if is_external || is_unsafe_external {
+		if rpc_methods == RpcMethods::Unsafe {
+			eprintln!(
+				"It isn't safe to expose RPC publicly without a proxy server that filters \
+				 available set of RPC methods."
+			);
+		}
+
+		Ok((Ipv4Addr::UNSPECIFIED, Ipv6Addr::UNSPECIFIED))
+	} else {
+		Ok((Ipv4Addr::LOCALHOST, Ipv6Addr::LOCALHOST))
+	}
+}
+
 /// Represent a single RPC endpoint with its configuration.
 #[derive(Debug, Clone)]
 pub struct RpcEndpoint {

From 12eeb5df4f95c8b5076aad4812b0803ea30d0bfc Mon Sep 17 00:00:00 2001
From: Alexandru Vasile <60601340+lexnv@users.noreply.github.com>
Date: Tue, 10 Sep 2024 19:57:45 +0300
Subject: [PATCH 05/12]  litep2p: Update network backend to v0.7.0 (#5609)

This release introduces several new features, improvements, and fixes to
the litep2p library. Key updates include enhanced error handling,
configurable connection limits, and a new API for managing public
addresses.

For a detailed set of changes, see [litep2p
changelog](https://github.com/paritytech/litep2p/blob/master/CHANGELOG.md#070---2024-09-05).

This PR makes use of:
- connection limits to optimize network throughput
- better errors that are propagated to substrate metrics
- public addresses API to report healthy addresses to the Identify
protocol

### Warp sync time improvement

Measuring warp sync time is a bit inaccurate since the network is not
deterministic and we might end up using faster peers (peers with more
resources to handle our requests). However, I did not see warp sync
times of 16 minutes, instead, they are roughly stabilized between 8 and
10 minutes.

For measuring warp-sync time, I've used
[sub-trige-logs](https://github.com/lexnv/sub-triage-logs/?tab=readme-ov-file#warp-time)

### Litep2p

Phase | Time
 -|-
Warp  | 426.999999919s
State | 99.000000555s
Total | 526.000000474s

### Libp2p

Phase | Time
 -|-
Warp  | 731.999999837s
State | 71.000000882s
Total | 803.000000719s

Closes: https://github.com/paritytech/polkadot-sdk/issues/4986


### Low peer count

After exposing the `litep2p::public_addresses` interface, we can report
to litep2p confirmed external addresses. This should mitigate or at
least improve: https://github.com/paritytech/polkadot-sdk/issues/4925.
Will keep the issue around to confirm this.


### Improved metrics

We are one step closer to exposing similar metrics as libp2p:
https://github.com/paritytech/polkadot-sdk/issues/4681.

cc @paritytech/networking

### Next Steps
- [x] Use public address interface to confirm addresses to identify
protocol

---------

Signed-off-by: Alexandru Vasile <alexandru.vasile@parity.io>
---
 Cargo.lock                                    | 384 ++++++------------
 Cargo.toml                                    |   2 +-
 prdoc/pr_5609.prdoc                           |  21 +
 .../client/network/src/litep2p/discovery.rs   |   8 +-
 substrate/client/network/src/litep2p/mod.rs   |  78 ++--
 .../client/network/src/litep2p/service.rs     |  16 +-
 .../src/litep2p/shim/request_response/mod.rs  |  31 +-
 .../litep2p/shim/request_response/tests.rs    |   7 +-
 substrate/client/tracing/src/logging/mod.rs   |   3 +
 9 files changed, 244 insertions(+), 306 deletions(-)
 create mode 100644 prdoc/pr_5609.prdoc

diff --git a/Cargo.lock b/Cargo.lock
index 66fd0d05cc348..8abecaf5e9ba8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1303,9 +1303,9 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
 
 [[package]]
 name = "async-trait"
-version = "0.1.80"
+version = "0.1.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
@@ -1502,7 +1502,7 @@ dependencies = [
  "lazy_static",
  "lazycell",
  "peeking_take_while",
- "prettyplease 0.2.12",
+ "prettyplease",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "regex",
@@ -2417,12 +2417,6 @@ dependencies = [
  "tuplex",
 ]
 
-[[package]]
-name = "bs58"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
-
 [[package]]
 name = "bs58"
 version = "0.5.1"
@@ -2484,9 +2478,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
 
 [[package]]
 name = "bzip2-sys"
@@ -3629,21 +3623,6 @@ dependencies = [
  "wasmtime-types",
 ]
 
-[[package]]
-name = "crc"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2b432c56615136f8dba245fed7ec3d5518c500a31108661067e61e72fe7e6bc"
-dependencies = [
- "crc-catalog",
-]
-
-[[package]]
-name = "crc-catalog"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
-
 [[package]]
 name = "crc32fast"
 version = "1.3.2"
@@ -5500,7 +5479,7 @@ dependencies = [
  "blake2 0.10.6",
  "file-guard",
  "fs-err",
- "prettyplease 0.2.12",
+ "prettyplease",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "syn 2.0.65",
@@ -5752,21 +5731,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "fork-tree"
 version = "12.0.0"
@@ -6791,6 +6755,51 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "hickory-proto"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512"
+dependencies = [
+ "async-trait",
+ "cfg-if",
+ "data-encoding",
+ "enum-as-inner 0.6.0",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "idna 0.4.0",
+ "ipnet",
+ "once_cell",
+ "rand",
+ "thiserror",
+ "tinyvec",
+ "tokio",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "hickory-resolver"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "hickory-proto",
+ "ipconfig",
+ "lru-cache",
+ "once_cell",
+ "parking_lot 0.12.3",
+ "rand",
+ "resolv-conf",
+ "smallvec",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "hkdf"
 version = "0.12.4"
@@ -7747,9 +7756,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.158"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 
 [[package]]
 name = "libflate"
@@ -7942,7 +7951,7 @@ version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55cca1eb2bc1fd29f099f3daaab7effd01e1a54b7c577d0ed082521034d912e8"
 dependencies = [
- "bs58 0.5.1",
+ "bs58",
  "ed25519-dalek",
  "hkdf",
  "multihash 0.19.1",
@@ -8079,7 +8088,7 @@ dependencies = [
  "libp2p-tls",
  "log",
  "parking_lot 0.12.3",
- "quinn 0.10.2",
+ "quinn",
  "rand",
  "ring 0.16.20",
  "rustls 0.21.7",
@@ -8400,21 +8409,22 @@ dependencies = [
 
 [[package]]
 name = "litep2p"
-version = "0.6.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f46c51c205264b834ceed95c8b195026e700494bc3991aaba3b4ea9e20626d9"
+checksum = "d4ab2528b02b6dbbc3e6ec4b55ccde885647c622a315b7da45081ed2dfe4b813"
 dependencies = [
  "async-trait",
- "bs58 0.4.0",
+ "bs58",
  "bytes",
  "cid 0.10.1",
  "ed25519-dalek",
  "futures",
  "futures-timer",
  "hex-literal",
+ "hickory-resolver",
  "indexmap 2.2.3",
  "libc",
- "mockall 0.12.1",
+ "mockall 0.13.0",
  "multiaddr 0.17.1",
  "multihash 0.17.0",
  "network-interface",
@@ -8422,8 +8432,7 @@ dependencies = [
  "parking_lot 0.12.3",
  "pin-project",
  "prost 0.12.6",
- "prost-build 0.11.9",
- "quinn 0.9.4",
+ "prost-build 0.13.2",
  "rand",
  "rcgen",
  "ring 0.16.20",
@@ -8435,18 +8444,15 @@ dependencies = [
  "snow",
  "socket2 0.5.7",
  "static_assertions",
- "str0m",
  "thiserror",
  "tokio",
  "tokio-stream",
  "tokio-tungstenite",
  "tokio-util",
  "tracing",
- "trust-dns-resolver",
  "uint",
  "unsigned-varint 0.8.0",
  "url",
- "webpki",
  "x25519-dalek",
  "x509-parser 0.16.0",
  "yasna",
@@ -8901,15 +8907,14 @@ dependencies = [
 
 [[package]]
 name = "mockall"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48"
+checksum = "d4c28b3fb6d753d28c20e826cd46ee611fda1cf3cde03a443a974043247c065a"
 dependencies = [
  "cfg-if",
  "downcast",
  "fragile",
- "lazy_static",
- "mockall_derive 0.12.1",
+ "mockall_derive 0.13.0",
  "predicates 3.0.3",
  "predicates-tree",
 ]
@@ -8928,9 +8933,9 @@ dependencies = [
 
 [[package]]
 name = "mockall_derive"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2"
+checksum = "341014e7f530314e9a1fdbc7400b244efea7122662c96bfa248c31da5bfb2020"
 dependencies = [
  "cfg-if",
  "proc-macro2 1.0.86",
@@ -9639,47 +9644,12 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
-[[package]]
-name = "openssl"
-version = "0.10.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2 1.0.86",
- "quote 1.0.37",
- "syn 2.0.65",
-]
-
 [[package]]
 name = "openssl-probe"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
-[[package]]
-name = "openssl-src"
-version = "300.2.3+3.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "openssl-sys"
 version = "0.9.102"
@@ -9688,7 +9658,6 @@ checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2"
 dependencies = [
  "cc",
  "libc",
- "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
@@ -13795,7 +13764,7 @@ name = "polkadot-node-metrics"
 version = "7.0.0"
 dependencies = [
  "assert_cmd",
- "bs58 0.5.1",
+ "bs58",
  "futures",
  "futures-timer",
  "http-body-util",
@@ -14255,7 +14224,7 @@ dependencies = [
 name = "polkadot-runtime-metrics"
 version = "7.0.0"
 dependencies = [
- "bs58 0.5.1",
+ "bs58",
  "frame-benchmarking",
  "parity-scale-codec",
  "polkadot-primitives",
@@ -15586,16 +15555,6 @@ dependencies = [
  "yansi",
 ]
 
-[[package]]
-name = "prettyplease"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
-dependencies = [
- "proc-macro2 1.0.86",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "prettyplease"
 version = "0.2.12"
@@ -15841,33 +15800,42 @@ dependencies = [
  "prost-derive 0.12.6",
 ]
 
+[[package]]
+name = "prost"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2ecbe40f08db5c006b5764a2645f7f3f141ce756412ac9e1dd6087e6d32995"
+dependencies = [
+ "bytes",
+ "prost-derive 0.13.2",
+]
+
 [[package]]
 name = "prost-build"
-version = "0.11.9"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270"
+checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1"
 dependencies = [
  "bytes",
- "heck 0.4.1",
- "itertools 0.10.5",
- "lazy_static",
+ "heck 0.5.0",
+ "itertools 0.11.0",
  "log",
  "multimap",
+ "once_cell",
  "petgraph",
- "prettyplease 0.1.25",
- "prost 0.11.9",
- "prost-types 0.11.9",
+ "prettyplease",
+ "prost 0.12.6",
+ "prost-types 0.12.4",
  "regex",
- "syn 1.0.109",
+ "syn 2.0.65",
  "tempfile",
- "which",
 ]
 
 [[package]]
 name = "prost-build"
-version = "0.12.4"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1"
+checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302"
 dependencies = [
  "bytes",
  "heck 0.5.0",
@@ -15876,9 +15844,9 @@ dependencies = [
  "multimap",
  "once_cell",
  "petgraph",
- "prettyplease 0.2.12",
- "prost 0.12.6",
- "prost-types 0.12.4",
+ "prettyplease",
+ "prost 0.13.2",
+ "prost-types 0.13.2",
  "regex",
  "syn 2.0.65",
  "tempfile",
@@ -15911,12 +15879,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "prost-types"
-version = "0.11.9"
+name = "prost-derive"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
+checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac"
 dependencies = [
- "prost 0.11.9",
+ "anyhow",
+ "itertools 0.11.0",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.65",
 ]
 
 [[package]]
@@ -15928,6 +15900,15 @@ dependencies = [
  "prost 0.12.6",
 ]
 
+[[package]]
+name = "prost-types"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60caa6738c7369b940c3d49246a8d1749323674c65cb13010134f5c9bad5b519"
+dependencies = [
+ "prost 0.13.2",
+]
+
 [[package]]
 name = "psm"
 version = "0.1.21"
@@ -16033,24 +16014,6 @@ dependencies = [
  "rand",
 ]
 
-[[package]]
-name = "quinn"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e"
-dependencies = [
- "bytes",
- "pin-project-lite",
- "quinn-proto 0.9.6",
- "quinn-udp 0.3.2",
- "rustc-hash 1.1.0",
- "rustls 0.20.9",
- "thiserror",
- "tokio",
- "tracing",
- "webpki",
-]
-
 [[package]]
 name = "quinn"
 version = "0.10.2"
@@ -16060,8 +16023,8 @@ dependencies = [
  "bytes",
  "futures-io",
  "pin-project-lite",
- "quinn-proto 0.10.6",
- "quinn-udp 0.4.1",
+ "quinn-proto",
+ "quinn-udp",
  "rustc-hash 1.1.0",
  "rustls 0.21.7",
  "thiserror",
@@ -16069,24 +16032,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "quinn-proto"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863"
-dependencies = [
- "bytes",
- "rand",
- "ring 0.16.20",
- "rustc-hash 1.1.0",
- "rustls 0.20.9",
- "slab",
- "thiserror",
- "tinyvec",
- "tracing",
- "webpki",
-]
-
 [[package]]
 name = "quinn-proto"
 version = "0.10.6"
@@ -16104,19 +16049,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "quinn-udp"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4"
-dependencies = [
- "libc",
- "quinn-proto 0.9.6",
- "socket2 0.4.9",
- "tracing",
- "windows-sys 0.42.0",
-]
-
 [[package]]
 name = "quinn-udp"
 version = "0.4.1"
@@ -18248,7 +18180,7 @@ dependencies = [
 name = "sc-network-types"
 version = "0.10.0"
 dependencies = [
- "bs58 0.5.1",
+ "bs58",
  "ed25519-dalek",
  "libp2p-identity",
  "litep2p",
@@ -18915,21 +18847,6 @@ dependencies = [
  "untrusted 0.7.1",
 ]
 
-[[package]]
-name = "sctp-proto"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6220f78bb44c15f326b0596113305f6101097a18755d53727a575c97e09fb24"
-dependencies = [
- "bytes",
- "crc",
- "fxhash",
- "log",
- "rand",
- "slab",
- "thiserror",
-]
-
 [[package]]
 name = "sec1"
 version = "0.7.3"
@@ -19255,18 +19172,6 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
-[[package]]
-name = "sha-1"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest 0.10.7",
- "sha1-asm",
-]
-
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -19278,15 +19183,6 @@ dependencies = [
  "digest 0.10.7",
 ]
 
-[[package]]
-name = "sha1-asm"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ba6947745e7f86be3b8af00b7355857085dbdf8901393c89514510eb61f4e21"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "sha2"
 version = "0.9.9"
@@ -19416,9 +19312,9 @@ dependencies = [
 
 [[package]]
 name = "simple-dns"
-version = "0.5.7"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cae9a3fcdadafb6d97f4c0e007e4247b114ee0f119f650c3cbf3a8b3a1479694"
+checksum = "4c80e565e7dcc4f1ef247e2f395550d4cf7d777746d5988e7e4e3156b71077fc"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -19529,7 +19425,7 @@ dependencies = [
  "base64 0.21.2",
  "bip39",
  "blake2-rfc",
- "bs58 0.5.1",
+ "bs58",
  "chacha20",
  "crossbeam-queue",
  "derive_more",
@@ -19982,7 +19878,7 @@ dependencies = [
  "httparse",
  "log",
  "rand",
- "sha-1 0.9.8",
+ "sha-1",
 ]
 
 [[package]]
@@ -20374,7 +20270,7 @@ dependencies = [
  "bitflags 1.3.2",
  "blake2 0.10.6",
  "bounded-collections",
- "bs58 0.5.1",
+ "bs58",
  "criterion",
  "dyn-clonable",
  "ed25519-zebra",
@@ -21381,26 +21277,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "str0m"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6706347e49b13373f7ddfafad47df7583ed52083d6fc8a594eb2c80497ef959d"
-dependencies = [
- "combine",
- "crc",
- "fastrand 2.1.0",
- "hmac 0.12.1",
- "once_cell",
- "openssl",
- "openssl-sys",
- "sctp-proto",
- "serde",
- "sha-1 0.10.1",
- "thiserror",
- "tracing",
-]
-
 [[package]]
 name = "string-interner"
 version = "0.17.0"
@@ -23944,17 +23820,6 @@ dependencies = [
  "westend-emulated-chain",
 ]
 
-[[package]]
-name = "which"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
-dependencies = [
- "either",
- "libc",
- "once_cell",
-]
-
 [[package]]
 name = "wide"
 version = "0.7.11"
@@ -24049,21 +23914,6 @@ dependencies = [
  "windows-targets 0.52.0",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.45.0"
diff --git a/Cargo.toml b/Cargo.toml
index e2611982a985a..7e48fa14ccc22 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -832,7 +832,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.6.2" }
+litep2p = { version = "0.7.0", features = ["websocket"] }
 log = { version = "0.4.22", default-features = false }
 macro_magic = { version = "0.5.1" }
 maplit = { version = "1.0.2" }
diff --git a/prdoc/pr_5609.prdoc b/prdoc/pr_5609.prdoc
new file mode 100644
index 0000000000000..799071f04c1e3
--- /dev/null
+++ b/prdoc/pr_5609.prdoc
@@ -0,0 +1,21 @@
+title: Update litep2p network backend to v0.7.0 
+
+doc:
+  - audience: [ Node Dev, Node Operator ]
+    description: |
+      This PR updates the Litep2p network backend to version 0.7.0.
+      This new release introduces several new features, improvements, and fixes to the litep2p library.
+      Key updates include enhanced error handling propagated through metrics, configurable connection limits,
+      and a new API for managing public addresses.
+
+      The Identify protocol no longer includes public addresses in its configuration.
+      Instead, we rely on the `litep2p.public_addresses` interface to propagate external addresses of the node.
+
+      Litep2p uses hickory DNS resolver (formerly known as trust DNS).
+      Similarly to the trust DNS, the hickory logs are silenced.
+
+crates: 
+  - name: sc-network
+    bump: patch
+  - name: sc-tracing
+    bump: minor
diff --git a/substrate/client/network/src/litep2p/discovery.rs b/substrate/client/network/src/litep2p/discovery.rs
index 62d5f0fb6f06a..bf2005df34d75 100644
--- a/substrate/client/network/src/litep2p/discovery.rs
+++ b/substrate/client/network/src/litep2p/discovery.rs
@@ -243,11 +243,9 @@ impl Discovery {
 	) -> (Self, PingConfig, IdentifyConfig, KademliaConfig, Option<MdnsConfig>) {
 		let (ping_config, ping_event_stream) = PingConfig::default();
 		let user_agent = format!("{} ({})", config.client_version, config.node_name);
-		let (identify_config, identify_event_stream) = IdentifyConfig::new(
-			"/substrate/1.0".to_string(),
-			Some(user_agent),
-			config.public_addresses.clone().into_iter().map(Into::into).collect(),
-		);
+
+		let (identify_config, identify_event_stream) =
+			IdentifyConfig::new("/substrate/1.0".to_string(), Some(user_agent));
 
 		let (mdns_config, mdns_event_stream) = match config.transport {
 			crate::config::TransportConfig::Normal { enable_mdns, .. } => match enable_mdns {
diff --git a/substrate/client/network/src/litep2p/mod.rs b/substrate/client/network/src/litep2p/mod.rs
index 521f1a5fe0f79..277f0759729c8 100644
--- a/substrate/client/network/src/litep2p/mod.rs
+++ b/substrate/client/network/src/litep2p/mod.rs
@@ -54,6 +54,7 @@ use libp2p::kad::{PeerRecord, Record as P2PRecord, RecordKey};
 use litep2p::{
 	config::ConfigBuilder,
 	crypto::ed25519::Keypair,
+	error::{DialError, NegotiationError},
 	executor::Executor,
 	protocol::{
 		libp2p::{
@@ -64,15 +65,14 @@ use litep2p::{
 	},
 	transport::{
 		tcp::config::Config as TcpTransportConfig,
-		websocket::config::Config as WebSocketTransportConfig, Endpoint,
+		websocket::config::Config as WebSocketTransportConfig, ConnectionLimitsConfig, Endpoint,
 	},
 	types::{
 		multiaddr::{Multiaddr, Protocol},
 		ConnectionId,
 	},
-	Error as Litep2pError, Litep2p, Litep2pEvent, ProtocolName as Litep2pProtocolName,
+	Litep2p, Litep2pEvent, ProtocolName as Litep2pProtocolName,
 };
-use parking_lot::RwLock;
 use prometheus_endpoint::Registry;
 
 use sc_client_api::BlockBackend;
@@ -183,9 +183,6 @@ pub struct Litep2pNetworkBackend {
 
 	/// Prometheus metrics.
 	metrics: Option<Metrics>,
-
-	/// External addresses.
-	external_addresses: Arc<RwLock<HashSet<Multiaddr>>>,
 }
 
 impl Litep2pNetworkBackend {
@@ -557,6 +554,9 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkBackend<B, H> for Litep2pNetworkBac
 			.with_libp2p_ping(ping_config)
 			.with_libp2p_identify(identify_config)
 			.with_libp2p_kademlia(kademlia_config)
+			.with_connection_limits(ConnectionLimitsConfig::default().max_incoming_connections(
+				Some(crate::MAX_CONNECTIONS_ESTABLISHED_INCOMING as usize),
+			))
 			.with_executor(executor);
 
 		if let Some(config) = maybe_mdns_config {
@@ -570,15 +570,22 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkBackend<B, H> for Litep2pNetworkBac
 		let litep2p =
 			Litep2p::new(config_builder.build()).map_err(|error| Error::Litep2p(error))?;
 
-		let external_addresses: Arc<RwLock<HashSet<Multiaddr>>> = Arc::new(RwLock::new(
-			HashSet::from_iter(network_config.public_addresses.iter().cloned().map(Into::into)),
-		));
 		litep2p.listen_addresses().for_each(|address| {
 			log::debug!(target: LOG_TARGET, "listening on: {address}");
 
 			listen_addresses.write().insert(address.clone());
 		});
 
+		let public_addresses = litep2p.public_addresses();
+		for address in network_config.public_addresses.iter() {
+			if let Err(err) = public_addresses.add_address(address.clone().into()) {
+				log::warn!(
+					target: LOG_TARGET,
+					"failed to add public address {address:?}: {err:?}",
+				);
+			}
+		}
+
 		let network_service = Arc::new(Litep2pNetworkService::new(
 			local_peer_id,
 			keypair.clone(),
@@ -588,7 +595,7 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkBackend<B, H> for Litep2pNetworkBac
 			block_announce_protocol.clone(),
 			request_response_senders,
 			Arc::clone(&listen_addresses),
-			Arc::clone(&external_addresses),
+			public_addresses,
 		));
 
 		// register rest of the metrics now that `Litep2p` has been created
@@ -614,7 +621,6 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkBackend<B, H> for Litep2pNetworkBac
 			event_streams: out_events::OutChannels::new(None)?,
 			peers: HashMap::new(),
 			litep2p,
-			external_addresses,
 		})
 	}
 
@@ -917,10 +923,16 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkBackend<B, H> for Litep2pNetworkBac
 						self.discovery.add_self_reported_address(peer, supported_protocols, listen_addresses).await;
 					}
 					Some(DiscoveryEvent::ExternalAddressDiscovered { address }) => {
-						let mut addresses = self.external_addresses.write();
-
-						if addresses.insert(address.clone()) {
-							log::info!(target: LOG_TARGET, "🔍 Discovered new external address for our node: {address}");
+						match self.litep2p.public_addresses().add_address(address.clone().into()) {
+							Ok(inserted) => if inserted {
+								log::info!(target: LOG_TARGET, "🔍 Discovered new external address for our node: {address}");
+							},
+							Err(err) => {
+								log::warn!(
+									target: LOG_TARGET,
+									"🔍 Failed to add discovered external address {address:?}: {err:?}",
+								);
+							},
 						}
 					}
 					Some(DiscoveryEvent::Ping { peer, rtt }) => {
@@ -1006,20 +1018,40 @@ impl<B: BlockT + 'static, H: ExHashT> NetworkBackend<B, H> for Litep2pNetworkBac
 						}
 					}
 					Some(Litep2pEvent::DialFailure { address, error }) => {
-						log::trace!(
+						log::debug!(
 							target: LOG_TARGET,
 							"failed to dial peer at {address:?}: {error:?}",
 						);
 
-						let reason = match error {
-							Litep2pError::PeerIdMismatch(_, _) => "invalid-peer-id",
-							Litep2pError::Timeout | Litep2pError::TransportError(_) |
-							Litep2pError::IoError(_) | Litep2pError::WebSocket(_) => "transport-error",
-							_ => "other",
-						};
+						if let Some(metrics) = &self.metrics {
+							let reason = match error {
+								DialError::Timeout => "timeout",
+								DialError::AddressError(_) => "invalid-address",
+								DialError::DnsError(_) => "cannot-resolve-dns",
+								DialError::NegotiationError(error) => match error {
+									NegotiationError::Timeout => "timeout",
+									NegotiationError::PeerIdMissing => "missing-peer-id",
+									NegotiationError::StateMismatch => "state-mismatch",
+									NegotiationError::PeerIdMismatch(_,_) => "peer-id-missmatch",
+									NegotiationError::MultistreamSelectError(_) => "multistream-select-error",
+									NegotiationError::SnowError(_) => "noise-error",
+									NegotiationError::ParseError(_) => "parse-error",
+									NegotiationError::IoError(_) => "io-error",
+									NegotiationError::WebSocket(_) => "webscoket-error",
+								}
+							};
+
+							metrics.pending_connections_errors_total.with_label_values(&[&reason]).inc();
+						}
+					}
+					Some(Litep2pEvent::ListDialFailures { errors }) => {
+						log::debug!(
+							target: LOG_TARGET,
+							"failed to dial peer on multiple addresses {errors:?}",
+						);
 
 						if let Some(metrics) = &self.metrics {
-							metrics.pending_connections_errors_total.with_label_values(&[reason]).inc();
+							metrics.pending_connections_errors_total.with_label_values(&["transport-errors"]).inc();
 						}
 					}
 					_ => {}
diff --git a/substrate/client/network/src/litep2p/service.rs b/substrate/client/network/src/litep2p/service.rs
index 67fc44e6bfe0e..693217f5ad94c 100644
--- a/substrate/client/network/src/litep2p/service.rs
+++ b/substrate/client/network/src/litep2p/service.rs
@@ -36,7 +36,10 @@ use crate::litep2p::Record;
 use codec::DecodeAll;
 use futures::{channel::oneshot, stream::BoxStream};
 use libp2p::{identity::SigningError, kad::record::Key as KademliaKey};
-use litep2p::{crypto::ed25519::Keypair, types::multiaddr::Multiaddr as LiteP2pMultiaddr};
+use litep2p::{
+	addresses::PublicAddresses, crypto::ed25519::Keypair,
+	types::multiaddr::Multiaddr as LiteP2pMultiaddr,
+};
 use parking_lot::RwLock;
 
 use sc_network_common::{
@@ -196,7 +199,7 @@ pub struct Litep2pNetworkService {
 	listen_addresses: Arc<RwLock<HashSet<LiteP2pMultiaddr>>>,
 
 	/// External addresses.
-	external_addresses: Arc<RwLock<HashSet<LiteP2pMultiaddr>>>,
+	external_addresses: PublicAddresses,
 }
 
 impl Litep2pNetworkService {
@@ -210,7 +213,7 @@ impl Litep2pNetworkService {
 		block_announce_protocol: ProtocolName,
 		request_response_protocols: HashMap<ProtocolName, TracingUnboundedSender<OutboundRequest>>,
 		listen_addresses: Arc<RwLock<HashSet<LiteP2pMultiaddr>>>,
-		external_addresses: Arc<RwLock<HashSet<LiteP2pMultiaddr>>>,
+		external_addresses: PublicAddresses,
 	) -> Self {
 		Self {
 			local_peer_id,
@@ -323,9 +326,8 @@ impl NetworkStatusProvider for Litep2pNetworkService {
 				.collect(),
 			external_addresses: self
 				.external_addresses
-				.read()
-				.iter()
-				.cloned()
+				.get_addresses()
+				.into_iter()
 				.map(|a| Multiaddr::from(a).into())
 				.collect(),
 			connected_peers: HashMap::new(),
@@ -491,7 +493,7 @@ impl NetworkEventStream for Litep2pNetworkService {
 
 impl NetworkStateInfo for Litep2pNetworkService {
 	fn external_addresses(&self) -> Vec<Multiaddr> {
-		self.external_addresses.read().iter().cloned().map(Into::into).collect()
+		self.external_addresses.get_addresses().into_iter().map(Into::into).collect()
 	}
 
 	fn listen_addresses(&self) -> Vec<Multiaddr> {
diff --git a/substrate/client/network/src/litep2p/shim/request_response/mod.rs b/substrate/client/network/src/litep2p/shim/request_response/mod.rs
index a77acb464144f..bfd7a60ef9fe6 100644
--- a/substrate/client/network/src/litep2p/shim/request_response/mod.rs
+++ b/substrate/client/network/src/litep2p/shim/request_response/mod.rs
@@ -29,8 +29,10 @@ use crate::{
 
 use futures::{channel::oneshot, future::BoxFuture, stream::FuturesUnordered, StreamExt};
 use litep2p::{
+	error::{ImmediateDialError, NegotiationError, SubstreamError},
 	protocol::request_response::{
-		DialOptions, RequestResponseError, RequestResponseEvent, RequestResponseHandle,
+		DialOptions, RejectReason, RequestResponseError, RequestResponseEvent,
+		RequestResponseHandle,
 	},
 	types::RequestId,
 };
@@ -372,7 +374,32 @@ impl RequestResponseProtocol {
 		let status = match error {
 			RequestResponseError::NotConnected =>
 				Some((RequestFailure::NotConnected, "not-connected")),
-			RequestResponseError::Rejected => Some((RequestFailure::Refused, "rejected")),
+			RequestResponseError::Rejected(reason) => {
+				let reason = match reason {
+					RejectReason::ConnectionClosed => "connection-closed",
+					RejectReason::SubstreamClosed => "substream-closed",
+					RejectReason::SubstreamOpenError(substream_error) => match substream_error {
+						SubstreamError::NegotiationError(NegotiationError::Timeout) =>
+							"substream-timeout",
+						_ => "substream-open-error",
+					},
+					RejectReason::DialFailed(None) => "dial-failed",
+					RejectReason::DialFailed(Some(ImmediateDialError::AlreadyConnected)) =>
+						"dial-already-connected",
+					RejectReason::DialFailed(Some(ImmediateDialError::PeerIdMissing)) =>
+						"dial-peerid-missing",
+					RejectReason::DialFailed(Some(ImmediateDialError::TriedToDialSelf)) =>
+						"dial-tried-to-dial-self",
+					RejectReason::DialFailed(Some(ImmediateDialError::NoAddressAvailable)) =>
+						"dial-no-address-available",
+					RejectReason::DialFailed(Some(ImmediateDialError::TaskClosed)) =>
+						"dial-task-closed",
+					RejectReason::DialFailed(Some(ImmediateDialError::ChannelClogged)) =>
+						"dial-channel-clogged",
+				};
+
+				Some((RequestFailure::Refused, reason))
+			},
 			RequestResponseError::Timeout =>
 				Some((RequestFailure::Network(OutboundFailure::Timeout), "timeout")),
 			RequestResponseError::Canceled => {
diff --git a/substrate/client/network/src/litep2p/shim/request_response/tests.rs b/substrate/client/network/src/litep2p/shim/request_response/tests.rs
index e3e82aa395c58..78b6ef0a481c9 100644
--- a/substrate/client/network/src/litep2p/shim/request_response/tests.rs
+++ b/substrate/client/network/src/litep2p/shim/request_response/tests.rs
@@ -271,7 +271,12 @@ async fn too_many_inbound_requests() {
 	match handle2.next().await {
 		Some(RequestResponseEvent::RequestFailed { peer, error, .. }) => {
 			assert_eq!(peer, peer1);
-			assert_eq!(error, RequestResponseError::Rejected);
+			assert_eq!(
+				error,
+				RequestResponseError::Rejected(
+					litep2p::protocol::request_response::RejectReason::SubstreamClosed
+				)
+			);
 		},
 		event => panic!("inavlid event: {event:?}"),
 	}
diff --git a/substrate/client/tracing/src/logging/mod.rs b/substrate/client/tracing/src/logging/mod.rs
index 74ce5f90ede9e..33fec2d418813 100644
--- a/substrate/client/tracing/src/logging/mod.rs
+++ b/substrate/client/tracing/src/logging/mod.rs
@@ -138,6 +138,9 @@ where
 		.add_directive(
 			parse_default_directive("trust_dns_proto=off").expect("provided directive is valid"),
 		)
+		.add_directive(
+			parse_default_directive("hickory_proto=off").expect("provided directive is valid"),
+		)
 		.add_directive(
 			parse_default_directive("libp2p_mdns::behaviour::iface=off")
 				.expect("provided directive is valid"),

From f0e420a031b2b0d4c2d3c065ab3e4c43a160b0d7 Mon Sep 17 00:00:00 2001
From: Maksym H <1177472+mordamax@users.noreply.github.com>
Date: Tue, 10 Sep 2024 20:15:43 +0100
Subject: [PATCH 06/12] Add prdoc command to /cmd (#5661)

Fixes https://github.com/paritytech/polkadot-sdk/issues/5647

- [x]  create new command (reusing original py module)
- [x]  add unit-test cases (just the fact of proxy)
- [x]  update docs
---
 .github/scripts/cmd/cmd.py                    | 21 +++++++-
 .github/scripts/cmd/test_cmd.py               | 18 +++++++
 .github/scripts/generate-prdoc.py             | 31 +++++++----
 .../scripts/generate-prdoc.requirements.txt   |  6 +++
 .../workflows/check-cargo-check-runtimes.yml  |  4 ++
 .github/workflows/check-features.yml          |  4 ++
 .github/workflows/check-labels.yml            |  4 ++
 .github/workflows/check-licenses.yml          |  4 ++
 .github/workflows/check-links.yml             |  4 ++
 .github/workflows/check-prdoc.yml             |  4 ++
 .github/workflows/cmd-tests.yml               |  8 ++-
 .github/workflows/cmd.yml                     | 54 ++++++++++---------
 .github/workflows/publish-check-crates.yml    |  4 ++
 docs/contributor/commands-readme.md           |  5 +-
 docs/contributor/prdoc.md                     | 27 +++++++---
 15 files changed, 149 insertions(+), 49 deletions(-)
 create mode 100644 .github/scripts/generate-prdoc.requirements.txt

diff --git a/.github/scripts/cmd/cmd.py b/.github/scripts/cmd/cmd.py
index 1c08b621467d3..f7dd88df4bda4 100755
--- a/.github/scripts/cmd/cmd.py
+++ b/.github/scripts/cmd/cmd.py
@@ -5,14 +5,13 @@
 import json
 import argparse
 import _help
+import importlib.util
 
 _HelpAction = _help._HelpAction
 
 f = open('.github/workflows/runtimes-matrix.json', 'r')
 runtimesMatrix = json.load(f)
 
-print(f'runtimesMatrix: {runtimesMatrix}\n')
-
 runtimeNames = list(map(lambda x: x['name'], runtimesMatrix))
 
 common_args = {
@@ -69,6 +68,17 @@
 for arg, config in common_args.items():
     parser_ui.add_argument(arg, **config)
 
+"""
+PRDOC
+"""
+# Import generate-prdoc.py dynamically
+spec = importlib.util.spec_from_file_location("generate_prdoc", ".github/scripts/generate-prdoc.py")
+generate_prdoc = importlib.util.module_from_spec(spec)
+spec.loader.exec_module(generate_prdoc)
+
+parser_prdoc = subparsers.add_parser('prdoc', help='Generates PR documentation')
+generate_prdoc.setup_parser(parser_prdoc)
+
 def main():
     global args, unknown, runtimesMatrix
     args, unknown = parser.parse_known_args()
@@ -215,6 +225,13 @@ def main():
             print('❌ Failed to format code')
             sys.exit(1)
 
+    elif args.command == 'prdoc':
+        # Call the main function from ./github/scripts/generate-prdoc.py module
+        exit_code = generate_prdoc.main(args)
+        if exit_code != 0 and not args.continue_on_fail:
+            print('❌ Failed to generate prdoc')
+            sys.exit(exit_code)
+
     print('🚀 Done')
 
 if __name__ == '__main__':
diff --git a/.github/scripts/cmd/test_cmd.py b/.github/scripts/cmd/test_cmd.py
index 4cf1b290915dc..a2f29b075daed 100644
--- a/.github/scripts/cmd/test_cmd.py
+++ b/.github/scripts/cmd/test_cmd.py
@@ -31,12 +31,18 @@ def setUp(self):
         self.patcher3 = patch('argparse.ArgumentParser.parse_known_args')
         self.patcher4 = patch('os.system', return_value=0)
         self.patcher5 = patch('os.popen')
+        self.patcher6 = patch('importlib.util.spec_from_file_location', return_value=MagicMock())
+        self.patcher7 = patch('importlib.util.module_from_spec', return_value=MagicMock())
+        self.patcher8 = patch('cmd.generate_prdoc.main', return_value=0)
         
         self.mock_open = self.patcher1.start()
         self.mock_json_load = self.patcher2.start()
         self.mock_parse_args = self.patcher3.start()
         self.mock_system = self.patcher4.start()
         self.mock_popen = self.patcher5.start()
+        self.mock_spec_from_file_location = self.patcher6.start()
+        self.mock_module_from_spec = self.patcher7.start()
+        self.mock_generate_prdoc_main = self.patcher8.start()
 
         # Ensure that cmd.py uses the mock_runtimes_matrix
         import cmd
@@ -48,6 +54,9 @@ def tearDown(self):
         self.patcher3.stop()
         self.patcher4.stop()
         self.patcher5.stop()
+        self.patcher6.stop()
+        self.patcher7.stop()
+        self.patcher8.stop()
 
     def test_bench_command_normal_execution_all_runtimes(self):
         self.mock_parse_args.return_value = (argparse.Namespace(
@@ -317,5 +326,14 @@ def test_update_ui_command(self, mock_system, mock_parse_args):
             mock_exit.assert_not_called()
             mock_system.assert_called_with('sh ./scripts/update-ui-tests.sh')
 
+    @patch('argparse.ArgumentParser.parse_known_args', return_value=(argparse.Namespace(command='prdoc', continue_on_fail=False), []))
+    @patch('os.system', return_value=0)
+    def test_prdoc_command(self, mock_system, mock_parse_args):
+        with patch('sys.exit') as mock_exit:
+            import cmd
+            cmd.main()
+            mock_exit.assert_not_called()
+            self.mock_generate_prdoc_main.assert_called_with(mock_parse_args.return_value[0])
+
 if __name__ == '__main__':
     unittest.main()
\ No newline at end of file
diff --git a/.github/scripts/generate-prdoc.py b/.github/scripts/generate-prdoc.py
index a6a97008dca63..d3b6b523ecfd3 100644
--- a/.github/scripts/generate-prdoc.py
+++ b/.github/scripts/generate-prdoc.py
@@ -113,17 +113,28 @@ def yaml_multiline_string_presenter(dumper, data):
 
 	yaml.add_representer(str, yaml_multiline_string_presenter)
 
-def parse_args():
-	parser = argparse.ArgumentParser()
-	parser.add_argument("--pr", type=int, required=True)
-	parser.add_argument("--audience", type=str, default="TODO")
-	parser.add_argument("--bump", type=str, default="TODO")
-	parser.add_argument("--force", type=str)
-	return parser.parse_args()
+# parse_args is also used by cmd/cmd.py
+def setup_parser(parser=None):
+	if parser is None:
+		parser = argparse.ArgumentParser()
+	parser.add_argument("--pr", type=int, required=True, help="The PR number to generate the PrDoc for."	)
+	parser.add_argument("--audience", type=str, default="TODO", help="The audience of whom the changes may concern.")
+	parser.add_argument("--bump", type=str, default="TODO", help="A default bump level for all crates.")
+	parser.add_argument("--force", type=str, help="Whether to overwrite any existing PrDoc.")
+	
+	return parser
 
-if __name__ == "__main__":
-	args = parse_args()
+def main(args):
 	force = True if (args.force or "false").lower() == "true" else False
 	print(f"Args: {args}, force: {force}")
 	setup_yaml()
-	from_pr_number(args.pr, args.audience, args.bump, force)
+	try:
+		from_pr_number(args.pr, args.audience, args.bump, force)
+		return 0
+	except Exception as e:
+		print(f"Error generating prdoc: {e}")
+		return 1
+
+if __name__ == "__main__":
+	args = setup_parser().parse_args()
+	main(args)
\ No newline at end of file
diff --git a/.github/scripts/generate-prdoc.requirements.txt b/.github/scripts/generate-prdoc.requirements.txt
new file mode 100644
index 0000000000000..c17aceff63a0f
--- /dev/null
+++ b/.github/scripts/generate-prdoc.requirements.txt
@@ -0,0 +1,6 @@
+requests
+cargo-workspace
+PyGithub
+whatthepatch
+pyyaml
+toml
\ No newline at end of file
diff --git a/.github/workflows/check-cargo-check-runtimes.yml b/.github/workflows/check-cargo-check-runtimes.yml
index ea0a4b943213a..bfca4968a3b21 100644
--- a/.github/workflows/check-cargo-check-runtimes.yml
+++ b/.github/workflows/check-cargo-check-runtimes.yml
@@ -1,5 +1,9 @@
 name: Check Cargo Check Runtimes
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 on:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
diff --git a/.github/workflows/check-features.yml b/.github/workflows/check-features.yml
index d34b3d52c5332..d8e2f72c0ffd8 100644
--- a/.github/workflows/check-features.yml
+++ b/.github/workflows/check-features.yml
@@ -4,6 +4,10 @@ on:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   check-features:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/check-labels.yml b/.github/workflows/check-labels.yml
index 1d1a8770058d3..6ec35840608c8 100644
--- a/.github/workflows/check-labels.yml
+++ b/.github/workflows/check-labels.yml
@@ -1,5 +1,9 @@
 name: Check labels
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 on:
   pull_request:
     types: [labeled, opened, synchronize, unlabeled]
diff --git a/.github/workflows/check-licenses.yml b/.github/workflows/check-licenses.yml
index e3fc27f0a94b7..ddb1c452a7b8d 100644
--- a/.github/workflows/check-licenses.yml
+++ b/.github/workflows/check-licenses.yml
@@ -4,6 +4,10 @@ on:
   pull_request:
   merge_group:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 permissions:
   packages: read
 
diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml
index 1060d252fd2a5..0ebd33d417af7 100644
--- a/.github/workflows/check-links.yml
+++ b/.github/workflows/check-links.yml
@@ -10,6 +10,10 @@ on:
     types: [opened, synchronize, reopened, ready_for_review]
   merge_group:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 permissions:
   packages: read
 
diff --git a/.github/workflows/check-prdoc.yml b/.github/workflows/check-prdoc.yml
index 8f60b9cccf85d..fc2824770225e 100644
--- a/.github/workflows/check-prdoc.yml
+++ b/.github/workflows/check-prdoc.yml
@@ -1,5 +1,9 @@
 name: Check PRdoc
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 on:
   pull_request:
     types: [labeled, opened, synchronize, unlabeled]
diff --git a/.github/workflows/cmd-tests.yml b/.github/workflows/cmd-tests.yml
index 87d7ee1dcc2dd..37f1747d0b9ea 100644
--- a/.github/workflows/cmd-tests.yml
+++ b/.github/workflows/cmd-tests.yml
@@ -1,14 +1,18 @@
 name: Command Bot Tests
 
 on:
-  pull_request: 
+  pull_request:
 
 permissions:
   contents: read
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: python3 .github/scripts/cmd/test_cmd.py
\ No newline at end of file
+      - run: python3 .github/scripts/cmd/test_cmd.py
diff --git a/.github/workflows/cmd.yml b/.github/workflows/cmd.yml
index 79a4f6c3b19cc..645b5444aa0f0 100644
--- a/.github/workflows/cmd.yml
+++ b/.github/workflows/cmd.yml
@@ -2,7 +2,7 @@ name: Command
 
 on:
   issue_comment: # listen for comments on issues
-    types: [ created ]
+    types: [created]
 
 permissions: # allow the action to comment on the PR
   contents: write
@@ -35,14 +35,14 @@ jobs:
             try {              
               const org = '${{ github.event.repository.owner.login }}';
               const username = '${{ github.event.comment.user.login }}';
-            
+
               const membership = await github.rest.orgs.checkMembershipForUser({
                   org: org,
                   username: username
               });
-            
+
               console.log(membership, membership.status, membership.status === 204);
-            
+
               if (membership.status === 204) {
                 return 'true';
               } else {
@@ -52,7 +52,7 @@ jobs:
             } catch (error) {
               console.log(error)
             }
-            
+
             return 'false';
 
   reject-non-members:
@@ -140,12 +140,14 @@ jobs:
               }
             })
   help:
-    needs: [ clean, is-org-member ]
+    needs: [clean, is-org-member]
     if: ${{ startsWith(github.event.comment.body, '/cmd') && contains(github.event.comment.body, '--help') && needs.is-org-member.outputs.member == 'true' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Get command
         uses: actions-ecosystem/action-regex-match@v2
@@ -160,6 +162,7 @@ jobs:
           CMD: ${{ steps.get-pr-comment.outputs.group2 }} # to avoid "" around the command
         run: |
           echo 'help<<EOF' >> $GITHUB_OUTPUT
+          python3 -m pip install -r .github/scripts/generate-prdoc.requirements.txt
           python3 .github/scripts/cmd/cmd.py $CMD >> $GITHUB_OUTPUT
           echo 'EOF' >> $GITHUB_OUTPUT
 
@@ -173,11 +176,11 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               body: `<details><summary>Command help:</summary> 
-            
+
             \`\`\`
             ${{ steps.help.outputs.help }}
             \`\`\` 
-            
+
             </details>`
             })
 
@@ -208,7 +211,7 @@ jobs:
             })
 
   set-image:
-    needs: [ clean, is-org-member ]
+    needs: [clean, is-org-member]
     if: ${{ startsWith(github.event.comment.body, '/cmd') && !contains(github.event.comment.body, '--help') && needs.is-org-member.outputs.member == 'true' }}
     runs-on: ubuntu-latest
     outputs:
@@ -222,13 +225,13 @@ jobs:
         run: |
           BODY=$(echo "${{ github.event.comment.body }}" | xargs)
           IMAGE_OVERRIDE=$(echo $BODY | grep -oe 'docker.io/paritytech/ci-unified:.*\s' | xargs)
-          
+
           cat .github/env >> $GITHUB_OUTPUT
-          
+
           if [ -n "$IMAGE_OVERRIDE" ]; then
               echo "IMAGE=$IMAGE_OVERRIDE" >> $GITHUB_OUTPUT
           fi
-          
+
           if [[ $BODY == "/cmd bench"* ]]; then
               echo "RUNNER=arc-runners-polkadot-sdk-benchmark" >> $GITHUB_OUTPUT
           elif [[ $BODY == "/cmd update-ui"* ]]; then
@@ -239,7 +242,7 @@ jobs:
 
   # Get PR branch name, because the issue_comment event does not contain the PR branch name
   get-pr-branch:
-    needs: [ set-image ]
+    needs: [set-image]
     runs-on: ubuntu-latest
     outputs:
       pr-branch: ${{ steps.get-pr.outputs.pr_branch }}
@@ -278,9 +281,9 @@ jobs:
           echo "The repository is ${{ steps.get-pr.outputs.repo }}"
 
   cmd:
-    needs: [ set-image, get-pr-branch ]
+    needs: [set-image, get-pr-branch]
     env:
-      JOB_NAME: 'cmd'
+      JOB_NAME: "cmd"
     runs-on: ${{ needs.set-image.outputs.RUNNER }}
     container:
       image: ${{ needs.set-image.outputs.IMAGE }}
@@ -301,18 +304,17 @@ jobs:
             -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
             -H "Accept: application/vnd.github.v3+json" \
             https://api.github.com/repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs | jq '.jobs[] | select(.name | contains("${{ env.JOB_NAME }}")) | .html_url')
-          
+
           runLink=$(curl -s \
             -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
             -H "Accept: application/vnd.github.v3+json" \
             https://api.github.com/repos/${{ github.repository }}/actions/runs/${{ github.run_id }} | jq '.html_url')
-          
+
           echo "job_url=${jobLink}"
           echo "run_url=${runLink}"
           echo "job_url=$jobLink" >> $GITHUB_OUTPUT
           echo "run_url=$runLink" >> $GITHUB_OUTPUT
 
-
       - name: Comment PR (Start)
         if: ${{ !contains(github.event.comment.body, '--quiet') }}
         uses: actions/github-script@v7
@@ -320,7 +322,7 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             let job_url = ${{ steps.build-link.outputs.job_url }}
-            
+
             github.rest.issues.createComment({
               issue_number: context.issue.number,
               owner: context.repo.owner,
@@ -331,8 +333,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          repository: ${{ needs.get-pr-branch.outputs.repo }}
-          ref: ${{ needs.get-pr-branch.outputs.pr-branch }}
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Install dependencies for bench
         if: startsWith(steps.get-pr-comment.outputs.group2, 'bench')
@@ -348,6 +349,7 @@ jobs:
           # Fixes "detected dubious ownership" error in the ci
           git config --global --add safe.directory '*'
           git remote -v
+          python3 -m pip install -r .github/scripts/generate-prdoc.requirements.txt
           python3 .github/scripts/cmd/cmd.py $CMD
           git status
           git diff
@@ -357,7 +359,7 @@ jobs:
           if [ -n "$(git status --porcelain)" ]; then
             git config --local user.email "action@github.com"
             git config --local user.name "GitHub Action"
-          
+
             git pull --rebase origin ${{ needs.get-pr-branch.outputs.pr-branch }}
             git add .
             git restore --staged Cargo.lock # ignore changes in Cargo.lock
@@ -381,7 +383,7 @@ jobs:
             --change added changed \
             --ignore-errors \
             refs/remotes/origin/master refs/heads/${{ needs.get-pr-branch.outputs.pr-branch }})
-          
+
           # Save the multiline result to the output
           {
             echo "result<<EOF"
@@ -393,17 +395,17 @@ jobs:
         if: ${{ !failure() && !contains(github.event.comment.body, '--quiet') }}
         uses: actions/github-script@v7
         env:
-          SUBWEIGHT: '${{ steps.subweight.outputs.result }}'
+          SUBWEIGHT: "${{ steps.subweight.outputs.result }}"
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             let runUrl = ${{ steps.build-link.outputs.run_url }}
             let subweight = process.env.SUBWEIGHT;
-            
+
             let subweightCollapsed = subweight 
               ? `<details>\n\n<summary>Subweight results:</summary>\n\n${subweight}\n\n</details>` 
               : '';
-            
+
             github.rest.issues.createComment({
               issue_number: context.issue.number,
               owner: context.repo.owner,
diff --git a/.github/workflows/publish-check-crates.yml b/.github/workflows/publish-check-crates.yml
index 77653cd43b628..cffa9a230c472 100644
--- a/.github/workflows/publish-check-crates.yml
+++ b/.github/workflows/publish-check-crates.yml
@@ -8,6 +8,10 @@ on:
     types: [opened, synchronize, reopened, ready_for_review]
   merge_group:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   check-publish:
     runs-on: ubuntu-latest
diff --git a/docs/contributor/commands-readme.md b/docs/contributor/commands-readme.md
index 2bb9bd7e7d582..861c3ac784d5d 100644
--- a/docs/contributor/commands-readme.md
+++ b/docs/contributor/commands-readme.md
@@ -9,13 +9,14 @@ Note: it works only for members of the `paritytech` organization.
 
 `/cmd <command> --help` to see the usage of a specific command
 
-
 ### Commands
 
 - `/cmd fmt` to format the code in the PR. It commits back with the formatted code (fmt) and configs (taplo).
 
 - `/cmd bench` to generate weights for a runtime. Read more about [Weight Generation](weight-generation.md)
 
+- `/cmd prdoc` to generate a prdoc for a PR. Read more about [PRDoc](prdoc.md)
+
 ### Flags
 
 1.`--quiet` to suppress the output of the command in the comments.
@@ -32,12 +33,14 @@ The pipeline logs will include what is failed (like which runtimes/pallets), the
 or they keep failing, and you're rerunning them again, it's handy to add this flag to keep a PR clean.
 
 ### Adding new Commands
+
 Feel free to add new commands to the workflow, however **_note_** that triggered workflows will use the actions
 from `main` (default) branch, meaning they will take effect only after the PR with new changes/command is merged.
 If you want to test the new command, it's better to test in your fork and local-to-fork PRs, where you control
 the default branch.
 
 ### Examples
+
 The regex in cmd.yml is: `^(\/cmd )([-\/\s\w.=:]+)$` accepts only alphanumeric, space, "-", "/", "=", ":", "." chars.
 
 `/cmd bench --runtime bridge-hub-westend --pallet=pallet_name`
diff --git a/docs/contributor/prdoc.md b/docs/contributor/prdoc.md
index 3dddcc10f5d0b..4a1a3c1f06880 100644
--- a/docs/contributor/prdoc.md
+++ b/docs/contributor/prdoc.md
@@ -18,24 +18,35 @@ A `.prdoc` file is a YAML file with a defined structure (ie JSON Schema). Please
 1. Open a Pull Request and get the PR number.
 1. Generate the file with `prdoc generate <PR_NUMBER>`. The output filename will be printed.
 1. Optional: Install the `prdoc/schema_user.json` schema in your editor, for example
-[VsCode](https://github.com/paritytech/prdoc?tab=readme-ov-file#schemas).
+   [VsCode](https://github.com/paritytech/prdoc?tab=readme-ov-file#schemas).
 1. Edit your `.prdoc` file according to the [Audience](#pick-an-audience) and [SemVer](#record-semver-changes) sections.
 1. Check your prdoc with `prdoc check -n <PR_NUMBER>`. This is optional since the CI will also check it.
 
 > **Tip:** GitHub CLI and jq can be used to provide the number of your PR to generate the correct file:  
 > `prdoc generate $(gh pr view --json number | jq '.number') -o prdoc`
 
+Alternatively you can call the prdoc from PR via `/cmd prdoc` (see args with `/cmd prdoc --help`)
+in a comment to PR to trigger it from CI.
+
+Options:
+
+- `pr`: The PR number to generate the PrDoc for.
+- `audience`: The audience of whom the changes may concern.
+- `bump`: A default bump level for all crates.
+  The PrDoc will likely need to be edited to reflect the actual changes after generation.
+- `force`: Whether to overwrite any existing PrDoc.
+
 ## Pick An Audience
 
 While describing a PR, the author needs to consider which audience(s) need to be addressed.
 The list of valid audiences is described and documented in the JSON schema as follow:
 
 - `Node Dev`: Those who build around the client side code. Alternative client builders, SMOLDOT, those who consume RPCs.
-   These are people who are oblivious to the runtime changes. They only care about the meta-protocol, not the protocol
-   itself.
+  These are people who are oblivious to the runtime changes. They only care about the meta-protocol, not the protocol
+  itself.
 
 - `Runtime Dev`: All of those who rely on the runtime. A parachain team that is using a pallet. A DApp that is using a
-   pallet. These are people who care about the protocol (WASM), not the meta-protocol (client).
+  pallet. These are people who care about the protocol (WASM), not the meta-protocol (client).
 
 - `Node Operator`: Those who don't write any code and only run code.
 
@@ -64,10 +75,10 @@ For example when you modified two crates and record the changes:
 
 ```yaml
 crates:
-- name: frame-example
-  bump: major
-- name: frame-example-pallet
-  bump: minor
+  - name: frame-example
+    bump: major
+  - name: frame-example-pallet
+    bump: minor
 ```
 
 It means that downstream code using `frame-example-pallet` is still guaranteed to work as before, while code using

From ea5fb02e9ae819771c05e1792de30b1352175ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Thei=C3=9Fen?= <alex.theissen@me.com>
Date: Wed, 11 Sep 2024 13:00:34 +0200
Subject: [PATCH 07/12] Send balance when contract doesn't exist (#5664)

Fixes #5577

I decided to bubble up the error from where we actually try to load the
contract info. This helps to make sure that we don't miss some entry
point by accident. The draw back is that we have to live with some
additional `.expect`.

@pgherveou With this logic the proxy and its runtime part should be
completely unaware whether something is a contract call or a balance
transfer. They should just route everything into pallet_revive.

---------

Co-authored-by: Cyrill Leutwiler <cyrill@parity.io>
---
 prdoc/pr_5664.prdoc                           |  11 +
 .../fixtures/contracts/call_return_code.rs    |   3 +-
 substrate/frame/revive/src/exec.rs            | 275 ++++++++++++------
 substrate/frame/revive/src/primitives.rs      |   2 +-
 substrate/frame/revive/src/tests.rs           |  79 +++--
 substrate/frame/revive/src/wasm/runtime.rs    |   3 +-
 substrate/frame/revive/uapi/src/flags.rs      |   1 +
 7 files changed, 256 insertions(+), 118 deletions(-)
 create mode 100644 prdoc/pr_5664.prdoc

diff --git a/prdoc/pr_5664.prdoc b/prdoc/pr_5664.prdoc
new file mode 100644
index 0000000000000..7fbe15006da36
--- /dev/null
+++ b/prdoc/pr_5664.prdoc
@@ -0,0 +1,11 @@
+title: Calling an address without associated code is a balance transfer
+
+doc:
+  - audience: Runtime Dev
+    description: |
+     This makes pallet_revive behave like EVM where a balance transfer
+     is just a call to a plain wallet.
+
+crates:
+  - name: pallet-revive
+    bump: patch
diff --git a/substrate/frame/revive/fixtures/contracts/call_return_code.rs b/substrate/frame/revive/fixtures/contracts/call_return_code.rs
index 25370459acb4f..d0d7c1bee2a5f 100644
--- a/substrate/frame/revive/fixtures/contracts/call_return_code.rs
+++ b/substrate/frame/revive/fixtures/contracts/call_return_code.rs
@@ -34,6 +34,7 @@ pub extern "C" fn call() {
 	input!(
 		100,
 		callee_addr: &[u8; 20],
+		value: &[u8; 32],
 		input: [u8],
 	);
 
@@ -44,7 +45,7 @@ pub extern "C" fn call() {
 		0u64,                // How much ref_time to devote for the execution. 0 = all.
 		0u64,                // How much proof_size to devote for the execution. 0 = all.
 		None,                // No deposit limit.
-		&u256_bytes(100u64), // Value transferred to the contract.
+		value, 				 // Value transferred to the contract.
 		input,
 		None,
 	) {
diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index 468f5aa8240e8..587d89b31984a 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -64,6 +64,8 @@ pub type ExecResult = Result<ExecReturnValue, ExecError>;
 /// Type for variable sized storage key. Used for transparent hashing.
 type VarSizedKey = BoundedVec<u8, ConstU32<{ limits::STORAGE_KEY_BYTES }>>;
 
+const FRAME_ALWAYS_EXISTS_ON_INSTANTIATE: &str = "The return value is only `None` if no contract exists at the specified address. This cannot happen on instantiate or delegate; qed";
+
 /// Combined key type for both fixed and variable sized storage keys.
 pub enum Key {
 	/// Variant for fixed sized keys.
@@ -591,26 +593,6 @@ enum CachedContract<T: Config> {
 	Terminated,
 }
 
-impl<T: Config> CachedContract<T> {
-	/// Return `Some(ContractInfo)` if the contract is in cached state. `None` otherwise.
-	fn into_contract(self) -> Option<ContractInfo<T>> {
-		if let CachedContract::Cached(contract) = self {
-			Some(contract)
-		} else {
-			None
-		}
-	}
-
-	/// Return `Some(&mut ContractInfo)` if the contract is in cached state. `None` otherwise.
-	fn as_contract(&mut self) -> Option<&mut ContractInfo<T>> {
-		if let CachedContract::Cached(contract) = self {
-			Some(contract)
-		} else {
-			None
-		}
-	}
-}
-
 impl<T: Config> Frame<T> {
 	/// Return the `contract_info` of the current contract.
 	fn contract_info(&mut self) -> &mut ContractInfo<T> {
@@ -668,6 +650,24 @@ macro_rules! top_frame_mut {
 }
 
 impl<T: Config> CachedContract<T> {
+	/// Return `Some(ContractInfo)` if the contract is in cached state. `None` otherwise.
+	fn into_contract(self) -> Option<ContractInfo<T>> {
+		if let CachedContract::Cached(contract) = self {
+			Some(contract)
+		} else {
+			None
+		}
+	}
+
+	/// Return `Some(&mut ContractInfo)` if the contract is in cached state. `None` otherwise.
+	fn as_contract(&mut self) -> Option<&mut ContractInfo<T>> {
+		if let CachedContract::Cached(contract) = self {
+			Some(contract)
+		} else {
+			None
+		}
+	}
+
 	/// Load the `contract_info` from storage if necessary.
 	fn load(&mut self, account_id: &T::AccountId) {
 		if let CachedContract::Invalidated = self {
@@ -717,20 +717,20 @@ where
 		value: BalanceOf<T>,
 		input_data: Vec<u8>,
 		debug_message: Option<&'a mut DebugBuffer>,
-	) -> Result<ExecReturnValue, ExecError> {
-		let (mut stack, executable) = Self::new(
-			FrameArgs::Call {
-				dest: T::AddressMapper::to_account_id(&dest),
-				cached_info: None,
-				delegated_call: None,
-			},
-			origin,
+	) -> ExecResult {
+		let dest = T::AddressMapper::to_account_id(&dest);
+		if let Some((mut stack, executable)) = Self::new(
+			FrameArgs::Call { dest: dest.clone(), cached_info: None, delegated_call: None },
+			origin.clone(),
 			gas_meter,
 			storage_meter,
 			value,
 			debug_message,
-		)?;
-		stack.run(executable, input_data)
+		)? {
+			stack.run(executable, input_data)
+		} else {
+			Self::transfer_no_contract(&origin, &dest, value)
+		}
 	}
 
 	/// Create and run a new call stack by instantiating a new contract.
@@ -765,7 +765,8 @@ where
 			storage_meter,
 			value,
 			debug_message,
-		)?;
+		)?
+		.expect(FRAME_ALWAYS_EXISTS_ON_INSTANTIATE);
 		let address = T::AddressMapper::to_address(&stack.top_frame().account_id);
 		stack.run(executable, input_data).map(|ret| (address, ret))
 	}
@@ -792,9 +793,13 @@ where
 			debug_message,
 		)
 		.unwrap()
+		.unwrap()
 	}
 
 	/// Create a new call stack.
+	///
+	/// Returns `None` when calling a non existant contract. This is not an error case
+	/// since this will result in a value transfer.
 	fn new(
 		args: FrameArgs<T, E>,
 		origin: Origin<T>,
@@ -802,8 +807,8 @@ where
 		storage_meter: &'a mut storage::meter::Meter<T>,
 		value: BalanceOf<T>,
 		debug_message: Option<&'a mut DebugBuffer>,
-	) -> Result<(Self, E), ExecError> {
-		let (first_frame, executable) = Self::new_frame(
+	) -> Result<Option<(Self, E)>, ExecError> {
+		let Some((first_frame, executable)) = Self::new_frame(
 			args,
 			value,
 			gas_meter,
@@ -811,7 +816,10 @@ where
 			storage_meter,
 			BalanceOf::<T>::zero(),
 			false,
-		)?;
+		)?
+		else {
+			return Ok(None);
+		};
 
 		let stack = Self {
 			origin,
@@ -826,7 +834,7 @@ where
 			_phantom: Default::default(),
 		};
 
-		Ok((stack, executable))
+		Ok(Some((stack, executable)))
 	}
 
 	/// Construct a new frame.
@@ -841,15 +849,20 @@ where
 		storage_meter: &mut storage::meter::GenericMeter<T, S>,
 		deposit_limit: BalanceOf<T>,
 		read_only: bool,
-	) -> Result<(Frame<T>, E), ExecError> {
+	) -> Result<Option<(Frame<T>, E)>, ExecError> {
 		let (account_id, contract_info, executable, delegate_caller, entry_point) = match frame_args
 		{
 			FrameArgs::Call { dest, cached_info, delegated_call } => {
 				let contract = if let Some(contract) = cached_info {
 					contract
 				} else {
-					<ContractInfoOf<T>>::get(T::AddressMapper::to_address(&dest))
-						.ok_or(<Error<T>>::ContractNotFound)?
+					if let Some(contract) =
+						<ContractInfoOf<T>>::get(T::AddressMapper::to_address(&dest))
+					{
+						contract
+					} else {
+						return Ok(None)
+					}
 				};
 
 				let (executable, delegate_caller) =
@@ -896,7 +909,7 @@ where
 			read_only,
 		};
 
-		Ok((frame, executable))
+		Ok(Some((frame, executable)))
 	}
 
 	/// Create a subsequent nested frame.
@@ -907,7 +920,7 @@ where
 		gas_limit: Weight,
 		deposit_limit: BalanceOf<T>,
 		read_only: bool,
-	) -> Result<E, ExecError> {
+	) -> Result<Option<E>, ExecError> {
 		if self.frames.len() as u32 == limits::CALL_STACK_DEPTH {
 			return Err(Error::<T>::MaxCallDepthReached.into());
 		}
@@ -929,7 +942,7 @@ where
 		let frame = top_frame_mut!(self);
 		let nested_gas = &mut frame.nested_gas;
 		let nested_storage = &mut frame.nested_storage;
-		let (frame, executable) = Self::new_frame(
+		if let Some((frame, executable)) = Self::new_frame(
 			frame_args,
 			value_transferred,
 			nested_gas,
@@ -937,15 +950,18 @@ where
 			nested_storage,
 			deposit_limit,
 			read_only,
-		)?;
-		self.frames.try_push(frame).map_err(|_| Error::<T>::MaxCallDepthReached)?;
-		Ok(executable)
+		)? {
+			self.frames.try_push(frame).map_err(|_| Error::<T>::MaxCallDepthReached)?;
+			Ok(Some(executable))
+		} else {
+			Ok(None)
+		}
 	}
 
 	/// Run the current (top) frame.
 	///
 	/// This can be either a call or an instantiate.
-	fn run(&mut self, executable: E, input_data: Vec<u8>) -> Result<ExecReturnValue, ExecError> {
+	fn run(&mut self, executable: E, input_data: Vec<u8>) -> ExecResult {
 		let frame = self.top_frame();
 		let entry_point = frame.entry_point;
 		let delegated_code_hash =
@@ -954,13 +970,15 @@ where
 		self.transient_storage.start_transaction();
 
 		let do_transaction = || {
+			let caller = self.caller();
+			let frame = top_frame_mut!(self);
+
 			// We need to charge the storage deposit before the initial transfer so that
 			// it can create the account in case the initial transfer is < ed.
 			if entry_point == ExportedFunction::Constructor {
 				// Root origin can't be used to instantiate a contract, so it is safe to assume that
 				// if we reached this point the origin has an associated account.
 				let origin = &self.origin.account_id()?;
-				let frame = top_frame_mut!(self);
 				frame.nested_storage.charge_instantiate(
 					origin,
 					&frame.account_id,
@@ -969,11 +987,15 @@ where
 				)?;
 				// Needs to be incremented before calling into the code so that it is visible
 				// in case of recursion.
-				<System<T>>::inc_account_nonce(self.caller().account_id()?);
+				<System<T>>::inc_account_nonce(caller.account_id()?);
 			}
 
 			// Every non delegate call or instantiate also optionally transfers the balance.
-			self.initial_transfer()?;
+			// If it is a delegate call, then we've already transferred tokens in the
+			// last non-delegate frame.
+			if delegated_code_hash.is_none() {
+				Self::transfer_from_origin(&caller, &frame.account_id, frame.value_transferred)?;
+			}
 
 			let contract_address = T::AddressMapper::to_address(&top_frame!(self).account_id);
 
@@ -1166,40 +1188,40 @@ where
 	}
 
 	/// Transfer some funds from `from` to `to`.
-	fn transfer(
-		preservation: Preservation,
-		from: &T::AccountId,
-		to: &T::AccountId,
-		value: BalanceOf<T>,
-	) -> DispatchResult {
-		if !value.is_zero() && from != to {
-			T::Currency::transfer(from, to, value, preservation)
+	fn transfer(from: &T::AccountId, to: &T::AccountId, value: BalanceOf<T>) -> DispatchResult {
+		// this avoids events to be emitted for zero balance transfers
+		if !value.is_zero() {
+			T::Currency::transfer(from, to, value, Preservation::Preserve)
 				.map_err(|_| Error::<T>::TransferFailed)?;
 		}
 		Ok(())
 	}
 
-	// The transfer as performed by a call or instantiate.
-	fn initial_transfer(&self) -> DispatchResult {
-		let frame = self.top_frame();
-
-		// If it is a delegate call, then we've already transferred tokens in the
-		// last non-delegate frame.
-		if frame.delegate_caller.is_some() {
-			return Ok(());
-		}
-
-		let value = frame.value_transferred;
-
-		// Get the account id from the caller.
-		// If the caller is root there is no account to transfer from, and therefore we can't take
-		// any `value` other than 0.
-		let caller = match self.caller() {
+	/// Same as `transfer` but `from` is an `Origin`.
+	fn transfer_from_origin(
+		from: &Origin<T>,
+		to: &T::AccountId,
+		value: BalanceOf<T>,
+	) -> DispatchResult {
+		// If the from address is root there is no account to transfer from, and therefore we can't
+		// take any `value` other than 0.
+		let from = match from {
 			Origin::Signed(caller) => caller,
 			Origin::Root if value.is_zero() => return Ok(()),
 			Origin::Root => return DispatchError::RootNotAllowed.into(),
 		};
-		Self::transfer(Preservation::Preserve, &caller, &frame.account_id, value)
+		Self::transfer(from, to, value)
+	}
+
+	/// Same as `transfer_from_origin` but creates an `ExecReturnValue` on success.
+	fn transfer_no_contract(
+		from: &Origin<T>,
+		to: &T::AccountId,
+		value: BalanceOf<T>,
+	) -> ExecResult {
+		Self::transfer_from_origin(from, to, value)
+			.map(|_| ExecReturnValue::default())
+			.map_err(Into::into)
 	}
 
 	/// Reference to the current (top) frame.
@@ -1255,13 +1277,14 @@ where
 		input_data: Vec<u8>,
 		allows_reentry: bool,
 		read_only: bool,
-	) -> Result<ExecReturnValue, ExecError> {
+	) -> ExecResult {
 		// Before pushing the new frame: Protect the caller contract against reentrancy attacks.
 		// It is important to do this before calling `allows_reentry` so that a direct recursion
 		// is caught by it.
 		self.top_frame_mut().allows_reentry = allows_reentry;
 
 		let dest = T::AddressMapper::to_account_id(dest);
+		let value = value.try_into().map_err(|_| Error::<T>::BalanceConversionFailed)?;
 
 		let try_call = || {
 			if !self.allows_reentry(&dest) {
@@ -1278,15 +1301,22 @@ where
 					CachedContract::Cached(contract) => Some(contract.clone()),
 					_ => None,
 				});
-			let executable = self.push_frame(
-				FrameArgs::Call { dest, cached_info, delegated_call: None },
-				value.try_into().map_err(|_| Error::<T>::BalanceConversionFailed)?,
+			if let Some(executable) = self.push_frame(
+				FrameArgs::Call { dest: dest.clone(), cached_info, delegated_call: None },
+				value,
 				gas_limit,
 				deposit_limit.try_into().map_err(|_| Error::<T>::BalanceConversionFailed)?,
 				// Enable read-only access if requested; cannot disable it if already set.
 				read_only || self.is_read_only(),
-			)?;
-			self.run(executable, input_data)
+			)? {
+				self.run(executable, input_data)
+			} else {
+				Self::transfer_no_contract(
+					&Origin::from_account_id(self.account_id().clone()),
+					&dest,
+					value,
+				)
+			}
 		};
 
 		// We need to make sure to reset `allows_reentry` even on failure.
@@ -1319,7 +1349,7 @@ where
 			BalanceOf::<T>::zero(),
 			self.is_read_only(),
 		)?;
-		self.run(executable, input_data)
+		self.run(executable.expect(FRAME_ALWAYS_EXISTS_ON_INSTANTIATE), input_data)
 	}
 
 	fn instantiate(
@@ -1346,7 +1376,8 @@ where
 			self.is_read_only(),
 		)?;
 		let address = T::AddressMapper::to_address(&self.top_frame().account_id);
-		self.run(executable, input_data).map(|ret| (address, ret))
+		self.run(executable.expect(FRAME_ALWAYS_EXISTS_ON_INSTANTIATE), input_data)
+			.map(|ret| (address, ret))
 	}
 
 	fn terminate(&mut self, beneficiary: &H160) -> DispatchResult {
@@ -1379,7 +1410,6 @@ where
 
 	fn transfer(&mut self, to: &H160, value: U256) -> DispatchResult {
 		Self::transfer(
-			Preservation::Preserve,
 			&self.top_frame().account_id,
 			&T::AddressMapper::to_account_id(to),
 			value.try_into().map_err(|_| Error::<T>::BalanceConversionFailed)?,
@@ -1854,7 +1884,7 @@ mod tests {
 			set_balance(&ALICE, 100);
 			set_balance(&BOB, 0);
 
-			MockStack::transfer(Preservation::Preserve, &ALICE, &BOB, 55).unwrap();
+			MockStack::transfer(&ALICE, &BOB, 55).unwrap();
 
 			assert_eq!(get_balance(&ALICE), 45);
 			assert_eq!(get_balance(&BOB), 55);
@@ -1974,7 +2004,7 @@ mod tests {
 		ExtBuilder::default().build().execute_with(|| {
 			set_balance(&origin, 0);
 
-			let result = MockStack::transfer(Preservation::Preserve, &origin, &dest, 100);
+			let result = MockStack::transfer(&origin, &dest, 100);
 
 			assert_eq!(result, Err(Error::<Test>::TransferFailed.into()));
 			assert_eq!(get_balance(&origin), 0);
@@ -2848,15 +2878,35 @@ mod tests {
 	}
 
 	#[test]
-	fn recursive_call_during_constructor_fails() {
+	fn recursive_call_during_constructor_is_balance_transfer() {
 		let code = MockLoader::insert(Constructor, |ctx, _| {
 			let account_id = ctx.ext.account_id().clone();
 			let addr = <Test as Config>::AddressMapper::to_address(&account_id);
+			let balance = ctx.ext.balance();
 
-			assert_matches!(
-						   ctx.ext.call(Weight::zero(), U256::zero(), &addr, U256::zero(), vec![],
-			true, false), 				Err(ExecError{error, ..}) if error == <Error<Test>>::ContractNotFound.into()
-					   );
+			// Calling ourselves during the constructor will trigger a balance
+			// transfer since no contract exist yet.
+			assert_ok!(ctx.ext.call(
+				Weight::zero(),
+				U256::zero(),
+				&addr,
+				(balance - 1).into(),
+				vec![],
+				true,
+				false
+			));
+
+			// Should also work with call data set as it is ignored when no
+			// contract is deployed.
+			assert_ok!(ctx.ext.call(
+				Weight::zero(),
+				U256::zero(),
+				&addr,
+				1u32.into(),
+				vec![1, 2, 3, 4],
+				true,
+				false
+			));
 			exec_success()
 		});
 
@@ -2879,7 +2929,7 @@ mod tests {
 					executable,
 					&mut gas_meter,
 					&mut storage_meter,
-					min_balance,
+					10,
 					vec![],
 					Some(&[0; 32]),
 					None,
@@ -2888,6 +2938,51 @@ mod tests {
 			});
 	}
 
+	#[test]
+	fn cannot_send_more_balance_than_available_to_self() {
+		let code_hash = MockLoader::insert(Call, |ctx, _| {
+			let account_id = ctx.ext.account_id().clone();
+			let addr = <Test as Config>::AddressMapper::to_address(&account_id);
+			let balance = ctx.ext.balance();
+
+			assert_err!(
+				ctx.ext.call(
+					Weight::zero(),
+					U256::zero(),
+					&addr,
+					(balance + 1).into(),
+					vec![],
+					true,
+					false
+				),
+				<Error<Test>>::TransferFailed
+			);
+			exec_success()
+		});
+
+		ExtBuilder::default()
+			.with_code_hashes(MockLoader::code_hashes())
+			.build()
+			.execute_with(|| {
+				let min_balance = <Test as Config>::Currency::minimum_balance();
+				let mut gas_meter = GasMeter::<Test>::new(GAS_LIMIT);
+				set_balance(&ALICE, min_balance * 10);
+				place_contract(&BOB, code_hash);
+				let origin = Origin::from_account_id(ALICE);
+				let mut storage_meter = storage::meter::Meter::new(&origin, 0, 0).unwrap();
+				MockStack::run_call(
+					origin,
+					BOB_ADDR,
+					&mut gas_meter,
+					&mut storage_meter,
+					0,
+					vec![],
+					None,
+				)
+				.unwrap();
+			});
+	}
+
 	#[test]
 	fn printing_works() {
 		let code_hash = MockLoader::insert(Call, |ctx, _| {
diff --git a/substrate/frame/revive/src/primitives.rs b/substrate/frame/revive/src/primitives.rs
index 1b48527d23d7f..67bc144c3dd23 100644
--- a/substrate/frame/revive/src/primitives.rs
+++ b/substrate/frame/revive/src/primitives.rs
@@ -106,7 +106,7 @@ pub enum ContractAccessError {
 }
 
 /// Output of a contract call or instantiation which ran to completion.
-#[derive(Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug, TypeInfo)]
+#[derive(Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug, TypeInfo, Default)]
 pub struct ExecReturnValue {
 	/// Flags passed along by `seal_return`. Empty when `seal_return` was never called.
 	pub flags: ReturnFlags,
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index 73914c9aae073..19d6eabd577bd 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -50,7 +50,6 @@ use codec::{Decode, Encode};
 use frame_support::{
 	assert_err, assert_err_ignore_postinfo, assert_err_with_weight, assert_noop, assert_ok,
 	derive_impl,
-	dispatch::{DispatchErrorWithPostInfo, PostDispatchInfo},
 	pallet_prelude::EnsureOrigin,
 	parameter_types,
 	storage::child,
@@ -159,6 +158,12 @@ pub mod test_utils {
 		// Assert that contract code is stored, and get its size.
 		PristineCode::<Test>::try_get(&code_hash).unwrap().len()
 	}
+	pub fn u256_bytes(u: u64) -> [u8; 32] {
+		let mut buffer = [0u8; 32];
+		let bytes = u.to_le_bytes();
+		buffer[..8].copy_from_slice(&bytes);
+		buffer
+	}
 }
 
 mod builder {
@@ -589,25 +594,15 @@ mod run_tests {
 	use pretty_assertions::{assert_eq, assert_ne};
 	use sp_core::U256;
 
-	// Perform a call to a plain account.
-	// The actual transfer fails because we can only call contracts.
-	// Then we check that at least the base costs where charged (no runtime gas costs.)
 	#[test]
-	fn calling_plain_account_fails() {
+	fn calling_plain_account_is_balance_transfer() {
 		ExtBuilder::default().build().execute_with(|| {
 			let _ = <Test as Config>::Currency::set_balance(&ALICE, 100_000_000);
-			let base_cost = <<Test as Config>::WeightInfo as WeightInfo>::call();
-
-			assert_eq!(
-				builder::call(BOB_ADDR).build(),
-				Err(DispatchErrorWithPostInfo {
-					error: Error::<Test>::ContractNotFound.into(),
-					post_info: PostDispatchInfo {
-						actual_weight: Some(base_cost),
-						pays_fee: Default::default(),
-					},
-				})
-			);
+			assert!(!<ContractInfoOf<Test>>::contains_key(BOB_ADDR));
+			assert_eq!(test_utils::get_balance(&BOB_CONTRACT_ID), 0);
+			let result = builder::bare_call(BOB_ADDR).value(42).build_and_unwrap_result();
+			assert_eq!(test_utils::get_balance(&BOB_CONTRACT_ID), 42);
+			assert_eq!(result, Default::default());
 		});
 	}
 
@@ -1472,6 +1467,8 @@ mod run_tests {
 
 	#[test]
 	fn call_return_code() {
+		use test_utils::u256_bytes;
+
 		let (caller_code, _caller_hash) = compile_module("call_return_code").unwrap();
 		let (callee_code, _callee_hash) = compile_module("ok_trap_revert").unwrap();
 		ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
@@ -1481,28 +1478,60 @@ mod run_tests {
 
 			let bob = builder::bare_instantiate(Code::Upload(caller_code))
 				.value(min_balance * 100)
-				.data(vec![0])
 				.build_and_unwrap_contract();
-			<Test as Config>::Currency::set_balance(&bob.account_id, min_balance);
 
 			// Contract calls into Django which is no valid contract
+			// This will be a balance transfer into a new account
+			// with more than the contract has which will make the transfer fail
+			let result = builder::bare_call(bob.addr)
+				.data(
+					AsRef::<[u8]>::as_ref(&DJANGO_ADDR)
+						.iter()
+						.chain(&u256_bytes(min_balance * 200))
+						.cloned()
+						.collect(),
+				)
+				.build_and_unwrap_result();
+			assert_return_code!(result, RuntimeReturnCode::TransferFailed);
+
+			// Sending less than the minimum balance will also make the transfer fail
 			let result = builder::bare_call(bob.addr)
-				.data(AsRef::<[u8]>::as_ref(&DJANGO).to_vec())
+				.data(
+					AsRef::<[u8]>::as_ref(&DJANGO_ADDR)
+						.iter()
+						.chain(&u256_bytes(42))
+						.cloned()
+						.collect(),
+				)
 				.build_and_unwrap_result();
-			assert_return_code!(result, RuntimeReturnCode::NotCallable);
+			assert_return_code!(result, RuntimeReturnCode::TransferFailed);
+
+			// Sending at least the minimum balance should result in success but
+			// no code called.
+			assert_eq!(test_utils::get_balance(&ETH_DJANGO), 0);
+			let result = builder::bare_call(bob.addr)
+				.data(
+					AsRef::<[u8]>::as_ref(&DJANGO_ADDR)
+						.iter()
+						.chain(&u256_bytes(55))
+						.cloned()
+						.collect(),
+				)
+				.build_and_unwrap_result();
+			assert_return_code!(result, RuntimeReturnCode::Success);
+			assert_eq!(test_utils::get_balance(&ETH_DJANGO), 55);
 
 			let django = builder::bare_instantiate(Code::Upload(callee_code))
 				.origin(RuntimeOrigin::signed(CHARLIE))
 				.value(min_balance * 100)
-				.data(vec![0])
 				.build_and_unwrap_contract();
-			<Test as Config>::Currency::set_balance(&django.account_id, min_balance);
 
-			// Contract has only the minimal balance so any transfer will fail.
+			// Sending more than the contract has will make the transfer fail.
 			let result = builder::bare_call(bob.addr)
 				.data(
 					AsRef::<[u8]>::as_ref(&django.addr)
 						.iter()
+						.chain(&u256_bytes(min_balance * 300))
 						.chain(&0u32.to_le_bytes())
 						.cloned()
 						.collect(),
@@ -1516,6 +1545,7 @@ mod run_tests {
 				.data(
 					AsRef::<[u8]>::as_ref(&django.addr)
 						.iter()
+						.chain(&u256_bytes(5))
 						.chain(&1u32.to_le_bytes())
 						.cloned()
 						.collect(),
@@ -1528,6 +1558,7 @@ mod run_tests {
 				.data(
 					AsRef::<[u8]>::as_ref(&django.addr)
 						.iter()
+						.chain(&u256_bytes(5))
 						.chain(&2u32.to_le_bytes())
 						.cloned()
 						.collect(),
diff --git a/substrate/frame/revive/src/wasm/runtime.rs b/substrate/frame/revive/src/wasm/runtime.rs
index 528b0ababfa01..d9257d38b66ea 100644
--- a/substrate/frame/revive/src/wasm/runtime.rs
+++ b/substrate/frame/revive/src/wasm/runtime.rs
@@ -581,8 +581,7 @@ impl<'a, E: Ext, M: PolkaVmInstance<E::T>> Runtime<'a, E, M> {
 							None => Some(Err(Error::<E::T>::InvalidCallFlags.into())),
 							Some(flags) => Some(Ok(ExecReturnValue { flags, data })),
 						},
-					Err(TrapReason::Termination) =>
-						Some(Ok(ExecReturnValue { flags: ReturnFlags::empty(), data: Vec::new() })),
+					Err(TrapReason::Termination) => Some(Ok(Default::default())),
 					Err(TrapReason::SupervisorError(error)) => Some(Err(error.into())),
 				}
 			},
diff --git a/substrate/frame/revive/uapi/src/flags.rs b/substrate/frame/revive/uapi/src/flags.rs
index 17b91ce2b3be8..763a89d6c0304 100644
--- a/substrate/frame/revive/uapi/src/flags.rs
+++ b/substrate/frame/revive/uapi/src/flags.rs
@@ -20,6 +20,7 @@ use bitflags::bitflags;
 bitflags! {
 	/// Flags used by a contract to customize exit behaviour.
 	#[cfg_attr(feature = "scale", derive(codec::Encode, codec::Decode, scale_info::TypeInfo))]
+	#[derive(Default)]
 	pub struct ReturnFlags: u32 {
 		/// If this bit is set all changes made by the contract execution are rolled back.
 		const REVERT = 0x0000_0001;

From 47cc5995cb93d79cb0f23df63b13b85e97327807 Mon Sep 17 00:00:00 2001
From: Maksym H <1177472+mordamax@users.noreply.github.com>
Date: Wed, 11 Sep 2024 12:57:31 +0100
Subject: [PATCH 08/12] fix cmd detached commit (#5672)

return the repo/ref as .sha creates detached branch and doesn't let to
push back the changes
---
 .github/workflows/cmd.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cmd.yml b/.github/workflows/cmd.yml
index 645b5444aa0f0..5498beb50ccb1 100644
--- a/.github/workflows/cmd.yml
+++ b/.github/workflows/cmd.yml
@@ -146,8 +146,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Get command
         uses: actions-ecosystem/action-regex-match@v2
@@ -333,7 +331,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.sha }}
+          repository: ${{ needs.get-pr-branch.outputs.repo }}
+          ref: ${{ needs.get-pr-branch.outputs.pr-branch }}
 
       - name: Install dependencies for bench
         if: startsWith(steps.get-pr-comment.outputs.group2, 'bench')
@@ -360,10 +359,12 @@ jobs:
             git config --local user.email "action@github.com"
             git config --local user.name "GitHub Action"
 
-            git pull --rebase origin ${{ needs.get-pr-branch.outputs.pr-branch }}
             git add .
             git restore --staged Cargo.lock # ignore changes in Cargo.lock
             git commit -m "Update from ${{ github.actor }} running command '${{ steps.get-pr-comment.outputs.group2 }}'" || true
+            
+            git pull --rebase origin ${{ needs.get-pr-branch.outputs.pr-branch }}
+            
             git push origin ${{ needs.get-pr-branch.outputs.pr-branch }}
           else
             echo "Nothing to commit";

From 7d30806f20944218d3fda130f0ad513cd2948fca Mon Sep 17 00:00:00 2001
From: PG Herveou <pgherveou@gmail.com>
Date: Wed, 11 Sep 2024 15:46:18 +0200
Subject: [PATCH 09/12] [pallet-contracts] Remove riscv support (#5665)

---
 Cargo.lock                                    |   2 -
 prdoc/pr_5665.prdoc                           |  17 +
 substrate/frame/contracts/fixtures/Cargo.toml |   4 -
 substrate/frame/contracts/fixtures/build.rs   |  64 +---
 .../fixtures/contracts/common/src/lib.rs      |   7 -
 substrate/frame/contracts/fixtures/src/lib.rs |   2 -
 substrate/frame/contracts/uapi/Cargo.toml     |   3 -
 substrate/frame/contracts/uapi/src/host.rs    |   5 +-
 .../frame/contracts/uapi/src/host/riscv32.rs  | 327 ------------------
 substrate/frame/contracts/uapi/src/lib.rs     |   4 +-
 10 files changed, 21 insertions(+), 414 deletions(-)
 create mode 100644 prdoc/pr_5665.prdoc
 delete mode 100644 substrate/frame/contracts/uapi/src/host/riscv32.rs

diff --git a/Cargo.lock b/Cargo.lock
index 8abecaf5e9ba8..35dc619281789 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10363,7 +10363,6 @@ dependencies = [
  "anyhow",
  "frame-system",
  "parity-wasm",
- "polkavm-linker 0.9.2",
  "sp-runtime",
  "tempfile",
  "toml 0.8.12",
@@ -10423,7 +10422,6 @@ dependencies = [
  "bitflags 1.3.2",
  "parity-scale-codec",
  "paste",
- "polkavm-derive 0.9.1",
  "scale-info",
 ]
 
diff --git a/prdoc/pr_5665.prdoc b/prdoc/pr_5665.prdoc
new file mode 100644
index 0000000000000..2b2f0547dc013
--- /dev/null
+++ b/prdoc/pr_5665.prdoc
@@ -0,0 +1,17 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: "[pallet-contracts] remove riscv support"
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      RISC-V support is now being built inside the new fork pallet-revive
+
+crates:
+  - name: pallet-contracts
+    bump: patch
+  - name: pallet-contracts-fixtures
+    bump: patch
+  - name: pallet-contracts-uapi
+    bump: patch
diff --git a/substrate/frame/contracts/fixtures/Cargo.toml b/substrate/frame/contracts/fixtures/Cargo.toml
index 6cb6447d8fd7e..4c01c1f061b7a 100644
--- a/substrate/frame/contracts/fixtures/Cargo.toml
+++ b/substrate/frame/contracts/fixtures/Cargo.toml
@@ -20,8 +20,4 @@ parity-wasm = { workspace = true }
 tempfile = { workspace = true }
 toml = { workspace = true }
 twox-hash = { workspace = true, default-features = true }
-polkavm-linker = { workspace = true, optional = true }
 anyhow = { workspace = true, default-features = true }
-
-[features]
-riscv = ["polkavm-linker"]
diff --git a/substrate/frame/contracts/fixtures/build.rs b/substrate/frame/contracts/fixtures/build.rs
index baaeaf0342032..7af733c536d08 100644
--- a/substrate/frame/contracts/fixtures/build.rs
+++ b/substrate/frame/contracts/fixtures/build.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Compile contracts to wasm and RISC-V binaries.
+//! Compile contracts to wasm.
 use anyhow::{bail, Context, Result};
 use parity_wasm::elements::{deserialize_file, serialize_to_file, Internal};
 use std::{
@@ -89,12 +89,6 @@ impl Entry {
 	fn out_wasm_filename(&self) -> String {
 		format!("{}.wasm", self.name())
 	}
-
-	/// Return the name of the RISC-V polkavm file.
-	#[cfg(feature = "riscv")]
-	fn out_riscv_filename(&self) -> String {
-		format!("{}.polkavm", self.name())
-	}
 }
 
 /// Collect all contract entries from the given source directory.
@@ -236,53 +230,6 @@ fn post_process_wasm(input_path: &Path, output_path: &Path) -> Result<()> {
 	serialize_to_file(output_path, module).map_err(Into::into)
 }
 
-/// Build contracts for RISC-V.
-#[cfg(feature = "riscv")]
-fn invoke_riscv_build(current_dir: &Path) -> Result<()> {
-	let encoded_rustflags = [
-		"-Crelocation-model=pie",
-		"-Clink-arg=--emit-relocs",
-		"-Clink-arg=--export-dynamic-symbol=__polkavm_symbol_export_hack__*",
-	]
-	.join("\x1f");
-
-	let build_res = Command::new(env::var("CARGO")?)
-		.current_dir(current_dir)
-		.env_clear()
-		.env("PATH", env::var("PATH").unwrap_or_default())
-		.env("CARGO_ENCODED_RUSTFLAGS", encoded_rustflags)
-		.env("RUSTUP_TOOLCHAIN", "rve-nightly")
-		.env("RUSTUP_HOME", env::var("RUSTUP_HOME").unwrap_or_default())
-		.args(["build", "--release", "--target=riscv32ema-unknown-none-elf"])
-		.output()
-		.expect("failed to execute process");
-
-	if build_res.status.success() {
-		return Ok(())
-	}
-
-	let stderr = String::from_utf8_lossy(&build_res.stderr);
-
-	if stderr.contains("'rve-nightly' is not installed") {
-		eprintln!("RISC-V toolchain is not installed.\nDownload and install toolchain from https://github.com/paritytech/rustc-rv32e-toolchain.");
-		eprintln!("{}", stderr);
-	} else {
-		eprintln!("{}", stderr);
-	}
-
-	bail!("Failed to build contracts");
-}
-/// Post-process the compiled wasm contracts.
-#[cfg(feature = "riscv")]
-fn post_process_riscv(input_path: &Path, output_path: &Path) -> Result<()> {
-	let mut config = polkavm_linker::Config::default();
-	config.set_strip(true);
-	let orig = fs::read(input_path).with_context(|| format!("Failed to read {:?}", input_path))?;
-	let linked = polkavm_linker::program_from_elf(config, orig.as_ref())
-		.map_err(|err| anyhow::format_err!("Failed to link polkavm program: {}", err))?;
-	fs::write(output_path, linked.as_bytes()).map_err(Into::into)
-}
-
 /// Write the compiled contracts to the given output directory.
 fn write_output(build_dir: &Path, out_dir: &Path, entries: Vec<Entry>) -> Result<()> {
 	for entry in entries {
@@ -292,12 +239,6 @@ fn write_output(build_dir: &Path, out_dir: &Path, entries: Vec<Entry>) -> Result
 			&out_dir.join(&wasm_output),
 		)?;
 
-		#[cfg(feature = "riscv")]
-		post_process_riscv(
-			&build_dir.join("target/riscv32ema-unknown-none-elf/release").join(entry.name()),
-			&out_dir.join(entry.out_riscv_filename()),
-		)?;
-
 		entry.update_cache(out_dir)?;
 	}
 
@@ -347,9 +288,6 @@ fn main() -> Result<()> {
 
 	invoke_wasm_build(tmp_dir_path)?;
 
-	#[cfg(feature = "riscv")]
-	invoke_riscv_build(tmp_dir_path)?;
-
 	write_output(tmp_dir_path, &out_dir, entries)?;
 	Ok(())
 }
diff --git a/substrate/frame/contracts/fixtures/contracts/common/src/lib.rs b/substrate/frame/contracts/fixtures/contracts/common/src/lib.rs
index 80e1f543a7b53..504fa7f9e81df 100644
--- a/substrate/frame/contracts/fixtures/contracts/common/src/lib.rs
+++ b/substrate/frame/contracts/fixtures/contracts/common/src/lib.rs
@@ -22,13 +22,6 @@ pub use uapi::{HostFn, HostFnImpl as api};
 fn panic(_info: &core::panic::PanicInfo) -> ! {
 	#[cfg(target_arch = "wasm32")]
 	core::arch::wasm32::unreachable();
-
-	#[cfg(target_arch = "riscv32")]
-	// Safety: The unimp instruction is guaranteed to trap
-	unsafe {
-		core::arch::asm!("unimp");
-		core::hint::unreachable_unchecked();
-	}
 }
 
 /// Utility macro to read input passed to a contract.
diff --git a/substrate/frame/contracts/fixtures/src/lib.rs b/substrate/frame/contracts/fixtures/src/lib.rs
index 56a8e2321c5c3..f9272a32ad613 100644
--- a/substrate/frame/contracts/fixtures/src/lib.rs
+++ b/substrate/frame/contracts/fixtures/src/lib.rs
@@ -39,7 +39,5 @@ mod test {
 	fn out_dir_should_have_compiled_mocks() {
 		let out_dir: std::path::PathBuf = env!("OUT_DIR").into();
 		assert!(out_dir.join("dummy.wasm").exists());
-		#[cfg(feature = "riscv")]
-		assert!(out_dir.join("dummy.polkavm").exists());
 	}
 }
diff --git a/substrate/frame/contracts/uapi/Cargo.toml b/substrate/frame/contracts/uapi/Cargo.toml
index ccd86ba7890cb..09c70c2878996 100644
--- a/substrate/frame/contracts/uapi/Cargo.toml
+++ b/substrate/frame/contracts/uapi/Cargo.toml
@@ -20,9 +20,6 @@ codec = { features = [
 	"max-encoded-len",
 ], optional = true, workspace = true }
 
-[target.'cfg(target_arch = "riscv32")'.dependencies]
-polkavm-derive = { workspace = true }
-
 [package.metadata.docs.rs]
 default-target = ["wasm32-unknown-unknown"]
 
diff --git a/substrate/frame/contracts/uapi/src/host.rs b/substrate/frame/contracts/uapi/src/host.rs
index 51f0cd7eb2dc0..52c9ea387e1c2 100644
--- a/substrate/frame/contracts/uapi/src/host.rs
+++ b/substrate/frame/contracts/uapi/src/host.rs
@@ -17,9 +17,6 @@ use paste::paste;
 #[cfg(target_arch = "wasm32")]
 mod wasm32;
 
-#[cfg(target_arch = "riscv32")]
-mod riscv32;
-
 macro_rules! hash_fn {
 	( $name:ident, $bytes:literal ) => {
 		paste! {
@@ -66,7 +63,7 @@ fn ptr_or_sentinel(data: &Option<&[u8]>) -> *const u8 {
 /// Implements [`HostFn`] for each supported target architecture.
 pub enum HostFnImpl {}
 
-/// Defines all the host apis implemented by both wasm and RISC-V vms.
+/// Defines all the host apis implemented by the wasm vm.
 pub trait HostFn: private::Sealed {
 	/// Returns the number of times specified contract exists on the call stack. Delegated calls are
 	/// not counted as separate calls.
diff --git a/substrate/frame/contracts/uapi/src/host/riscv32.rs b/substrate/frame/contracts/uapi/src/host/riscv32.rs
deleted file mode 100644
index 3555202332121..0000000000000
--- a/substrate/frame/contracts/uapi/src/host/riscv32.rs
+++ /dev/null
@@ -1,327 +0,0 @@
-#![allow(unused_variables, unused_mut)]
-// Copyright (C) Parity Technologies (UK) Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// TODO: bring up to date with wasm32.rs
-
-use super::{CallFlags, HostFn, HostFnImpl, Result};
-use crate::ReturnFlags;
-
-/// A macro to implement all Host functions with a signature of `fn(&mut &mut [u8])`.
-///
-/// Example:
-/// ```nocompile
-// impl_wrapper_for! {
-//     () => [gas_left],
-//     (v1) => [gas_left],
-// }
-// ```
-// 
-// Expands to:
-// ```nocompile
-// fn gas_left(output: &mut &mut [u8]) {
-//     unsafe { sys::gas_left(...); }
-// }
-// fn gas_left_v1(output: &mut &mut [u8]) {
-//     unsafe { sys::v1::gas_left(...); }
-// }
-// ```
-macro_rules! impl_wrapper_for {
-	(@impl_fn $( $mod:ident )::*, $suffix_sep: literal, $suffix:tt, $name:ident) => {
-		paste::paste! {
-			fn [<$name $suffix_sep $suffix>](output: &mut &mut [u8]) {
-				todo!()
-			}
-		}
-	};
-
-	() => {};
-
-	(($mod:ident) => [$( $name:ident),*], $($tail:tt)*) => {
-		$(impl_wrapper_for!(@impl_fn sys::$mod, "_", $mod, $name);)*
-		impl_wrapper_for!($($tail)*);
-	};
-
-	(() =>	[$( $name:ident),*], $($tail:tt)*) => {
-		$(impl_wrapper_for!(@impl_fn sys, "", "", $name);)*
-		impl_wrapper_for!($($tail)*);
-	};
-}
-
-/// A macro to implement all the hash functions Apis.
-macro_rules! impl_hash_fn {
-	( $name:ident, $bytes_result:literal ) => {
-		paste::item! {
-			fn [<hash_ $name>](input: &[u8], output: &mut [u8; $bytes_result]) {
-				todo!()
-			}
-		}
-	};
-}
-
-/// A macro to implement the get_storage functions.
-macro_rules! impl_get_storage {
-	($fn_name:ident, $sys_get_storage:path) => {
-		fn $fn_name(key: &[u8], output: &mut &mut [u8]) -> Result {
-			todo!()
-		}
-	};
-}
-
-impl HostFn for HostFnImpl {
-	fn instantiate_v1(
-		code_hash: &[u8],
-		gas: u64,
-		value: &[u8],
-		input: &[u8],
-		mut address: Option<&mut &mut [u8]>,
-		mut output: Option<&mut &mut [u8]>,
-		salt: &[u8],
-	) -> Result {
-		todo!()
-	}
-
-	fn instantiate_v2(
-		code_hash: &[u8],
-		ref_time_limit: u64,
-		proof_size_limit: u64,
-		deposit: Option<&[u8]>,
-		value: &[u8],
-		input: &[u8],
-		mut address: Option<&mut &mut [u8]>,
-		mut output: Option<&mut &mut [u8]>,
-		salt: &[u8],
-	) -> Result {
-		todo!()
-	}
-
-	fn call(
-		callee: &[u8],
-		gas: u64,
-		value: &[u8],
-		input_data: &[u8],
-		mut output: Option<&mut &mut [u8]>,
-	) -> Result {
-		todo!()
-	}
-
-	fn call_v1(
-		flags: CallFlags,
-		callee: &[u8],
-		gas: u64,
-		value: &[u8],
-		input_data: &[u8],
-		mut output: Option<&mut &mut [u8]>,
-	) -> Result {
-		todo!()
-	}
-
-	fn call_v2(
-		flags: CallFlags,
-		callee: &[u8],
-		ref_time_limit: u64,
-		proof_size_limit: u64,
-		deposit: Option<&[u8]>,
-		value: &[u8],
-		input_data: &[u8],
-		mut output: Option<&mut &mut [u8]>,
-	) -> Result {
-		todo!()
-	}
-
-	fn caller_is_root() -> u32 {
-		todo!()
-	}
-
-	fn delegate_call(
-		flags: CallFlags,
-		code_hash: &[u8],
-		input: &[u8],
-		mut output: Option<&mut &mut [u8]>,
-	) -> Result {
-		todo!()
-	}
-
-	fn transfer(account_id: &[u8], value: &[u8]) -> Result {
-		todo!()
-	}
-
-	fn deposit_event(topics: &[u8], data: &[u8]) {
-		todo!()
-	}
-
-	fn set_storage(key: &[u8], value: &[u8]) {
-		todo!()
-	}
-
-	fn set_storage_v1(key: &[u8], encoded_value: &[u8]) -> Option<u32> {
-		todo!()
-	}
-
-	fn set_storage_v2(key: &[u8], encoded_value: &[u8]) -> Option<u32> {
-		todo!()
-	}
-
-	fn set_transient_storage(key: &[u8], encoded_value: &[u8]) -> Option<u32> {
-		todo!()
-	}
-
-	fn clear_storage(key: &[u8]) {
-		todo!()
-	}
-
-	fn clear_storage_v1(key: &[u8]) -> Option<u32> {
-		todo!()
-	}
-
-	fn clear_transient_storage(key: &[u8]) -> Option<u32> {
-		todo!()
-	}
-
-	impl_get_storage!(get_storage, sys::get_storage);
-	impl_get_storage!(get_storage_v1, sys::v1::get_storage);
-
-	fn get_transient_storage(key: &[u8], output: &mut &mut [u8]) -> Result {
-		todo!()
-	}
-
-	fn take_storage(key: &[u8], output: &mut &mut [u8]) -> Result {
-		todo!()
-	}
-
-	fn take_transient_storage(key: &[u8], output: &mut &mut [u8]) -> Result {
-		todo!()
-	}
-
-	fn contains_storage(key: &[u8]) -> Option<u32> {
-		todo!()
-	}
-
-	fn contains_storage_v1(key: &[u8]) -> Option<u32> {
-		todo!()
-	}
-
-	fn contains_transient_storage(key: &[u8]) -> Option<u32> {
-		todo!()
-	}
-
-	fn terminate(beneficiary: &[u8]) -> ! {
-		todo!()
-	}
-
-	fn terminate_v1(beneficiary: &[u8]) -> ! {
-		todo!()
-	}
-
-	fn call_chain_extension(func_id: u32, input: &[u8], output: Option<&mut &mut [u8]>) -> u32 {
-		todo!()
-	}
-
-	fn input(output: &mut &mut [u8]) {
-		todo!()
-	}
-
-	fn return_value(flags: ReturnFlags, return_value: &[u8]) -> ! {
-		todo!()
-	}
-
-	fn call_runtime(call: &[u8]) -> Result {
-		todo!()
-	}
-
-	fn debug_message(str: &[u8]) -> Result {
-		todo!()
-	}
-
-	impl_wrapper_for! {
-		() => [caller, block_number, address, balance, gas_left, value_transferred, now, minimum_balance],
-		(v1) => [gas_left],
-	}
-
-	fn weight_to_fee(gas: u64, output: &mut &mut [u8]) {
-		todo!()
-	}
-
-	fn weight_to_fee_v1(ref_time_limit: u64, proof_size_limit: u64, output: &mut &mut [u8]) {
-		todo!()
-	}
-
-	impl_hash_fn!(sha2_256, 32);
-	impl_hash_fn!(keccak_256, 32);
-	impl_hash_fn!(blake2_256, 32);
-	impl_hash_fn!(blake2_128, 16);
-
-	fn ecdsa_recover(
-		signature: &[u8; 65],
-		message_hash: &[u8; 32],
-		output: &mut [u8; 33],
-	) -> Result {
-		todo!()
-	}
-
-	fn ecdsa_to_eth_address(pubkey: &[u8; 33], output: &mut [u8; 20]) -> Result {
-		todo!()
-	}
-
-	fn sr25519_verify(signature: &[u8; 64], message: &[u8], pub_key: &[u8; 32]) -> Result {
-		todo!()
-	}
-
-	fn is_contract(account_id: &[u8]) -> bool {
-		todo!()
-	}
-
-	fn caller_is_origin() -> bool {
-		todo!()
-	}
-
-	fn set_code_hash(code_hash: &[u8]) -> Result {
-		todo!()
-	}
-
-	fn code_hash(account_id: &[u8], output: &mut [u8]) -> Result {
-		todo!()
-	}
-
-	fn own_code_hash(output: &mut [u8]) {
-		todo!()
-	}
-
-	fn account_reentrance_count(account: &[u8]) -> u32 {
-		todo!()
-	}
-
-	fn lock_delegate_dependency(code_hash: &[u8]) {
-		todo!()
-	}
-
-	fn unlock_delegate_dependency(code_hash: &[u8]) {
-		todo!()
-	}
-
-	fn instantiation_nonce() -> u64 {
-		todo!()
-	}
-
-	fn reentrance_count() -> u32 {
-		todo!()
-	}
-
-	fn xcm_execute(msg: &[u8]) -> Result {
-		todo!()
-	}
-
-	fn xcm_send(dest: &[u8], msg: &[u8], output: &mut [u8; 32]) -> Result {
-		todo!()
-	}
-}
diff --git a/substrate/frame/contracts/uapi/src/lib.rs b/substrate/frame/contracts/uapi/src/lib.rs
index 83877c6efd408..7e30c811ee07c 100644
--- a/substrate/frame/contracts/uapi/src/lib.rs
+++ b/substrate/frame/contracts/uapi/src/lib.rs
@@ -21,10 +21,10 @@
 mod flags;
 pub use flags::*;
 
-#[cfg(any(target_arch = "wasm32", target_arch = "riscv32"))]
+#[cfg(target_arch = "wasm32")]
 mod host;
 
-#[cfg(any(target_arch = "wasm32", target_arch = "riscv32"))]
+#[cfg(target_arch = "wasm32")]
 pub use host::*;
 
 macro_rules! define_error_codes {

From 0f7acb52ada19ef934189a2ff02bdb5981634ead Mon Sep 17 00:00:00 2001
From: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Date: Wed, 11 Sep 2024 16:08:00 +0200
Subject: [PATCH 10/12] [CI] Fix parity-publish (#5670)

Install with `--locked` to try to fix the CI.

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
---
 .github/workflows/check-semver.yml         | 2 +-
 .github/workflows/publish-check-crates.yml | 2 +-
 .github/workflows/publish-claim-crates.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/check-semver.yml b/.github/workflows/check-semver.yml
index 2c06df5a50920..b5866e0ce4142 100644
--- a/.github/workflows/check-semver.yml
+++ b/.github/workflows/check-semver.yml
@@ -73,7 +73,7 @@ jobs:
 
       - name: install parity-publish
         # Set the target dir to cache the build.
-        run: CARGO_TARGET_DIR=./target/ cargo install parity-publish@0.8.0 -q
+        run: CARGO_TARGET_DIR=./target/ cargo install parity-publish@0.8.0 --locked -q
 
       - name: check semver
         run: |
diff --git a/.github/workflows/publish-check-crates.yml b/.github/workflows/publish-check-crates.yml
index cffa9a230c472..a5af041185728 100644
--- a/.github/workflows/publish-check-crates.yml
+++ b/.github/workflows/publish-check-crates.yml
@@ -24,7 +24,7 @@ jobs:
           cache-on-failure: true
 
       - name: install parity-publish
-        run: cargo install parity-publish@0.8.0
+        run: cargo install parity-publish@0.8.0 --locked -q
 
       - name: parity-publish check
         run: parity-publish --color always check --allow-unpublished
diff --git a/.github/workflows/publish-claim-crates.yml b/.github/workflows/publish-claim-crates.yml
index 77f04861bfff6..f9bc6ce4daeaa 100644
--- a/.github/workflows/publish-claim-crates.yml
+++ b/.github/workflows/publish-claim-crates.yml
@@ -18,7 +18,7 @@ jobs:
           cache-on-failure: true
 
       - name: install parity-publish
-        run: cargo install parity-publish@0.8.0
+        run: cargo install parity-publish@0.8.0 --locked -q
 
       - name: parity-publish claim
         env:

From 4e7c9e7fc3024d6cfd706bbfd14f3307985f3ae3 Mon Sep 17 00:00:00 2001
From: Niklas Adolfsson <niklasadolfsson1@gmail.com>
Date: Wed, 11 Sep 2024 18:35:21 +0200
Subject: [PATCH 11/12] rpc server: fix deny unsafe on RpcMethods::Auto (#5678)

Close #5677

I made a nit when I moved this code:
https://github.com/paritytech/polkadot-sdk/blob/v1.14.0-rc1/substrate/client/service/src/lib.rs#L379-#L385
in https://github.com/paritytech/polkadot-sdk/pull/4792

Thus:
 - (ip.is_loopback(), RpcMethods::Auto) -> allow unsafe
 - (!ip.is_loopback(), RpcMethods::Auto) -> deny unsafe

---------

Co-authored-by: ggwpez <ggwpez@users.noreply.github.com>
---
 prdoc/pr_5678.prdoc                       | 14 ++++++++++++++
 substrate/client/rpc-servers/src/utils.rs |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 prdoc/pr_5678.prdoc

diff --git a/prdoc/pr_5678.prdoc b/prdoc/pr_5678.prdoc
new file mode 100644
index 0000000000000..af1fac31c5609
--- /dev/null
+++ b/prdoc/pr_5678.prdoc
@@ -0,0 +1,14 @@
+title: 'rpc server: fix deny unsafe on RpcMethods::Auto'
+doc:
+- audience: Node User
+  description: |-
+    Close #5677
+
+    I made a nit when I moved this code: https://github.com/paritytech/polkadot-sdk/blob/v1.14.0-rc1/substrate/client/service/src/lib.rs#L379-#L385 in https://github.com/paritytech/polkadot-sdk/pull/4792
+
+    Thus:
+     - (ip.is_loopback(), RpcMethods::Auto) -> allow unsafe
+     - (!ip.is_loopback(), RpcMethods::Auto) -> deny unsafe
+crates:
+- name: sc-rpc-server
+  bump: patch
diff --git a/substrate/client/rpc-servers/src/utils.rs b/substrate/client/rpc-servers/src/utils.rs
index 5b4a4bf22b950..d9b2db7af1335 100644
--- a/substrate/client/rpc-servers/src/utils.rs
+++ b/substrate/client/rpc-servers/src/utils.rs
@@ -284,7 +284,7 @@ pub(crate) fn get_proxy_ip<B>(req: &http::Request<B>) -> Option<IpAddr> {
 /// Get the `deny_unsafe` setting based on the address and the RPC methods exposed by the interface.
 pub fn deny_unsafe(addr: &SocketAddr, methods: &RpcMethods) -> DenyUnsafe {
 	match (addr.ip().is_loopback(), methods) {
-		| (_, RpcMethods::Unsafe) | (false, RpcMethods::Auto) => DenyUnsafe::No,
+		(_, RpcMethods::Unsafe) | (true, RpcMethods::Auto) => DenyUnsafe::No,
 		_ => DenyUnsafe::Yes,
 	}
 }

From 8f6699beadc220503721db3e60d0cfaa21f81b64 Mon Sep 17 00:00:00 2001
From: Ankan <10196091+Ank4n@users.noreply.github.com>
Date: Wed, 11 Sep 2024 20:12:44 +0200
Subject: [PATCH 12/12] [Staking] Propagate actual system error while
 staking::bond (#5627)

Trivial and self explanatory changes.

Wrapping err such as these makes debugging harder as well as does not
really give any meaningful reason why this happened. The increment of
consumer can genuinely fail if there are no providers (account does not
exist) or it reaches max consumers. In both cases, its better to
propagate the actual System err.
---
 substrate/frame/staking/src/pallet/mod.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/substrate/frame/staking/src/pallet/mod.rs b/substrate/frame/staking/src/pallet/mod.rs
index 79f9d298ada78..8a4482f52ad5e 100644
--- a/substrate/frame/staking/src/pallet/mod.rs
+++ b/substrate/frame/staking/src/pallet/mod.rs
@@ -1027,7 +1027,8 @@ pub mod pallet {
 				return Err(Error::<T>::InsufficientBond.into())
 			}
 
-			frame_system::Pallet::<T>::inc_consumers(&stash).map_err(|_| Error::<T>::BadState)?;
+			// Would fail if account has no provider.
+			frame_system::Pallet::<T>::inc_consumers(&stash)?;
 
 			let stash_balance = T::Currency::free_balance(&stash);
 			let value = value.min(stash_balance);