git.delta.rocks / unique-network / refs/commits / 74f532ac28dc

difftreelog

fix(runtime) add missing config keys

Daniel Shiposha2022-08-12parent: #85515e5.patch.diff
in: master

6 files changed

modifiedruntime/common/config/substrate.rsdiffbeforeafterboth
--- a/runtime/common/config/substrate.rs
+++ b/runtime/common/config/substrate.rs
@@ -154,6 +154,7 @@
 }
 
 impl pallet_transaction_payment::Config for Runtime {
+	type Event = Event;
 	type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;
 	type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;
 	type OperationalFeeMultiplier = OperationalFeeMultiplier;
modifiedruntime/common/construct_runtime/mod.rsdiffbeforeafterboth
before · runtime/common/construct_runtime/mod.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617mod util;1819#[macro_export]20macro_rules! construct_runtime {21    ($select_runtime:ident) => {22        $crate::construct_runtime_impl! {23            select_runtime($select_runtime);2425            pub enum Runtime where26                Block = Block,27                NodeBlock = opaque::Block,28                UncheckedExtrinsic = UncheckedExtrinsic29            {30                ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,31                ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,3233                Aura: pallet_aura::{Pallet, Config<T>} = 22,34                AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 23,3536                Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,37                RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,38                Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,39                TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 33,40                Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,41                Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,42                System: frame_system::{Pallet, Call, Storage, Config, Event<T>} = 36,43                Vesting: orml_vesting::{Pallet, Storage, Call, Event<T>, Config<T>} = 37,44                // Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>} = 37,45                // Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,4647                // XCM helpers.48                XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,49                PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,50                CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,51                DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,5253                // Unique Pallets54                Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,55                Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,5657                #[runtimes(opal)]58                Scheduler: pallet_unique_scheduler::{Pallet, Call, Storage, Event<T>} = 62,5960                Configuration: pallet_configuration::{Pallet, Call, Storage} = 63,6162                Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,63                // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,64                Common: pallet_common::{Pallet, Storage, Event<T>} = 66,65                Fungible: pallet_fungible::{Pallet, Storage} = 67,6667                #[runtimes(opal)]68                Refungible: pallet_refungible::{Pallet, Storage} = 68,6970                Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,71                Structure: pallet_structure::{Pallet, Call, Storage, Event<T>} = 70,7273                #[runtimes(opal)]74                RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event<T>} = 71,7576                #[runtimes(opal)]77                RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,7879                // Frontier80                EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,81                Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin} = 101,8283                EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,84                EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage} = 151,85                EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,86                EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153,87            }88        }89    }90}
after · runtime/common/construct_runtime/mod.rs
1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617mod util;1819#[macro_export]20macro_rules! construct_runtime {21    ($select_runtime:ident) => {22        $crate::construct_runtime_impl! {23            select_runtime($select_runtime);2425            pub enum Runtime where26                Block = Block,27                NodeBlock = opaque::Block,28                UncheckedExtrinsic = UncheckedExtrinsic29            {30                System: frame_system = 0,3132                ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,33                ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,3435                Aura: pallet_aura::{Pallet, Config<T>} = 22,36                AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 23,3738                Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,39                RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,40                Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,41                TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 33,42                Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,43                Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,44                Vesting: orml_vesting::{Pallet, Storage, Call, Event<T>, Config<T>} = 37,45                // Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>} = 37,46                // Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,4748                // XCM helpers.49                XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,50                PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,51                CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,52                DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,5354                // Unique Pallets55                Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,56                Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,5758                #[runtimes(opal)]59                Scheduler: pallet_unique_scheduler::{Pallet, Call, Storage, Event<T>} = 62,6061                Configuration: pallet_configuration::{Pallet, Call, Storage} = 63,6263                Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,64                // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,65                Common: pallet_common::{Pallet, Storage, Event<T>} = 66,66                Fungible: pallet_fungible::{Pallet, Storage} = 67,6768                #[runtimes(opal)]69                Refungible: pallet_refungible::{Pallet, Storage} = 68,7071                Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,72                Structure: pallet_structure::{Pallet, Call, Storage, Event<T>} = 70,7374                #[runtimes(opal)]75                RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event<T>} = 71,7677                #[runtimes(opal)]78                RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,7980                // Frontier81                EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,82                Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin} = 101,8384                EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,85                EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage} = 151,86                EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,87                EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153,88            }89        }90    }91}
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -48,7 +48,7 @@
 	spec_version: 924012,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 1,
+	transaction_version: 2,
 	state_version: 0,
 };
 
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -48,7 +48,7 @@
 	spec_version: 924012,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 1,
+	transaction_version: 2,
 	state_version: 0,
 };
 
modifiedruntime/tests/src/lib.rsdiffbeforeafterboth
--- a/runtime/tests/src/lib.rs
+++ b/runtime/tests/src/lib.rs
@@ -60,13 +60,16 @@
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		Unique: pallet_unique::{Pallet, Call, Storage},
-		Balances: pallet_balances::{Pallet, Call, Storage},
+		System: frame_system,
+		Unique: pallet_unique::{Pallet, Call, Storage, Event<T>},
+		Balances: pallet_balances::{Pallet, Call, Storage, Event<T>},
 		Common: pallet_common::{Pallet, Storage, Event<T>},
 		Fungible: pallet_fungible::{Pallet, Storage},
 		Refungible: pallet_refungible::{Pallet, Storage},
 		Nonfungible: pallet_nonfungible::{Pallet, Storage},
+		Structure: pallet_structure::{Pallet, Storage, Event<T>},
+		TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>},
+		Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin},
 		EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>},
 	}
 );
@@ -77,6 +80,7 @@
 }
 
 impl system::Config for Test {
+	type Event = Event;
 	type BaseCallFilter = Everything;
 	type BlockWeights = ();
 	type BlockLength = ();
@@ -90,7 +94,6 @@
 	type AccountId = u64;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type Header = Header;
-	type Event = ();
 	type BlockHashCount = BlockHashCount;
 	type Version = ();
 	type PalletInfo = PalletInfo;
@@ -109,10 +112,10 @@
 }
 //frame_system::Module<Test>;
 impl pallet_balances::Config for Test {
+	type Event = Event;
 	type AccountStore = System;
 	type Balance = u64;
 	type DustRemoval = ();
-	type Event = ();
 	type ExistentialDeposit = ExistentialDeposit;
 	type WeightInfo = ();
 	type MaxLocks = MaxLocks;
@@ -125,6 +128,7 @@
 }
 
 impl pallet_transaction_payment::Config for Test {
+	type Event = Event;
 	type OnChargeTransaction = CurrencyAdapter<pallet_balances::Pallet<Test>, ()>;
 	type LengthToFee = IdentityFee<u64>;
 	type WeightToFee = IdentityFee<u64>;
@@ -197,8 +201,13 @@
 	pub BlockGasLimit: U256 = 0u32.into();
 }
 
+impl pallet_ethereum::Config for Test {
+	type Event = Event;
+	type StateRoot = pallet_ethereum::IntermediateStateRoot<Self>;
+}
+
 impl pallet_evm::Config for Test {
-	type Event = ();
+	type Event = Event;
 	type FeeCalculator = ();
 	type GasWeightMapping = ();
 	type CallOrigin = EnsureAddressNever<Self::CrossAccountId>;
@@ -221,7 +230,7 @@
 
 impl pallet_common::Config for Test {
 	type WeightInfo = ();
-	type Event = ();
+	type Event = Event;
 	type Currency = Balances;
 	type CollectionCreationPrice = CollectionCreationPrice;
 	type TreasuryAccountId = TreasuryAccountId;
@@ -240,7 +249,7 @@
 
 impl pallet_structure::Config for Test {
 	type WeightInfo = ();
-	type Event = ();
+	type Event = Event;
 	type Call = Call;
 }
 impl pallet_fungible::Config for Test {
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -48,7 +48,7 @@
 	spec_version: 924012,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
-	transaction_version: 1,
+	transaction_version: 2,
 	state_version: 0,
 };