[stable2603] Backport #10917

.github/zombienet-tests/zombienet_polkadot_tests.yml

@@ -252,3 +252,8 @@
   test-filter: "functional::shared_core_idle_parachain::shared_core_idle_parachain_test"
   runner-type: "default"
   use-zombienet-sdk: true
+
+- job-name: "zombienet-polkadot-collators-basic-reputation-persistence"
+  test-filter: "functional::collators_reputation_persistence"
+  runner-type: "default"
+  use-zombienet-sdk: true

cumulus/client/relay-chain-inprocess-interface/src/lib.rs

@@ -421,6 +421,7 @@ fn build_polkadot_full_node(
 		invulnerable_ah_collators: HashSet::new(),
 		collator_protocol_hold_off: None,
 		experimental_collator_protocol: false,
+		collator_reputation_persist_interval: None,
 	};
 
 	let (relay_chain_full_node, paranode_req_receiver) = match config.network.network_backend {

polkadot/cli/src/cli.rs

@@ -170,6 +170,13 @@ pub struct RunCmd {
 	/// Enable experimental collator protocol. TESTING ONLY! Don't use on production
 	#[arg(long, hide = true, default_value = "false")]
 	pub experimental_collator_protocol: bool,
+
+	/// Collator reputation persistence interval in seconds.
+	/// If not specified, defaults to 600 seconds (10 minutes).
+	/// This should be used only with experimental_collator_protocol
+	/// and only on validators.
+	#[arg(long, requires = "experimental_collator_protocol", requires = "validator")]
+	pub collator_reputation_persist_interval: Option<u64>,
 }
 
 #[allow(missing_docs)]

polkadot/cli/src/command.rs

@@ -294,6 +294,10 @@ where
 				invulnerable_ah_collators,
 				collator_protocol_hold_off,
 				experimental_collator_protocol,
+				collator_reputation_persist_interval: cli
+					.run
+					.collator_reputation_persist_interval
+					.map(std::time::Duration::from_secs),
 			},
 		)
 		.map(|full| full.task_manager)?;

polkadot/node/network/collator-protocol/Cargo.toml

@@ -23,17 +23,20 @@ sp-core = { workspace = true, default-features = true }
 sp-keystore = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 
+codec.workspace = true
 fatality = { workspace = true }
 polkadot-node-network-protocol = { workspace = true, default-features = true }
 polkadot-node-primitives = { workspace = true, default-features = true }
 polkadot-node-subsystem = { workspace = true, default-features = true }
 polkadot-node-subsystem-util = { workspace = true, default-features = true }
 polkadot-primitives = { workspace = true, default-features = true }
 thiserror = { workspace = true }
+tokio.workspace = true
 tokio-util = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }
+kvdb-memorydb = { workspace = true }
 rstest = { workspace = true }
 sc-network-types = { workspace = true, default-features = true }
 sp-tracing = { workspace = true }

polkadot/node/network/collator-protocol/src/lib.rs

@@ -23,6 +23,7 @@
 
 use std::{
 	collections::HashSet,
+	sync::Arc,
 	time::{Duration, Instant},
 };
 
@@ -31,16 +32,16 @@ use futures::{
 	FutureExt, TryFutureExt,
 };
 
-use polkadot_node_subsystem_util::reputation::ReputationAggregator;
+use polkadot_node_subsystem_util::{database::Database, reputation::ReputationAggregator};
 use sp_keystore::KeystorePtr;
 
 use polkadot_node_network_protocol::{
 	request_response::{v2 as protocol_v2, IncomingRequestReceiver},
 	PeerId, UnifiedReputationChange as Rep,
 };
-use polkadot_primitives::CollatorPair;
-
 use polkadot_node_subsystem::{errors::SubsystemError, overseer, DummySubsystem, SpawnedSubsystem};
+use polkadot_primitives::CollatorPair;
+pub use validator_side_experimental::ReputationConfig;
 
 mod collator_side;
 mod validator_side;
@@ -91,6 +92,10 @@ pub enum ProtocolSide {
 		keystore: KeystorePtr,
 		/// Prometheus metrics for validators.
 		metrics: validator_side_experimental::Metrics,
+		/// Database used for reputation house keeping.
+		db: Arc<dyn Database>,
+		/// Reputation configuration (column number).
+		reputation_config: validator_side_experimental::ReputationConfig,
 	},
 	/// Collators operate on a parachain.
 	Collator {
@@ -148,8 +153,8 @@ impl<Context> CollatorProtocolSubsystem {
 				.map_err(|e| SubsystemError::with_origin("collator-protocol", e))
 				.boxed()
 			},
-			ProtocolSide::ValidatorExperimental { keystore, metrics } => {
-				validator_side_experimental::run(ctx, keystore, metrics)
+			ProtocolSide::ValidatorExperimental { keystore, metrics, db, reputation_config } => {
+				validator_side_experimental::run(ctx, keystore, metrics, db, reputation_config)
 					.map_err(|e| SubsystemError::with_origin("collator-protocol", e))
 					.boxed()
 			},

polkadot/node/network/collator-protocol/src/validator_side_experimental/common.rs

@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
+use codec::{Decode, Encode};
 use polkadot_node_network_protocol::{
 	peer_set::CollationVersion,
 	request_response::{outgoing::RequestError, v2 as request_v2},
@@ -84,7 +85,7 @@ pub const MAX_FETCH_DELAY: Duration = Duration::from_millis(300);
 pub const MIN_FETCH_TIMER_DELAY: Duration = Duration::from_millis(150);
 
 /// Reputation score type.
-#[derive(PartialEq, Eq, PartialOrd, Ord, Debug, Clone, Copy, Default)]
+#[derive(PartialEq, Eq, PartialOrd, Ord, Debug, Clone, Copy, Default, Encode, Decode)]
 pub struct Score(u16);
 
 impl Score {

polkadot/node/network/collator-protocol/src/validator_side_experimental/error.rs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use crate::LOG_TARGET;
+use crate::{validator_side_experimental::peer_manager::PersistenceError, LOG_TARGET};
 use fatality::Nested;
 use polkadot_node_subsystem::{ChainApiError, SubsystemError};
 use polkadot_node_subsystem_util::{backing_implicit_view, runtime};
@@ -44,6 +44,12 @@ pub enum Error {
 	#[fatal]
 	#[error("Receiving message from overseer failed: {0}")]
 	SubsystemReceive(#[source] SubsystemError),
+	#[fatal]
+	#[error("Failed to initialize reputation database: {0}")]
+	ReputationDbInit(PersistenceError),
+	#[fatal]
+	#[error("Failed to spawn background task: {0}")]
+	SpawnTask(String),
 	#[error("Unable to retrieve block number for {0:?} from implicit view")]
 	BlockNumberNotFoundInImplicitView(Hash),
 	#[fatal(forward)]