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

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

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

60		NodeBlock = Block,60		NodeBlock = Block,
61		UncheckedExtrinsic = UncheckedExtrinsic,61		UncheckedExtrinsic = UncheckedExtrinsic,
62	{62	{
63		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},63		System: frame_system,
64		Unique: pallet_unique::{Pallet, Call, Storage},64		Unique: pallet_unique::{Pallet, Call, Storage, Event<T>},
65		Balances: pallet_balances::{Pallet, Call, Storage},65		Balances: pallet_balances::{Pallet, Call, Storage, Event<T>},
66		Common: pallet_common::{Pallet, Storage, Event<T>},66		Common: pallet_common::{Pallet, Storage, Event<T>},
67		Fungible: pallet_fungible::{Pallet, Storage},67		Fungible: pallet_fungible::{Pallet, Storage},
68		Refungible: pallet_refungible::{Pallet, Storage},68		Refungible: pallet_refungible::{Pallet, Storage},
69		Nonfungible: pallet_nonfungible::{Pallet, Storage},69		Nonfungible: pallet_nonfungible::{Pallet, Storage},
70		Structure: pallet_structure::{Pallet, Storage, Event<T>},
71		TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>},
72		Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin},
70		EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>},73		EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>},
71	}74	}
72);75);
77}80}
7881
79impl system::Config for Test {82impl system::Config for Test {
83	type Event = Event;
80	type BaseCallFilter = Everything;84	type BaseCallFilter = Everything;
81	type BlockWeights = ();85	type BlockWeights = ();
82	type BlockLength = ();86	type BlockLength = ();
90	type AccountId = u64;94	type AccountId = u64;
91	type Lookup = IdentityLookup<Self::AccountId>;95	type Lookup = IdentityLookup<Self::AccountId>;
92	type Header = Header;96	type Header = Header;
93	type Event = ();
94	type BlockHashCount = BlockHashCount;97	type BlockHashCount = BlockHashCount;
95	type Version = ();98	type Version = ();
96	type PalletInfo = PalletInfo;99	type PalletInfo = PalletInfo;
109}112}
110//frame_system::Module<Test>;113//frame_system::Module<Test>;
111impl pallet_balances::Config for Test {114impl pallet_balances::Config for Test {
115	type Event = Event;
112	type AccountStore = System;116	type AccountStore = System;
113	type Balance = u64;117	type Balance = u64;
114	type DustRemoval = ();118	type DustRemoval = ();
115	type Event = ();
116	type ExistentialDeposit = ExistentialDeposit;119	type ExistentialDeposit = ExistentialDeposit;
117	type WeightInfo = ();120	type WeightInfo = ();
118	type MaxLocks = MaxLocks;121	type MaxLocks = MaxLocks;
125}128}
126129
127impl pallet_transaction_payment::Config for Test {130impl pallet_transaction_payment::Config for Test {
131	type Event = Event;
128	type OnChargeTransaction = CurrencyAdapter<pallet_balances::Pallet<Test>, ()>;132	type OnChargeTransaction = CurrencyAdapter<pallet_balances::Pallet<Test>, ()>;
129	type LengthToFee = IdentityFee<u64>;133	type LengthToFee = IdentityFee<u64>;
130	type WeightToFee = IdentityFee<u64>;134	type WeightToFee = IdentityFee<u64>;
197	pub BlockGasLimit: U256 = 0u32.into();201	pub BlockGasLimit: U256 = 0u32.into();
198}202}
203
204impl pallet_ethereum::Config for Test {
205	type Event = Event;
206	type StateRoot = pallet_ethereum::IntermediateStateRoot<Self>;
207}
199208
200impl pallet_evm::Config for Test {209impl pallet_evm::Config for Test {
201	type Event = ();210	type Event = Event;
202	type FeeCalculator = ();211	type FeeCalculator = ();
203	type GasWeightMapping = ();212	type GasWeightMapping = ();
204	type CallOrigin = EnsureAddressNever<Self::CrossAccountId>;213	type CallOrigin = EnsureAddressNever<Self::CrossAccountId>;
221230
222impl pallet_common::Config for Test {231impl pallet_common::Config for Test {
223	type WeightInfo = ();232	type WeightInfo = ();
224	type Event = ();233	type Event = Event;
225	type Currency = Balances;234	type Currency = Balances;
226	type CollectionCreationPrice = CollectionCreationPrice;235	type CollectionCreationPrice = CollectionCreationPrice;
227	type TreasuryAccountId = TreasuryAccountId;236	type TreasuryAccountId = TreasuryAccountId;
240249
241impl pallet_structure::Config for Test {250impl pallet_structure::Config for Test {
242	type WeightInfo = ();251	type WeightInfo = ();
243	type Event = ();252	type Event = Event;
244	type Call = Call;253	type Call = Call;
245}254}
246impl pallet_fungible::Config for Test {255impl 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,
 };