Merge branch 'master' into polkadot-native-assets

.github/workflows/command-backport.yml

@@ -27,15 +27,24 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Generate token
+        id: generate_token
+        uses: tibdex/[email protected]
+        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}`);
+            }

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

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 => {},
 			}
 		}