require some gap before unstake is possible

paritytech · Apr 7, 2023 · c14cb68 · c14cb68
1 parent 2da6789
commit c14cb68
Show file tree

Hide file tree

Showing 12 changed files with 1,012 additions and 495 deletions.
diff --git a/bin/millau/runtime/src/lib.rs b/bin/millau/runtime/src/lib.rs
@@ -88,7 +88,6 @@ use bridge_runtime_common::{
 		ActualFeeRefund, RefundBridgedParachainMessages, RefundableMessagesLane,
 		RefundableParachain,
 	},
-	relayer_slashing::DeliveryStakeAndSlashFromBalance,
 };
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
@@ -373,6 +372,7 @@ parameter_types! {
 	/// Authorities are changing every 5 minutes.
 	pub const Period: BlockNumber = bp_millau::SESSION_LENGTH;
 	pub const Offset: BlockNumber = 0;
+	pub const RelayerStakeReserveId: [u8; 8] = *b"brdgrlrs";
 }
 
 impl pallet_session::Config for Runtime {
@@ -393,6 +393,14 @@ impl pallet_bridge_relayers::Config for Runtime {
 	type Reward = Balance;
 	type PaymentProcedure =
 		bp_relayers::PayRewardFromAccount<pallet_balances::Pallet<Runtime>, AccountId>;
+	type StakeAndSlash = pallet_bridge_relayers::StakeAndSlashNamed<
+		AccountId,
+		BlockNumber,
+		Balances,
+		RelayerStakeReserveId,
+		ConstU64<1_000>,
+		ConstU64<8>,
+	>;
 	type WeightInfo = ();
 }
 
@@ -591,15 +599,12 @@ generate_bridge_reject_obsolete_headers_and_messages! {
 bp_runtime::generate_static_str_provider!(BridgeRefundRialtoPara2000Lane0Msgs);
 /// Signed extension that refunds relayers that are delivering messages from the Rialto parachain.
 pub type PriorityBoostPerMessage = ConstU64<921_900_294>;
-pub type DeliveryStakeAndSlash =
-	DeliveryStakeAndSlashFromBalance<AccountId, Balances, Runtime, ConstU64<1_000>>;
 pub type BridgeRefundRialtoParachainMessages = RefundBridgedParachainMessages<
 	Runtime,
 	RefundableParachain<WithRialtoParachainsInstance, RialtoParachainId>,
 	RefundableMessagesLane<WithRialtoParachainMessagesInstance, RialtoParachainMessagesLane>,
 	ActualFeeRefund<Runtime>,
 	PriorityBoostPerMessage,
-	DeliveryStakeAndSlash,
 	StrBridgeRefundRialtoPara2000Lane0Msgs,
 >;
 

diff --git a/bin/rialto-parachain/runtime/src/lib.rs b/bin/rialto-parachain/runtime/src/lib.rs
@@ -533,6 +533,7 @@ impl pallet_bridge_relayers::Config for Runtime {
 	type Reward = Balance;
 	type PaymentProcedure =
 		bp_relayers::PayRewardFromAccount<pallet_balances::Pallet<Runtime>, AccountId>;
+	type StakeAndSlash = ();
 	type WeightInfo = ();
 }
 

diff --git a/bin/rialto/runtime/src/lib.rs b/bin/rialto/runtime/src/lib.rs
@@ -389,6 +389,7 @@ impl pallet_bridge_relayers::Config for Runtime {
 	type Reward = Balance;
 	type PaymentProcedure =
 		bp_relayers::PayRewardFromAccount<pallet_balances::Pallet<Runtime>, AccountId>;
+	type StakeAndSlash = ();
 	type WeightInfo = ();
 }
 

diff --git a/bin/runtime-common/src/lib.rs b/bin/runtime-common/src/lib.rs
@@ -32,7 +32,6 @@ pub mod messages_xcm_extension;
 pub mod parachains_benchmarking;
 pub mod priority_calculator;
 pub mod refund_relayer_extension;
-pub mod relayer_slashing;
 
 mod messages_generation;
 mod mock;

diff --git a/bin/runtime-common/src/mock.rs b/bin/runtime-common/src/mock.rs
@@ -23,16 +23,13 @@
 
 #![cfg(test)]
 
-use crate::{
-	messages::{
-		source::{
-			FromThisChainMaximalOutboundPayloadSize, FromThisChainMessagePayload,
-			FromThisChainMessageVerifier, TargetHeaderChainAdapter,
-		},
-		target::{FromBridgedChainMessagePayload, SourceHeaderChainAdapter},
-		BridgedChainWithMessages, HashOf, MessageBridge, ThisChainWithMessages,
+use crate::messages::{
+	source::{
+		FromThisChainMaximalOutboundPayloadSize, FromThisChainMessagePayload,
+		FromThisChainMessageVerifier, TargetHeaderChainAdapter,
 	},
-	relayer_slashing::DeliveryStakeAndSlashFromBalance,
+	target::{FromBridgedChainMessagePayload, SourceHeaderChainAdapter},
+	BridgedChainWithMessages, HashOf, MessageBridge, ThisChainWithMessages,
 };
 
 use bp_header_chain::{ChainWithGrandpa, HeaderChain};
@@ -92,8 +89,14 @@ pub type TestPaymentProcedure = PayRewardFromAccount<Balances, ThisChainAccountI
 /// Stake that we are using in tests.
 pub type TestStake = ConstU64<5_000>;
 /// Stake and slash mechanism to use in tests.
-pub type TestDeliveryStakeAndSlash =
-	DeliveryStakeAndSlashFromBalance<ThisChainAccountId, Balances, TestRuntime, TestStake>;
+pub type TestStakeAndSlash = pallet_bridge_relayers::StakeAndSlashNamed<
+	ThisChainAccountId,
+	ThisChainBlockNumber,
+	Balances,
+	ReserveId,
+	TestStake,
+	ConstU32<8>,
+>;
 
 /// Message lane used in tests.
 pub const TEST_LANE_ID: LaneId = LaneId([0, 0, 0, 0]);
@@ -138,6 +141,7 @@ parameter_types! {
 	pub AdjustmentVariable: Multiplier = Multiplier::saturating_from_rational(3, 100_000);
 	pub MinimumMultiplier: Multiplier = Multiplier::saturating_from_rational(1, 1_000_000u128);
 	pub MaximumMultiplier: Multiplier = sp_runtime::traits::Bounded::max_value();
+	pub const ReserveId: [u8; 8] = *b"brdgrlrs";
 }
 
 impl frame_system::Config for TestRuntime {
@@ -255,6 +259,7 @@ impl pallet_bridge_relayers::Config for TestRuntime {
 	type RuntimeEvent = RuntimeEvent;
 	type Reward = ThisChainBalance;
 	type PaymentProcedure = TestPaymentProcedure;
+	type StakeAndSlash = TestStakeAndSlash;
 	type WeightInfo = ();
 }