Skip to content

fix up session keys for 2507 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
acatangiu merged 2 commits into from
Aug 14, 2025
Merged

fix up session keys for 2507 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a84714
fix up session keys
kianenigma Aug 14, 2025
cca66b0
fmtc
kianenigma Aug 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 43 additions & 12 deletions relay/kusama/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,11 @@ impl_opaque_keys! {
}
}

parameter_types! {
// all keys are 32 bytes, except beefy being 33
pub KeyDeposit: Balance = deposit(1, 5 * 32 + 33);
}

impl pallet_session::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type ValidatorId = AccountId;
Expand All @@ -510,7 +515,7 @@ impl pallet_session::Config for Runtime {
type WeightInfo = weights::pallet_session::WeightInfo<Runtime>;
type DisablingStrategy = pallet_session::disabling::UpToLimitWithReEnablingDisablingStrategy;
type Currency = Balances;
type KeyDeposit = ();
type KeyDeposit = KeyDeposit;
}

impl pallet_session::historical::Config for Runtime {
Expand Down Expand Up @@ -3146,21 +3151,15 @@ mod remote_tests {
use super::*;
use frame_try_runtime::{runtime_decl_for_try_runtime::TryRuntime, UpgradeCheckSelect};
use remote_externalities::{
Builder, Mode, OfflineConfig, OnlineConfig, SnapshotConfig, Transport,
Builder, Mode, OfflineConfig, OnlineConfig, RemoteExternalities, SnapshotConfig, Transport,
};
use std::env::var;

#[tokio::test]
async fn run_migrations() {
if var("RUN_MIGRATION_TESTS").is_err() {
return;
}

sp_tracing::try_init_simple();
async fn remote_ext_test_setup() -> RemoteExternalities<Block> {
let transport: Transport =
var("WS").unwrap_or("wss://kusama-rpc.polkadot.io:443".to_string()).into();
var("WS").unwrap_or("wss://kusama-rpc.dwellir.com".to_string()).into();
let maybe_state_snapshot: Option<SnapshotConfig> = var("SNAP").map(|s| s.into()).ok();
let mut ext = Builder::<Block>::default()
Builder::<Block>::default()
.mode(if let Some(state_snapshot) = maybe_state_snapshot {
Mode::OfflineOrElseOnline(
OfflineConfig { state_snapshot: state_snapshot.clone() },
Expand All @@ -3175,7 +3174,39 @@ mod remote_tests {
})
.build()
.await
.unwrap();
.unwrap()
}

#[tokio::test]
#[ignore = "this test is meant to be executed manually"]
async fn validators_who_cannot_afford_session_key_deposit() {
use frame_support::traits::fungible::InspectHold;
sp_tracing::try_init_simple();
let mut ext = remote_ext_test_setup().await;
ext.execute_with(|| {
let amount = <Runtime as pallet_session::Config>::KeyDeposit::get();
let reason = pallet_session::HoldReason::Keys;
let cannot_pay = pallet_staking::Validators::<Runtime>::iter()
.map(|(v, _prefs)| v)
.filter(|v| {
pallet_balances::Pallet::<Runtime>::ensure_can_hold(&reason.into(), &v, amount)
.is_err()
})
.collect::<Vec<_>>();

for v in cannot_pay {
log::warn!(target: "runtime", "validator {:?} cannot pay a deposit of {:?}", v, amount)
}
})
}

#[tokio::test]
async fn run_migrations() {
if var("RUN_MIGRATION_TESTS").is_err() {
return;
}
sp_tracing::try_init_simple();
let mut ext = remote_ext_test_setup().await;
ext.execute_with(|| Runtime::on_runtime_upgrade(UpgradeCheckSelect::PreAndPost));
}

Expand Down
52 changes: 31 additions & 21 deletions relay/polkadot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,11 @@ impl_opaque_keys! {
}
}

parameter_types! {
// all keys are 32 bytes, except beefy being 33
pub KeyDeposit: Balance = deposit(1, 5 * 32 + 33);
}

impl pallet_session::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type ValidatorId = AccountId;
Expand All @@ -487,7 +492,7 @@ impl pallet_session::Config for Runtime {
type WeightInfo = weights::pallet_session::WeightInfo<Runtime>;
type DisablingStrategy = pallet_session::disabling::UpToLimitWithReEnablingDisablingStrategy;
type Currency = Balances;
type KeyDeposit = ();
type KeyDeposit = KeyDeposit;
}

impl pallet_session::historical::Config for Runtime {
Expand Down Expand Up @@ -3195,7 +3200,7 @@ mod remote_tests {

async fn remote_ext_test_setup() -> RemoteExternalities<Block> {
let transport: Transport =
var("WS").unwrap_or("wss://rpc.polkadot.io:443".to_string()).into();
var("WS").unwrap_or("wss://polkadot-rpc.dwellir.com".to_string()).into();
let maybe_state_snapshot: Option<SnapshotConfig> = var("SNAP").map(|s| s.into()).ok();
Builder::<Block>::default()
.mode(if let Some(state_snapshot) = maybe_state_snapshot {
Expand All @@ -3215,6 +3220,29 @@ mod remote_tests {
.unwrap()
}

#[tokio::test]
#[ignore = "this test is meant to be executed manually"]
async fn validators_who_cannot_afford_session_key_deposit() {
use frame_support::traits::fungible::InspectHold;
sp_tracing::try_init_simple();
let mut ext = remote_ext_test_setup().await;
ext.execute_with(|| {
let amount = <Runtime as pallet_session::Config>::KeyDeposit::get();
let reason = pallet_session::HoldReason::Keys;
let cannot_pay = pallet_staking::Validators::<Runtime>::iter()
.map(|(v, _prefs)| v)
.filter(|v| {
pallet_balances::Pallet::<Runtime>::ensure_can_hold(&reason.into(), &v, amount)
.is_err()
})
.collect::<Vec<_>>();

for v in cannot_pay {
log::warn!(target: "runtime", "validator {:?} cannot pay a deposit of {:?}", v, amount)
}
})
}

#[tokio::test]
async fn dispatch_all_proposals() {
if var("RUN_OPENGOV_TEST").is_err() {
Expand Down Expand Up @@ -3276,25 +3304,7 @@ mod remote_tests {
#[ignore = "this test is meant to be executed manually"]
async fn try_fast_unstake_all() {
sp_tracing::try_init_simple();
let transport: Transport =
var("WS").unwrap_or("wss://rpc.polkadot.io:443".to_string()).into();
let maybe_state_snapshot: Option<SnapshotConfig> = var("SNAP").map(|s| s.into()).ok();
let mut ext = Builder::<Block>::default()
.mode(if let Some(state_snapshot) = maybe_state_snapshot {
Mode::OfflineOrElseOnline(
OfflineConfig { state_snapshot: state_snapshot.clone() },
OnlineConfig {
transport,
state_snapshot: Some(state_snapshot),
..Default::default()
},
)
} else {
Mode::Online(OnlineConfig { transport, ..Default::default() })
})
.build()
.await
.unwrap();
let mut ext = remote_ext_test_setup().await;
ext.execute_with(|| {
pallet_fast_unstake::ErasToCheckPerBlock::<Runtime>::put(1);
polkadot_runtime_common::try_runtime::migrate_all_inactive_nominators::<Runtime>()
Expand Down
Loading