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
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},
304304
305impl pallet_ethereum::Config for Runtime {305impl pallet_ethereum::Config for Runtime {
306	type Event = Event;306	type Event = Event;
307	type StateRoot = pallet_ethereum::IntermediateStateRoot;307	type StateRoot = pallet_ethereum::IntermediateStateRoot<Self>;
308}308}
309309
310impl pallet_randomness_collective_flip::Config for Runtime {}310impl pallet_randomness_collective_flip::Config for Runtime {}
472472
473impl pallet_transaction_payment::Config for Runtime {473impl pallet_transaction_payment::Config for Runtime {
474	type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;474	type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;
475	type TransactionByteFee = TransactionByteFee;475	type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;
476	type OperationalFeeMultiplier = OperationalFeeMultiplier;476	type OperationalFeeMultiplier = OperationalFeeMultiplier;
477	type WeightToFee = LinearFee<Balance>;477	type WeightToFee = LinearFee<Balance>;
478	type FeeMultiplierUpdate = ();478	type FeeMultiplierUpdate = ();
651	pub const MaxAuthorities: u32 = 100_000;651	pub const MaxAuthorities: u32 = 100_000;
652}652}
653653
654match_type! {654match_types! {
655	pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {655	pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {
656		MultiLocation { parents: 1, interior: Here } |656		MultiLocation { parents: 1, interior: Here } |
657		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) }657		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) }