Add Polygon Consensus Client to Nexus runtime (#492)

Author: Wizdave97

Cargo.lock

@@ -30,8 +30,8 @@ use crate::{
 };
 use alloc::{string::ToString, vec::Vec};
 use codec::{Decode, DecodeWithMemTracking, Encode};
-use sp_weights::Weight;
 use primitive_types::H256;
+use sp_weights::Weight;
 
 /// A consensus message is used to update the state of a consensus client and its children state
 /// machines.

modules/ismp/core/src/messaging.rs

@@ -116,10 +116,13 @@ pub mod pallet {
 			beneficiary: T::AccountId,
 			amount: <<T as Config>::Currency as Currency<T::AccountId>>::Balance,
 		},
+		/// Funds have been allocated
 		Allocated {
 			beneficiary: T::AccountId,
 			amount: <<T as Config>::Currency as Currency<T::AccountId>>::Balance,
 		},
+		/// Start block for vesting has been set
+		StartBlockSet { start_block: BlockNumberFor<T> },
 	}
 
 	#[derive(
@@ -180,18 +183,6 @@ pub mod pallet {
 		}
 	}
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
-		fn on_initialize(n: BlockNumberFor<T>) -> Weight {
-			if StartingBlock::<T>::get().is_none() {
-				StartingBlock::<T>::put(n);
-				return <T as frame_system::Config>::DbWeight::get().reads_writes(1, 1);
-			}
-
-			<T as frame_system::Config>::DbWeight::get().reads(1)
-		}
-	}
-
 	#[pallet::call]
 	impl<T: Config> Pallet<T>
 	where
@@ -350,6 +341,20 @@ pub mod pallet {
 
 			Ok(())
 		}
+
+		/// Set the start block for vesting
+		#[pallet::call_index(4)]
+		#[pallet::weight(<T as frame_system::Config>::DbWeight::get().reads_writes(1, 2))]
+		pub fn set_start_block(
+			origin: OriginFor<T>,
+			start_block: BlockNumberFor<T>,
+		) -> DispatchResult {
+			T::BridgeDropOrigin::ensure_origin(origin)?;
+
+			StartingBlock::<T>::put(start_block);
+			Self::deposit_event(Event::<T>::StartBlockSet { start_block });
+			Ok(())
+		}
 	}
 
 	#[pallet::validate_unsigned]

modules/pallets/bridge-drop/src/lib.rs

@@ -144,16 +144,14 @@ fn should_allocate_iro_correctly() {
 			RuntimeOrigin::root(),
 			beneficiary.clone(),
 			amount,
-			bonus_amount
+			bonus_amount,
 		)
 		.unwrap();
 
 		let account_data = frame_system::Account::<Test>::get(beneficiary.clone());
 
 		let initial_unlocked = Permill::from_parts(250_000) * amount;
-		let locked = amount
-			.saturating_sub(initial_unlocked)
-			.saturating_add(bonus_amount);
+		let locked = amount.saturating_sub(initial_unlocked).saturating_add(bonus_amount);
 
 		assert_eq!(account_data.data.free, amount.saturating_add(bonus_amount));
 
@@ -193,7 +191,7 @@ fn should_allocate_iro_correctly() {
 			RuntimeOrigin::root(),
 			beneficiary.clone(),
 			amount.clone(),
-			bonus_amount
+			bonus_amount,
 		);
 
 		assert_err!(res, pallet_bridge_airdrop::pallet::Error::<Test>::AlreadyAllocated);

modules/pallets/testsuite/src/tests/pallet_bridge_airdrop.rs

@@ -99,7 +99,10 @@ fn test_dispatch_fees() {
 		assert_eq!(Balances::balance(&account), Default::default());
 
 		// now pallet-ismp has it
-		assert_eq!(Balances::balance(&RELAYER_FEE_ACCOUNT.into_account_truncating()),  65 * 10 * UNIT);
+		assert_eq!(
+			Balances::balance(&RELAYER_FEE_ACCOUNT.into_account_truncating()),
+			65 * 10 * UNIT
+		);
 	});
 }
 

modules/pallets/testsuite/src/tests/pallet_hyperbridge.rs

@@ -50,6 +50,7 @@ hyperbridge-client-machine = { workspace = true }
 pallet-bridge-airdrop = { workspace = true }
 ismp-arbitrum = { workspace = true }
 ismp-optimism = { workspace = true }
+ismp-polygon = { workspace = true }
 pallet-consensus-incentives = { workspace = true }
 
 simnode-runtime-api = { workspace = true }
@@ -155,6 +156,7 @@ std = [
     "ismp-optimism/std",
     "pallet-consensus-incentives/std",
     "polkadot-sdk/std",
+    "ismp-polygon/std"
 ]
 runtime-benchmarks = [
     "hex-literal",

parachain/runtimes/nexus/Cargo.toml

@@ -166,6 +166,7 @@ impl pallet_ismp::Config for Runtime {
 		>,
 		ismp_arbitrum::ArbitrumConsensusClient<Ismp, Runtime>,
 		ismp_optimism::OptimismConsensusClient<Ismp, Runtime>,
+		ismp_polygon::PolygonClient<Ismp, Runtime>,
 	);
 	type OffchainDB = Mmr;
 	type FeeHandler = pallet_ismp::fee_handler::WeightFeeHandler<

parachain/runtimes/nexus/src/ismp.rs

@@ -226,7 +226,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: Cow::Borrowed("nexus"),
 	impl_name: Cow::Borrowed("nexus"),
 	authoring_version: 1,
-	spec_version: 3_700,
+	spec_version: 3_800,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,

parachain/runtimes/nexus/src/lib.rs

@@ -81,7 +81,7 @@ async fn should_perform_batch_allocations() -> Result<(), anyhow::Error> {
 			let call = RuntimeCall::BridgeDrop(BridgeDropCall::allocate_iro_tokens {
 				beneficiary: dest.into(),
 				amount: record.amount,
-				bonus_amount: record.bonus_amount.unwrap()
+				bonus_amount: record.bonus_amount.unwrap(),
 			});
 			calls.push(call);
 			records_to_check.push(record);