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

difftreelog

fix runtimes building

Yaroslav Bolyukin2022-04-29parent: #dee514e.patch.diff
in: master

2 files changed

modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
52	EnsureAddressTruncated, HashedAddressMapping, Runner, account::CrossAccountId as _,52	EnsureAddressTruncated, HashedAddressMapping, Runner, account::CrossAccountId as _,
53};53};
54pub use frame_support::{54pub use frame_support::{
55	construct_runtime, match_type,55	construct_runtime, match_types,
56	dispatch::DispatchResult,56	dispatch::DispatchResult,
57	PalletId, parameter_types, StorageValue, ConsensusEngineId,57	PalletId, parameter_types, StorageValue, ConsensusEngineId,
58	traits::{58	traits::{
63	weights::{63	weights::{
64		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},64		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
65		DispatchClass, DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,65		DispatchClass, DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,
66		WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients,66		WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients, ConstantMultiplier,
67	},67	},
68};68};
69use up_data_structs::*;69use up_data_structs::*;
78};78};
79use smallvec::smallvec;79use smallvec::smallvec;
80use codec::{Encode, Decode};80use codec::{Encode, Decode};
81use pallet_evm::{Account as EVMAccount, FeeCalculator, GasWeightMapping, OnMethodCall};81use pallet_evm::{Account as EVMAccount, FeeCalculator, GasWeightMapping};
82use fp_rpc::TransactionStatus;82use fp_rpc::TransactionStatus;
83use sp_runtime::{83use sp_runtime::{
84	traits::{BlockNumberProvider, Dispatchable, PostDispatchInfoOf, Saturating},84	traits::{BlockNumberProvider, Dispatchable, PostDispatchInfoOf, Saturating},
305305
306impl pallet_ethereum::Config for Runtime {306impl pallet_ethereum::Config for Runtime {
307	type Event = Event;307	type Event = Event;
308	type StateRoot = pallet_ethereum::IntermediateStateRoot;308	type StateRoot = pallet_ethereum::IntermediateStateRoot<Self>;
309}309}
310310
311impl pallet_randomness_collective_flip::Config for Runtime {}311impl pallet_randomness_collective_flip::Config for Runtime {}
473473
474impl pallet_transaction_payment::Config for Runtime {474impl pallet_transaction_payment::Config for Runtime {
475	type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;475	type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;
476	type TransactionByteFee = TransactionByteFee;476	type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;
477	type OperationalFeeMultiplier = OperationalFeeMultiplier;477	type OperationalFeeMultiplier = OperationalFeeMultiplier;
478	type WeightToFee = LinearFee<Balance>;478	type WeightToFee = LinearFee<Balance>;
479	type FeeMultiplierUpdate = ();479	type FeeMultiplierUpdate = ();
652	pub const MaxAuthorities: u32 = 100_000;652	pub const MaxAuthorities: u32 = 100_000;
653}653}
654654
655match_type! {655match_types! {
656	pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {656	pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {
657		MultiLocation { parents: 1, interior: Here } |657		MultiLocation { parents: 1, interior: Here } |
658		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) }658		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) }
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -52,7 +52,7 @@
 	EnsureAddressTruncated, HashedAddressMapping, Runner, account::CrossAccountId as _,
 };
 pub use frame_support::{
-	construct_runtime, match_type,
+	construct_runtime, match_types,
 	dispatch::DispatchResult,
 	PalletId, parameter_types, StorageValue, ConsensusEngineId,
 	traits::{
@@ -63,7 +63,7 @@
 	weights::{
 		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
 		DispatchClass, DispatchInfo, GetDispatchInfo, IdentityFee, Pays, PostDispatchInfo, Weight,
-		WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients,
+		WeightToFeePolynomial, WeightToFeeCoefficient, WeightToFeeCoefficients, ConstantMultiplier,
 	},
 };
 use up_data_structs::*;
@@ -78,7 +78,7 @@
 };
 use smallvec::smallvec;
 use codec::{Encode, Decode};
-use pallet_evm::{Account as EVMAccount, FeeCalculator, GasWeightMapping, OnMethodCall};
+use pallet_evm::{Account as EVMAccount, FeeCalculator, GasWeightMapping};
 use fp_rpc::TransactionStatus;
 use sp_runtime::{
 	traits::{BlockNumberProvider, Dispatchable, PostDispatchInfoOf, Saturating},
@@ -304,7 +304,7 @@
 
 impl pallet_ethereum::Config for Runtime {
 	type Event = Event;
-	type StateRoot = pallet_ethereum::IntermediateStateRoot;
+	type StateRoot = pallet_ethereum::IntermediateStateRoot<Self>;
 }
 
 impl pallet_randomness_collective_flip::Config for Runtime {}
@@ -472,7 +472,7 @@
 
 impl pallet_transaction_payment::Config for Runtime {
 	type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;
-	type TransactionByteFee = TransactionByteFee;
+	type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;
 	type OperationalFeeMultiplier = OperationalFeeMultiplier;
 	type WeightToFee = LinearFee<Balance>;
 	type FeeMultiplierUpdate = ();
@@ -651,7 +651,7 @@
 	pub const MaxAuthorities: u32 = 100_000;
 }
 
-match_type! {
+match_types! {
 	pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {
 		MultiLocation { parents: 1, interior: Here } |
 		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) }