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

154}154}
155155
156impl pallet_transaction_payment::Config for Runtime {156impl pallet_transaction_payment::Config for Runtime {
157	type Event = Event;
157	type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;158	type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, DealWithFees>;
158	type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;159	type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;
159	type OperationalFeeMultiplier = OperationalFeeMultiplier;160	type OperationalFeeMultiplier = OperationalFeeMultiplier;

--- a/runtime/common/construct_runtime/mod.rs
+++ b/runtime/common/construct_runtime/mod.rs
@@ -27,6 +27,8 @@
                 NodeBlock = opaque::Block,
                 UncheckedExtrinsic = UncheckedExtrinsic
             {
+                System: frame_system = 0,
+
                 ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,
                 ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,
 
@@ -36,10 +38,9 @@
                 Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,
                 RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,
                 Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,
-                TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 33,
+                TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 33,
                 Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,
                 Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,
-                System: frame_system::{Pallet, Call, Storage, Config, Event<T>} = 36,
                 Vesting: orml_vesting::{Pallet, Storage, Call, Event<T>, Config<T>} = 37,
                 // Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>} = 37,
                 // Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,

--- 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,
 };
 

--- 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,
 };
 

--- 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 {

--- 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,
 };