!! paritytech/polkadot-sdk#1363

darwinia-network · Jun 20, 2024 · 48bb6c7 · 48bb6c7
1 parent b86f455
commit 48bb6c7
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 10 deletions.
diff --git a/runtime/crab/src/pallets/balances.rs b/runtime/crab/src/pallets/balances.rs
@@ -26,7 +26,7 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = pallet_config::ExistentialDeposit;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
+	type MaxHolds = ConstU32<1>;
 	type MaxLocks = ConstU32<50>;
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];

diff --git a/runtime/crab/src/pallets/preimage.rs b/runtime/crab/src/pallets/preimage.rs
@@ -19,9 +19,19 @@
 // darwinia
 use crate::*;
 
+frame_support::parameter_types! {
+	pub const PreimageBaseDeposit: Balance = deposit(2, 64);
+	pub const PreimageByteDeposit: Balance = deposit(0, 1);
+	pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage);
+}
+
 impl pallet_preimage::Config for Runtime {
-	type BaseDeposit = ConstU128<{ 500 * UNIT }>;
-	type ByteDeposit = ConstU128<{ darwinia_deposit(0, 1) }>;
+	type Consideration = HoldConsideration<
+		AccountId,
+		Balances,
+		PreimageHoldReason,
+		LinearStoragePrice<PreimageBaseDeposit, PreimageByteDeposit, Balance>,
+	>;
 	type Currency = Balances;
 	type ManagerOrigin = Root;
 	type RuntimeEvent = RuntimeEvent;

diff --git a/runtime/darwinia/src/pallets/balances.rs b/runtime/darwinia/src/pallets/balances.rs
@@ -26,7 +26,7 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = pallet_config::ExistentialDeposit;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
+	type MaxHolds = ConstU32<1>;
 	type MaxLocks = ConstU32<50>;
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];

diff --git a/runtime/darwinia/src/pallets/preimage.rs b/runtime/darwinia/src/pallets/preimage.rs
@@ -19,9 +19,19 @@
 // darwinia
 use crate::*;
 
+frame_support::parameter_types! {
+	pub const PreimageBaseDeposit: Balance = deposit(2, 64);
+	pub const PreimageByteDeposit: Balance = deposit(0, 1);
+	pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage);
+}
+
 impl pallet_preimage::Config for Runtime {
-	type BaseDeposit = ConstU128<{ 500 * UNIT }>;
-	type ByteDeposit = ConstU128<{ darwinia_deposit(0, 1) }>;
+	type Consideration = HoldConsideration<
+		AccountId,
+		Balances,
+		PreimageHoldReason,
+		LinearStoragePrice<PreimageBaseDeposit, PreimageByteDeposit, Balance>,
+	>;
 	type Currency = Balances;
 	type ManagerOrigin = Root;
 	type RuntimeEvent = RuntimeEvent;

diff --git a/runtime/koi/src/pallets/balances.rs b/runtime/koi/src/pallets/balances.rs
@@ -26,7 +26,7 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = pallet_config::ExistentialDeposit;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
+	type MaxHolds = ConstU32<1>;
 	type MaxLocks = ConstU32<50>;
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];

diff --git a/runtime/koi/src/pallets/preimage.rs b/runtime/koi/src/pallets/preimage.rs
@@ -19,11 +19,21 @@
 // darwinia
 use crate::*;
 
+frame_support::parameter_types! {
+	pub const PreimageBaseDeposit: Balance = deposit(2, 64);
+	pub const PreimageByteDeposit: Balance = deposit(0, 1);
+	pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage);
+}
+
 impl pallet_preimage::Config for Runtime {
-	type BaseDeposit = ConstU128<{ 500 * UNIT }>;
-	type ByteDeposit = ConstU128<{ darwinia_deposit(0, 1) }>;
+	type Consideration = HoldConsideration<
+		AccountId,
+		Balances,
+		PreimageHoldReason,
+		LinearStoragePrice<PreimageBaseDeposit, PreimageByteDeposit, Balance>,
+	>;
 	type Currency = Balances;
-	type ManagerOrigin = RootOr<GeneralAdmin>;
+	type ManagerOrigin = Root;
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = weights::pallet_preimage::WeightInfo<Self>;
 }