add native stake to d-param

jankun4 · jankun4 · commit 775efeb5d64a · 2025-10-29T14:22:28.000+01:00
diff --git a/changelog.md b/changelog.md
@@ -6,6 +6,7 @@ This changelog is based on [Keep A Changelog](https://keepachangelog.com/en/1.1.
 
 ## Changed
 
+* DParam now uses new schema, which involves `native_take` validators count.
 * Updated polkadot-sdk dependency to polkadot-stable2509.
 Partner Chains Aura modification follows changes regarding checking inherents that are also present in the new polkadot-sdk release.
 Pallet Session new parameters should be: `type KeyDeposit = ();` and `type Currency = Balances;`.
diff --git a/demo/runtime/src/mock.rs b/demo/runtime/src/mock.rs
@@ -384,6 +384,7 @@ pub fn create_inherent_data_struct(
 			d_parameter: DParameter {
 				num_permissioned_candidates: 0,
 				num_registered_candidates: max(candidates.len() as u16, 1),
+				num_native_stake_candidates: 0,
 			},
 			permissioned_candidates: vec![],
 			registered_candidates: candidates,
diff --git a/toolkit/committee-selection/authority-selection-inherents/src/mock.rs b/toolkit/committee-selection/authority-selection-inherents/src/mock.rs
@@ -59,6 +59,7 @@ impl AuthoritySelectionDataSource for MockAuthoritySelectionDataSource {
 				d_parameter: DParameter {
 					num_permissioned_candidates: self.num_permissioned_candidates,
 					num_registered_candidates: 2,
+					num_native_stake_candidates: 0,
 				},
 				permissioned_candidates: candidates.clone(),
 			}),
diff --git a/toolkit/committee-selection/authority-selection-inherents/src/tests.rs b/toolkit/committee-selection/authority-selection-inherents/src/tests.rs
@@ -188,7 +188,11 @@ fn ariadne_all_permissioned_test() {
 	// Expected committee: [alice, bob]
 	let permissioned_validators = vec![ALICE, BOB];
 	let registered_validators = vec![CHARLIE, DAVE];
-	let d_parameter = DParameter { num_permissioned_candidates: 8, num_registered_candidates: 0 };
+	let d_parameter = DParameter {
+		num_permissioned_candidates: 8,
+		num_registered_candidates: 0,
+		num_native_stake_candidates: 0,
+	};
 	let authority_selection_inputs = create_authority_selection_inputs(
 		&permissioned_validators,
 		&registered_validators,
@@ -220,7 +224,11 @@ fn ariadne_only_permissioned_candidates_are_present_test() {
 	// D-param: (4, 4)
 	let permissioned_validators = vec![ALICE, BOB];
 	let registered_validators = vec![];
-	let d_parameter = DParameter { num_permissioned_candidates: 4, num_registered_candidates: 4 };
+	let d_parameter = DParameter {
+		num_permissioned_candidates: 4,
+		num_registered_candidates: 4,
+		num_native_stake_candidates: 0,
+	};
 	let authority_selection_inputs = create_authority_selection_inputs(
 		&permissioned_validators,
 		&registered_validators,
@@ -252,7 +260,11 @@ fn ariadne_3_to_2_test() {
 	// D-param: (3, 2)
 	let permissioned_validators = vec![ALICE, BOB, CHARLIE];
 	let registered_validators = vec![DAVE, EVE];
-	let d_parameter = DParameter { num_permissioned_candidates: 3, num_registered_candidates: 2 };
+	let d_parameter = DParameter {
+		num_permissioned_candidates: 3,
+		num_registered_candidates: 2,
+		num_native_stake_candidates: 0,
+	};
 	let authority_selection_inputs = create_authority_selection_inputs(
 		&permissioned_validators,
 		&registered_validators,
@@ -283,7 +295,11 @@ fn ariadne_3_to_2_with_more_available_candidates_test() {
 	// D-param: (3, 2)
 	let permissioned_validators = vec![ALICE, BOB, CHARLIE, DAVE, EVE];
 	let registered_validators = vec![FERDIE, GREG, HENRY, IDA];
-	let d_parameter = DParameter { num_permissioned_candidates: 3, num_registered_candidates: 2 };
+	let d_parameter = DParameter {
+		num_permissioned_candidates: 3,
+		num_registered_candidates: 2,
+		num_native_stake_candidates: 0,
+	};
 	let authority_selection_inputs = create_authority_selection_inputs(
 		&permissioned_validators,
 		&registered_validators,
@@ -321,7 +337,11 @@ fn ariadne_4_to_7_test() {
 	// D-param: (4, 7)
 	let permissioned_validators = vec![ALICE, BOB, CHARLIE, DAVE];
 	let registered_validators = vec![EVE, FERDIE, GREG, HENRY, IDA, JAMES, KIM];
-	let d_parameter = DParameter { num_permissioned_candidates: 4, num_registered_candidates: 7 };
+	let d_parameter = DParameter {
+		num_permissioned_candidates: 4,
+		num_registered_candidates: 7,
+		num_native_stake_candidates: 0,
+	};
 	let authority_selection_inputs = create_authority_selection_inputs(
 		&permissioned_validators,
 		&registered_validators,
@@ -352,7 +372,11 @@ fn ariadne_does_not_return_empty_committee() {
 	let authority_selection_inputs = create_authority_selection_inputs(
 		&[],
 		&[],
-		DParameter { num_permissioned_candidates: 1, num_registered_candidates: 1 },
+		DParameter {
+			num_permissioned_candidates: 1,
+			num_registered_candidates: 1,
+			num_native_stake_candidates: 0,
+		},
 	);
 	let calculated_committee = select_authorities::<AccountId, AccountKeys, MaxValidators>(
 		UtxoId::default(),
diff --git a/toolkit/committee-selection/query/src/commands.rs b/toolkit/committee-selection/query/src/commands.rs
@@ -87,8 +87,11 @@ mod tests {
 
 	#[tokio::test]
 	async fn ariadne_parameters_returns_correct_json_string() {
-		let d_parameter =
-			DParameter { num_permissioned_candidates: 1, num_registered_candidates: 2 };
+		let d_parameter = DParameter {
+			num_permissioned_candidates: 1,
+			num_registered_candidates: 2,
+			num_native_stake_candidates: 0,
+		};
 		let permissioned_candidates = vec![PermissionedCandidateData {
 			sidechain_public_key: SidechainPublicKey(
 				hex!("0389411795514af1627765eceffcbd002719f031604fadd7d188e2dc585b4e1afb").to_vec(),
@@ -130,6 +133,7 @@ mod tests {
 			serde_json::from_str::<Value>(&cmd_output).unwrap(),
 			serde_json::json!({
 				"dParameter": {
+					"numNativeStakeCandidates": 0,
 					"numPermissionedCandidates": 1,
 					"numRegisteredCandidates": 2
 				},
diff --git a/toolkit/committee-selection/query/src/tests/mod.rs b/toolkit/committee-selection/query/src/tests/mod.rs
@@ -351,6 +351,7 @@ mod get_registration_tests {
 			d_parameter: types::DParameter {
 				num_permissioned_candidates: 3,
 				num_registered_candidates: 2,
+				num_native_stake_candidates: 0,
 			},
 			permissioned_candidates: Some(
 				permissioned_candidates
diff --git a/toolkit/committee-selection/query/src/types/ariadne.rs b/toolkit/committee-selection/query/src/types/ariadne.rs
@@ -24,16 +24,19 @@ pub struct DParameter {
 	pub num_permissioned_candidates: u16,
 	/// The number of registered candidates
 	pub num_registered_candidates: u16,
+	/// The number of native stake validators
+	pub num_native_stake_candidates: u16,
 }
 
 impl From<sidechain_domain::DParameter> for DParameter {
 	fn from(
 		sidechain_domain::DParameter {
 			num_permissioned_candidates,
 			num_registered_candidates,
+			num_native_stake_candidates,
 		}: sidechain_domain::DParameter,
 	) -> Self {
-		Self { num_permissioned_candidates, num_registered_candidates }
+		Self { num_permissioned_candidates, num_registered_candidates, num_native_stake_candidates }
 	}
 }
 
diff --git a/toolkit/data-sources/db-sync/src/candidates/tests.rs b/toolkit/data-sources/db-sync/src/candidates/tests.rs
@@ -87,7 +87,7 @@ with_migration_versions! {
 			.unwrap();
 		assert_eq!(
 			result.d_parameter,
-			DParameter { num_permissioned_candidates: 1, num_registered_candidates: 3 }
+			DParameter { num_permissioned_candidates: 1, num_registered_candidates: 3, num_native_stake_candidates: 0 }
 		)
 	}
 
@@ -109,7 +109,7 @@ with_migration_versions! {
 		assert_eq!(result.permissioned_candidates, Some(latest_permissioned_candidates()));
 		assert_eq!(
 			result.d_parameter,
-			DParameter { num_permissioned_candidates: 1, num_registered_candidates: 3 }
+			DParameter { num_permissioned_candidates: 1, num_registered_candidates: 3, num_native_stake_candidates: 0 }
 		)
 	}
 
@@ -125,7 +125,7 @@ with_migration_versions! {
 			.unwrap();
 		assert_eq!(
 			result.d_parameter,
-			DParameter { num_permissioned_candidates: 1, num_registered_candidates: 2 }
+			DParameter { num_permissioned_candidates: 1, num_registered_candidates: 2, num_native_stake_candidates: 0 }
 		);
 		assert_eq!(result.permissioned_candidates, None)
 	}
@@ -236,7 +236,7 @@ mod candidate_caching {
 				.unwrap();
 			assert_eq!(
 				epoch_193_ariadne_parameters.d_parameter,
-				DParameter { num_permissioned_candidates: 1, num_registered_candidates: 3 }
+				DParameter { num_permissioned_candidates: 1, num_registered_candidates: 3, num_native_stake_candidates: 0 }
 			);
 			// Remove all registrations to prove that one request was cached and the other not
 			sqlx::raw_sql("DELETE FROM tx WHERE block_id >= 0")
diff --git a/toolkit/data-sources/mock/src/candidate.rs b/toolkit/data-sources/mock/src/candidate.rs
@@ -124,6 +124,7 @@ impl From<MockPermissionedCandidate> for PermissionedCandidateData {
 pub struct MockDParam {
 	permissioned: u16,
 	registered: u16,
+	native_stake: u16,
 }
 
 impl MockDParam {
@@ -133,8 +134,12 @@ impl MockDParam {
 }
 
 impl From<MockDParam> for DParameter {
-	fn from(MockDParam { permissioned, registered }: MockDParam) -> Self {
-		Self { num_permissioned_candidates: permissioned, num_registered_candidates: registered }
+	fn from(MockDParam { permissioned, registered, native_stake }: MockDParam) -> Self {
+		Self {
+			num_permissioned_candidates: permissioned,
+			num_registered_candidates: registered,
+			num_native_stake_candidates: native_stake,
+		}
 	}
 }
 
diff --git a/toolkit/partner-chains-cli/src/setup_main_chain_state/mod.rs b/toolkit/partner-chains-cli/src/setup_main_chain_state/mod.rs
@@ -96,6 +96,7 @@ impl<T: PartnerChainRuntime> CmdRun for SetupMainChainStateCmd<T> {
 			d_parameter.unwrap_or(DParameter {
 				num_permissioned_candidates: 0,
 				num_registered_candidates: 0,
+				num_native_stake_candidates: 0,
 			}),
 			chain_config.chain_parameters.genesis_utxo,
 		)?;
@@ -240,8 +241,11 @@ fn set_d_parameter_on_main_chain<C: IOContext>(
 			CARDANO_PAYMENT_SIGNING_KEY_FILE.prompt_with_default_from_file_and_save(context);
 		let payment_signing_key =
 			cardano_key::get_mc_payment_signing_key_from_file(&payment_signing_key_path, context)?;
-		let d_parameter =
-			sidechain_domain::DParameter { num_permissioned_candidates, num_registered_candidates };
+		let d_parameter = sidechain_domain::DParameter {
+			num_permissioned_candidates,
+			num_registered_candidates,
+			num_native_stake_candidates: 0,
+		};
 		let tokio_runtime = tokio::runtime::Runtime::new().map_err(|e| anyhow::anyhow!(e))?;
 		let result = tokio_runtime.block_on(offchain.upsert_d_param(
 			await_tx,
diff --git a/toolkit/partner-chains-cli/src/setup_main_chain_state/tests.rs b/toolkit/partner-chains-cli/src/setup_main_chain_state/tests.rs
@@ -253,7 +253,7 @@ fn upsert_permissioned_candidates_failed_io() -> MockIO {
 }
 
 fn new_d_parameter() -> DParameter {
-	DParameter::new(4, 7)
+	DParameter::new(4, 7, 0)
 }
 
 fn insert_d_parameter_io() -> MockIO {
@@ -473,7 +473,11 @@ fn mock_with_ariadne_parameters_found() -> OffchainMock {
 	OffchainMock::new()
 		.with_get_d_param(
 			genesis_utxo(),
-			Ok(Some(DParameter { num_permissioned_candidates: 6, num_registered_candidates: 4 })),
+			Ok(Some(DParameter {
+				num_permissioned_candidates: 6,
+				num_registered_candidates: 4,
+				num_native_stake_candidates: 0,
+			})),
 		)
 		.with_get_permissioned_candidates(
 			genesis_utxo(),
@@ -485,7 +489,11 @@ fn mock_with_ariadne_parameters_same_as_in_config_response() -> OffchainMock {
 	OffchainMock::new()
 		.with_get_d_param(
 			genesis_utxo(),
-			Ok(Some(DParameter { num_permissioned_candidates: 6, num_registered_candidates: 4 })),
+			Ok(Some(DParameter {
+				num_permissioned_candidates: 6,
+				num_registered_candidates: 4,
+				num_native_stake_candidates: 0,
+			})),
 		)
 		.with_get_permissioned_candidates(
 			genesis_utxo(),
diff --git a/toolkit/sidechain/domain/src/lib.rs b/toolkit/sidechain/domain/src/lib.rs
@@ -1166,7 +1166,7 @@ impl From<GrandpaPublicKey> for CandidateKey {
 	Hash,
 )]
 #[cfg_attr(feature = "serde", derive(Serialize))]
-/// Parameter controlling the number and proportion of registered and permissioned candidates
+/// Parameter controlling the number and proportion of registered, permissioned candidates and native stake validators
 /// selected into a Partner Chain committee, used by the Ariadne family of selection algorithms.
 ///
 /// The core idea behind the D-Param is to enable a Partner Chain to bootstrap its operation by
@@ -1178,12 +1178,18 @@ pub struct DParameter {
 	pub num_permissioned_candidates: u16,
 	/// Expected number of registered candidates selected for a committee
 	pub num_registered_candidates: u16,
+	/// Expected number of native stake validators selected for a committee
+	pub num_native_stake_candidates: u16,
 }
 
 impl DParameter {
 	/// Creates a new [DParameter] from member values
-	pub fn new(num_permissioned_candidates: u16, num_registered_candidates: u16) -> Self {
-		Self { num_permissioned_candidates, num_registered_candidates }
+	pub fn new(
+		num_permissioned_candidates: u16,
+		num_registered_candidates: u16,
+		num_native_stake_candidates: u16,
+	) -> Self {
+		Self { num_permissioned_candidates, num_registered_candidates, num_native_stake_candidates }
 	}
 }
 
diff --git a/toolkit/smart-contracts/commands/src/d_parameter.rs b/toolkit/smart-contracts/commands/src/d_parameter.rs
@@ -13,6 +13,9 @@ pub struct UpsertDParameterCmd {
 	#[arg(long)]
 	/// Number of registered candidates
 	registered_candidates_count: u16,
+	#[arg(long)]
+	/// Number of native stake validators
+	native_stake_validators_count: u16,
 	#[clap(flatten)]
 	/// Path to the payment key file
 	payment_key_file: PaymentFilePath,
@@ -28,6 +31,7 @@ impl UpsertDParameterCmd {
 		let d_param = DParameter {
 			num_permissioned_candidates: self.permissioned_candidates_count,
 			num_registered_candidates: self.registered_candidates_count,
+			num_native_stake_candidates: self.native_stake_validators_count,
 		};
 		let client = self.common_arguments.get_ogmios_client().await?;
 
diff --git a/toolkit/smart-contracts/offchain/src/d_param/tests.rs b/toolkit/smart-contracts/offchain/src/d_param/tests.rs
@@ -367,7 +367,11 @@ fn token_policy_id() -> [u8; 28] {
 }
 
 fn input_d_param() -> DParameter {
-	DParameter { num_registered_candidates: 30, num_permissioned_candidates: 40 }
+	DParameter {
+		num_registered_candidates: 30,
+		num_permissioned_candidates: 40,
+		num_native_stake_candidates: 0,
+	}
 }
 
 fn expected_plutus_data() -> PlutusData {
diff --git a/toolkit/smart-contracts/offchain/tests/integration_tests.rs b/toolkit/smart-contracts/offchain/tests/integration_tests.rs
@@ -137,21 +137,25 @@ async fn upsert_d_param() {
 	let client = initialize(&container).await;
 	let genesis_utxo = run_init_governance(&client).await;
 	assert!(
-		run_upsert_d_param(genesis_utxo, 0, 1, &governance_authority_payment_key(), &client)
+		run_upsert_d_param(genesis_utxo, 0, 1, 2, &governance_authority_payment_key(), &client)
 			.await
 			.is_some()
 	);
 	assert!(
-		run_upsert_d_param(genesis_utxo, 0, 1, &governance_authority_payment_key(), &client)
+		run_upsert_d_param(genesis_utxo, 0, 1, 2, &governance_authority_payment_key(), &client)
 			.await
 			.is_none()
 	);
 	assert_eq!(
 		d_param::get_d_param(genesis_utxo, &client).await.unwrap().unwrap(),
-		DParameter { num_registered_candidates: 1, num_permissioned_candidates: 0 }
+		DParameter {
+			num_registered_candidates: 1,
+			num_permissioned_candidates: 0,
+			num_native_stake_candidates: 2,
+		}
 	);
 	assert!(
-		run_upsert_d_param(genesis_utxo, 1, 1, &governance_authority_payment_key(), &client)
+		run_upsert_d_param(genesis_utxo, 1, 1, 1, &governance_authority_payment_key(), &client)
 			.await
 			.is_some()
 	)
@@ -429,7 +433,7 @@ async fn governance_action_can_be_initiated_by_non_governance() {
 	let container = image.start().await.unwrap();
 	let client = initialize(&container).await;
 	let genesis_utxo = run_init_governance(&client).await;
-	let tx_to_sign = run_upsert_d_param(genesis_utxo, 1, 1, &eve_payment_key(), &client)
+	let tx_to_sign = run_upsert_d_param(genesis_utxo, 1, 1, 0, &eve_payment_key(), &client)
 		.await
 		.unwrap();
 	run_assemble_and_sign(tx_to_sign, &[GOVERNANCE_AUTHORITY_KEY], &client).await;
@@ -593,12 +597,17 @@ async fn run_upsert_d_param<
 	genesis_utxo: UtxoId,
 	num_permissioned_candidates: u16,
 	num_registered_candidates: u16,
+	num_native_stake_candidates: u16,
 	pkey: &CardanoPaymentSigningKey,
 	client: &T,
 ) -> Option<MultiSigSmartContractResult> {
 	let result = d_param::upsert_d_param(
 		genesis_utxo,
-		&DParameter { num_permissioned_candidates, num_registered_candidates },
+		&DParameter {
+			num_permissioned_candidates,
+			num_registered_candidates,
+			num_native_stake_candidates,
+		},
 		pkey,
 		client,
 		&FixedDelayRetries::new(Duration::from_millis(500), 100),
diff --git a/toolkit/smart-contracts/plutus-data/src/d_param.rs b/toolkit/smart-contracts/plutus-data/src/d_param.rs

Original file line number	Diff line number	Diff line change
`@@ -24,16 +24,19 @@ pub struct DParameter {`
`24`	`24`	`pub num_permissioned_candidates: u16,`
`25`	`25`	`/// The number of registered candidates`
`26`	`26`	`pub num_registered_candidates: u16,`
	`27`	`+ /// The number of native stake validators`
	`28`	`+ pub num_native_stake_candidates: u16,`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`impl From<sidechain_domain::DParameter> for DParameter {`
`30`	`32`	`fn from(`
`31`	`33`	`sidechain_domain::DParameter {`
`32`	`34`	`num_permissioned_candidates,`
`33`	`35`	`num_registered_candidates,`
	`36`	`+ num_native_stake_candidates,`
`34`	`37`	`}: sidechain_domain::DParameter,`
`35`	`38`	`) -> Self {`
`36`		`- Self { num_permissioned_candidates, num_registered_candidates }`
	`39`	`+ Self { num_permissioned_candidates, num_registered_candidates, num_native_stake_candidates }`
`37`	`40`	`}`
`38`	`41`	`}`
`39`	`42`
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@ impl From<MockPermissionedCandidate> for PermissionedCandidateData {`
`124`	`124`	`pub struct MockDParam {`
`125`	`125`	`permissioned: u16,`
`126`	`126`	`registered: u16,`
	`127`	`+ native_stake: u16,`
`127`	`128`	`}`
`128`	`129`
`129`	`130`	`impl MockDParam {`
`@@ -133,8 +134,12 @@ impl MockDParam {`
`133`	`134`	`}`
`134`	`135`
`135`	`136`	`impl From<MockDParam> for DParameter {`
`136`		`- fn from(MockDParam { permissioned, registered }: MockDParam) -> Self {`
`137`		`- Self { num_permissioned_candidates: permissioned, num_registered_candidates: registered }`
	`137`	`+ fn from(MockDParam { permissioned, registered, native_stake }: MockDParam) -> Self {`
	`138`	`+ Self {`
	`139`	`+ num_permissioned_candidates: permissioned,`
	`140`	`+ num_registered_candidates: registered,`
	`141`	`+ num_native_stake_candidates: native_stake,`
	`142`	`+ }`
`138`	`143`	`}`
`139`	`144`	`}`
`140`	`145`