git.delta.rocks / unique-network / refs/commits / a9c0e00e1682

difftreelog

feat upgrade code to v1.2.0

Yaroslav Bolyukin2023-11-17parent: #2df619c.patch.diff
in: master

2 files changed

modifiednode/cli/src/service.rsdiffbeforeafterboth
419 Box::new(block_announce_validator)419 Box::new(block_announce_validator)
420 })),420 })),
421 warp_sync_params: None,421 warp_sync_params: None,
422 block_relay: None,
422 })?;423 })?;
423424
424 let select_chain = params.select_chain.clone();425 let select_chain = params.select_chain.clone();
887 import_queue,888 import_queue,
888 block_announce_validator_builder: None,889 block_announce_validator_builder: None,
889 warp_sync_params: None,890 warp_sync_params: None,
891 block_relay: None,
890 })?;892 })?;
891893
892 let collator = config.role.is_authority();894 let collator = config.role.is_authority();
modifiedruntime/common/config/pallets/preimage.rsdiffbeforeafterboth
--- a/runtime/common/config/pallets/preimage.rs
+++ b/runtime/common/config/pallets/preimage.rs
@@ -14,14 +14,18 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-use frame_support::parameter_types;
+use frame_support::{
+	parameter_types,
+	traits::{fungible::HoldConsideration, LinearStoragePrice},
+};
 use frame_system::EnsureRoot;
 use up_common::constants::*;
 
-use crate::{AccountId, Balance, Balances, Runtime, RuntimeEvent};
+use crate::{AccountId, Balance, Balances, Runtime, RuntimeEvent, RuntimeHoldReason};
 
 parameter_types! {
 	pub PreimageBaseDeposit: Balance = 1000 * UNIQUE;
+	pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage);
 }
 
 impl pallet_preimage::Config for Runtime {
@@ -29,6 +33,10 @@
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type ManagerOrigin = EnsureRoot<AccountId>;
-	type BaseDeposit = PreimageBaseDeposit;
-	type ByteDeposit = TransactionByteFee;
+	type Consideration = HoldConsideration<
+		AccountId,
+		Balances,
+		PreimageHoldReason,
+		LinearStoragePrice<PreimageBaseDeposit, TransactionByteFee, Balance>,
+	>;
 }