add config type for reserve portion taken by protocol when the init c…

…hannel is requested to be closed
autonomys · Jun 6, 2024 · bb7e1f6 · bb7e1f6
1 parent e132217
commit bb7e1f6
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 2 deletions.
diff --git a/crates/subspace-runtime/src/lib.rs b/crates/subspace-runtime/src/lib.rs
@@ -83,7 +83,7 @@ use sp_runtime::traits::{
 };
 use sp_runtime::transaction_validity::{TransactionSource, TransactionValidity};
 use sp_runtime::{
-    create_runtime_str, generic, AccountId32, ApplyExtrinsicResult, ExtrinsicInclusionMode,
+    create_runtime_str, generic, AccountId32, ApplyExtrinsicResult, ExtrinsicInclusionMode, Perbill,
 };
 use sp_std::collections::btree_map::BTreeMap;
 use sp_std::marker::PhantomData;
@@ -507,6 +507,7 @@ impl sp_messenger::StorageKeys for StorageKeys {
 parameter_types! {
     // TODO: update value
     pub const ChannelReserveFee: Balance = 100 * SSC;
+    pub const ChannelInitReservePortion: Perbill = Perbill::from_percent(20);
 }
 
 impl pallet_messenger::Config for Runtime {
@@ -531,6 +532,7 @@ impl pallet_messenger::Config for Runtime {
     type DomainOwner = Domains;
     type HoldIdentifier = HoldIdentifier;
     type ChannelReserveFee = ChannelReserveFee;
+    type ChannelInitReservePortion = ChannelInitReservePortion;
 }
 
 impl<C> frame_system::offchain::SendTransactionTypes<C> for Runtime

diff --git a/domains/pallets/messenger/src/lib.rs b/domains/pallets/messenger/src/lib.rs
@@ -161,7 +161,7 @@ mod pallet {
     use sp_messenger::{
         InherentError, InherentType, OnXDMRewards, StorageKeys, INHERENT_IDENTIFIER,
     };
-    use sp_runtime::ArithmeticError;
+    use sp_runtime::{ArithmeticError, Perbill};
     use sp_subspace_mmr::MmrProofVerifier;
     #[cfg(feature = "std")]
     use std::collections::BTreeSet;
@@ -201,6 +201,10 @@ mod pallet {
         /// Channel reserve fee to open a channel.
         #[pallet::constant]
         type ChannelReserveFee: Get<BalanceOf<Self>>;
+        /// Portion of Channel reserve taken by the protocol
+        /// if the channel is in init state and is requested to be closed.
+        #[pallet::constant]
+        type ChannelInitReservePortion: Get<Perbill>;
     }
 
     /// Pallet messenger used to communicate between chains and other blockchains.

diff --git a/domains/pallets/messenger/src/mock.rs b/domains/pallets/messenger/src/mock.rs
@@ -38,6 +38,7 @@ macro_rules! impl_runtime {
         use sp_domains::MessengerHoldIdentifier;
         use frame_support::traits::VariantCount;
         use core::mem;
+        use sp_runtime::Perbill;
 
         type Block = frame_system::mocking::MockBlock<Runtime>;
 
@@ -59,6 +60,7 @@ macro_rules! impl_runtime {
         parameter_types! {
             pub SelfChainId: ChainId = $chain_id.into();
             pub const ChannelReserveFee: Balance = 10;
+            pub const ChannelInitReservePortion: Perbill = Perbill::from_percent(20);
         }
 
         #[derive(
@@ -90,6 +92,7 @@ macro_rules! impl_runtime {
             type StorageKeys = ();
             type DomainOwner = ();
             type ChannelReserveFee = ChannelReserveFee;
+            type ChannelInitReservePortion = ChannelInitReservePortion;
             type HoldIdentifier = MockHoldIdentifer;
             /// function to fetch endpoint response handler by Endpoint.
             fn get_endpoint_handler(

diff --git a/domains/runtime/auto-id/src/lib.rs b/domains/runtime/auto-id/src/lib.rs
@@ -387,6 +387,7 @@ impl pallet_messenger::HoldIdentifier<Runtime> for HoldIdentifier {
 
 parameter_types! {
     pub const ChannelReserveFee: Balance = 100 * SSC;
+    pub const ChannelInitReservePortion: Perbill = Perbill::from_percent(20);
 }
 
 impl pallet_messenger::Config for Runtime {
@@ -411,6 +412,7 @@ impl pallet_messenger::Config for Runtime {
     type DomainOwner = ();
     type HoldIdentifier = HoldIdentifier;
     type ChannelReserveFee = ChannelReserveFee;
+    type ChannelInitReservePortion = ChannelInitReservePortion;
 }
 
 impl<C> frame_system::offchain::SendTransactionTypes<C> for Runtime

diff --git a/domains/runtime/evm/src/lib.rs b/domains/runtime/evm/src/lib.rs
@@ -516,6 +516,7 @@ impl pallet_messenger::HoldIdentifier<Runtime> for HoldIdentifier {
 
 parameter_types! {
     pub const ChannelReserveFee: Balance = 100 * SSC;
+    pub const ChannelInitReservePortion: Perbill = Perbill::from_percent(20);
 }
 
 impl pallet_messenger::Config for Runtime {
@@ -540,6 +541,7 @@ impl pallet_messenger::Config for Runtime {
     type DomainOwner = ();
     type HoldIdentifier = HoldIdentifier;
     type ChannelReserveFee = ChannelReserveFee;
+    type ChannelInitReservePortion = ChannelInitReservePortion;
 }
 
 impl<C> frame_system::offchain::SendTransactionTypes<C> for Runtime

diff --git a/domains/test/runtime/evm/src/lib.rs b/domains/test/runtime/evm/src/lib.rs
@@ -476,6 +476,7 @@ impl pallet_messenger::HoldIdentifier<Runtime> for HoldIdentifier {
 
 parameter_types! {
     pub const ChannelReserveFee: Balance = SSC;
+    pub const ChannelInitReservePortion: Perbill = Perbill::from_percent(20);
 }
 
 pub struct StorageKeys;
@@ -522,6 +523,7 @@ impl pallet_messenger::Config for Runtime {
     type DomainOwner = ();
     type HoldIdentifier = HoldIdentifier;
     type ChannelReserveFee = ChannelReserveFee;
+    type ChannelInitReservePortion = ChannelInitReservePortion;
 }
 
 impl<C> frame_system::offchain::SendTransactionTypes<C> for Runtime

diff --git a/test/subspace-test-runtime/src/lib.rs b/test/subspace-test-runtime/src/lib.rs
@@ -595,6 +595,7 @@ impl sp_messenger::StorageKeys for StorageKeys {
 
 parameter_types! {
     pub const ChannelReserveFee: Balance = SSC;
+    pub const ChannelInitReservePortion: Perbill = Perbill::from_percent(20);
 }
 
 impl pallet_messenger::Config for Runtime {
@@ -619,6 +620,7 @@ impl pallet_messenger::Config for Runtime {
     type DomainOwner = Domains;
     type HoldIdentifier = HoldIdentifier;
     type ChannelReserveFee = ChannelReserveFee;
+    type ChannelInitReservePortion = ChannelInitReservePortion;
 }
 
 impl<C> frame_system::offchain::SendTransactionTypes<C> for Runtime