chore: make solana election migration idempotent again

chainflip-io · Nov 8, 2024 · d5ad2ee · d5ad2ee
1 parent 4985676
commit d5ad2ee
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/state-chain/pallets/cf-elections/src/lib.rs b/state-chain/pallets/cf-elections/src/lib.rs
@@ -124,7 +124,7 @@ use frame_system::pallet_prelude::*;
 
 pub use pallet::*;
 
-pub const PALLET_VERSION: StorageVersion = StorageVersion::new(1);
+pub const PALLET_VERSION: StorageVersion = StorageVersion::new(2);
 
 pub use pallet::UniqueMonotonicIdentifier;
 

diff --git a/state-chain/runtime/src/chainflip/solana_elections.rs b/state-chain/runtime/src/chainflip/solana_elections.rs
@@ -273,6 +273,13 @@ pub mod old {
 			Ok(())
 		}
 		fn on_runtime_upgrade() -> frame_support::weights::Weight {
+			if cf_runtime_upgrade_utilities::genesis_hashes::genesis_hash::<Runtime>() ==
+				cf_runtime_upgrade_utilities::genesis_hashes::SISYPHOS
+			{
+				// Already applied on Sisyphos
+				return Default::default();
+			}
+
 			let election_identifiers = frame_support::migration::storage_key_iter::<
 				ElectionIdentifierOf<old::SolanaElectoralSystem>,
 				<old::SolanaElectoralSystem as ElectoralSystem>::ElectionProperties,

diff --git a/state-chain/runtime/src/lib.rs b/state-chain/runtime/src/lib.rs
@@ -1242,7 +1242,6 @@ type AllMigrations = (
 	MigrationsForV1_7,
 	migrations::housekeeping::Migration,
 	migrations::reap_old_accounts::Migration,
-	SpecVersionedMigration<chainflip::solana_elections::old::Migration, 170>,
 );
 
 /// All the pallet-specific migrations and migrations that depend on pallet migration order. Do not
@@ -1310,6 +1309,7 @@ type MigrationsForV1_7 = (
 		0,
 		1,
 	>,
+	VersionedMigration<SolanaElections, chainflip::solana_elections::old::Migration, 1, 2>,
 );
 
 #[cfg(feature = "runtime-benchmarks")]