Align Call Indices between Westmint and Statemint (#731)

* align construct_runtime calls between statemint runtimes

* bump westmint transaction_version
This commit is contained in:
Alexander Popiak
2021-11-09 17:39:50 +01:00
committed by GitHub
parent 8301e17f88
commit 6146bd182c
3 changed files with 37 additions and 34 deletions
+3 -2
View File
@@ -722,6 +722,7 @@ construct_runtime!(
ParachainSystem: cumulus_pallet_parachain_system::{ ParachainSystem: cumulus_pallet_parachain_system::{
Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned, Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned,
} = 1, } = 1,
// RandomnessCollectiveFlip = 2 removed
Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3,
ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4, ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4,
@@ -730,7 +731,7 @@ construct_runtime!(
TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 11, TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 11,
AssetTxPayment: pallet_asset_tx_payment::{Pallet} = 12, AssetTxPayment: pallet_asset_tx_payment::{Pallet} = 12,
// Collator support. the order of these 4 are important and shall not change. // Collator support. the order of these 5 are important and shall not change.
Authorship: pallet_authorship::{Pallet, Call, Storage} = 20, Authorship: pallet_authorship::{Pallet, Call, Storage} = 20,
CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>} = 21, CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>} = 21,
Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 22, Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 22,
@@ -748,7 +749,7 @@ construct_runtime!(
Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 41, Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 41,
Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 42, Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 42,
// The main stage. To include pallet-assets-freezer and pallet-uniques. // The main stage.
Assets: pallet_assets::{Pallet, Call, Storage, Event<T>} = 50, Assets: pallet_assets::{Pallet, Call, Storage, Event<T>} = 50,
Uniques: pallet_uniques::{Pallet, Call, Storage, Event<T>} = 51, Uniques: pallet_uniques::{Pallet, Call, Storage, Event<T>} = 51,
} }
+3 -2
View File
@@ -725,6 +725,7 @@ construct_runtime!(
ParachainSystem: cumulus_pallet_parachain_system::{ ParachainSystem: cumulus_pallet_parachain_system::{
Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned, Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned,
} = 1, } = 1,
// RandomnessCollectiveFlip = 2 removed
Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3,
ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4, ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4,
@@ -733,7 +734,7 @@ construct_runtime!(
TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 11, TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 11,
AssetTxPayment: pallet_asset_tx_payment::{Pallet} = 12, AssetTxPayment: pallet_asset_tx_payment::{Pallet} = 12,
// Collator support. the order of these 4 are important and shall not change. // Collator support. the order of these 5 are important and shall not change.
Authorship: pallet_authorship::{Pallet, Call, Storage} = 20, Authorship: pallet_authorship::{Pallet, Call, Storage} = 20,
CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>} = 21, CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>} = 21,
Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 22, Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 22,
@@ -751,7 +752,7 @@ construct_runtime!(
Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 41, Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 41,
Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 42, Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 42,
// The main stage. To include pallet-assets-freezer and pallet-uniques. // The main stage.
Assets: pallet_assets::{Pallet, Call, Storage, Event<T>} = 50, Assets: pallet_assets::{Pallet, Call, Storage, Event<T>} = 50,
Uniques: pallet_uniques::{Pallet, Call, Storage, Event<T>} = 51, Uniques: pallet_uniques::{Pallet, Call, Storage, Event<T>} = 51,
} }
+31 -30
View File
@@ -94,7 +94,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_version: 504, spec_version: 504,
impl_version: 0, impl_version: 0,
apis: RUNTIME_API_VERSIONS, apis: RUNTIME_API_VERSIONS,
transaction_version: 3, transaction_version: 4,
}; };
/// The version information used to identify this runtime when compiled natively. /// The version information used to identify this runtime when compiled natively.
@@ -696,43 +696,44 @@ construct_runtime!(
NodeBlock = opaque::Block, NodeBlock = opaque::Block,
UncheckedExtrinsic = UncheckedExtrinsic, UncheckedExtrinsic = UncheckedExtrinsic,
{ {
// System support stuff; // System support stuff.
System: frame_system::{Pallet, Call, Config, Storage, Event<T>}, System: frame_system::{Pallet, Call, Config, Storage, Event<T>} = 0,
ParachainSystem: cumulus_pallet_parachain_system::{ ParachainSystem: cumulus_pallet_parachain_system::{
Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned, Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned,
}, } = 1,
Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, // RandomnessCollectiveFlip = 2 removed
ParachainInfo: parachain_info::{Pallet, Storage, Config}, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 3,
Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>}, ParachainInfo: parachain_info::{Pallet, Storage, Config} = 4,
// Monetary stuff; // Monetary stuff.
Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>}, Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 10,
TransactionPayment: pallet_transaction_payment::{Pallet, Storage}, TransactionPayment: pallet_transaction_payment::{Pallet, Storage} = 11,
AssetTxPayment: pallet_asset_tx_payment::{Pallet} = 12,
// Collator support. the order of these 4 are important and shall not change. // Collator support. the order of these 5 are important and shall not change.
Authorship: pallet_authorship::{Pallet, Call, Storage}, Authorship: pallet_authorship::{Pallet, Call, Storage} = 20,
CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>}, CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>} = 21,
Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>}, Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 22,
Aura: pallet_aura::{Pallet, Storage, Config<T>}, Aura: pallet_aura::{Pallet, Storage, Config<T>} = 23,
AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config}, AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config} = 24,
// The main stage.
Utility: pallet_utility::{Pallet, Call, Event},
Assets: pallet_assets::{Pallet, Call, Storage, Event<T>},
Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>},
Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>},
// XCM helpers. // XCM helpers.
XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>}, XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin}, PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 31,
CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin}, CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>}, DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,
// More things for the main stage // Handy utilities.
Uniques: pallet_uniques::{Pallet, Call, Storage, Event<T>}, Utility: pallet_utility::{Pallet, Call, Event} = 40,
Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>} = 41,
Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 42,
// More Monetary stuff // The main stage.
AssetTxPayment: pallet_asset_tx_payment::{Pallet}, Assets: pallet_assets::{Pallet, Call, Storage, Event<T>} = 50,
Uniques: pallet_uniques::{Pallet, Call, Storage, Event<T>} = 51,
// Sudo pallet to force root
Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>} = 255,
} }
); );