diff --git a/node/service/src/chain_spec/mandala.rs b/node/service/src/chain_spec/mandala.rs index 27da01541..096476199 100644 --- a/node/service/src/chain_spec/mandala.rs +++ b/node/service/src/chain_spec/mandala.rs @@ -464,6 +464,7 @@ fn testnet_genesis( polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(2), }, + phragmen_election: Default::default(), } } @@ -638,5 +639,6 @@ fn mandala_genesis( polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(2), }, + phragmen_election: Default::default(), } } diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs index 5fd832513..ce0084f8b 100644 --- a/runtime/acala/src/lib.rs +++ b/runtime/acala/src/lib.rs @@ -19,8 +19,8 @@ //! The Dev runtime. This can be compiled with `#[no_std]`, ready for Wasm. #![cfg_attr(not(feature = "std"), no_std)] -// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. -#![recursion_limit = "256"] +// `construct_runtime!` does a lot of recursion and requires us to increase the limit. +#![recursion_limit = "512"] #![allow(clippy::unnecessary_mut_passed)] #![allow(clippy::or_fun_call)] #![allow(clippy::from_over_into)] @@ -1538,103 +1538,103 @@ construct_runtime!( UncheckedExtrinsic = UncheckedExtrinsic { // Core & Utility - System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 1, - Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event} = 2, - Utility: pallet_utility::{Pallet, Call, Event} = 3, - Multisig: pallet_multisig::{Pallet, Call, Storage, Event} = 4, - Proxy: pallet_proxy::{Pallet, Call, Storage, Event} = 5, - TransactionPause: module_transaction_pause::{Pallet, Call, Storage, Event} = 6, - IdleScheduler: module_idle_scheduler::{Pallet, Call, Storage, Event} = 7, - Preimage: pallet_preimage::{Pallet, Call, Storage, Event} = 8, + System: frame_system = 0, + Timestamp: pallet_timestamp = 1, + Scheduler: pallet_scheduler = 2, + Utility: pallet_utility = 3, + Multisig: pallet_multisig = 4, + Proxy: pallet_proxy = 5, + TransactionPause: module_transaction_pause = 6, + IdleScheduler: module_idle_scheduler = 7, + Preimage: pallet_preimage = 8, // Tokens & Related - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 10, - Tokens: orml_tokens::{Pallet, Storage, Event, Config} = 11, - Currencies: module_currencies::{Pallet, Call, Event} = 12, - Vesting: orml_vesting::{Pallet, Storage, Call, Event, Config} = 13, - TransactionPayment: module_transaction_payment::{Pallet, Call, Storage, Event} = 14, + Balances: pallet_balances = 10, + Tokens: orml_tokens exclude_parts { Call } = 11, + Currencies: module_currencies = 12, + Vesting: orml_vesting = 13, + TransactionPayment: module_transaction_payment = 14, // Treasury - Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 20, - Bounties: pallet_bounties::{Pallet, Call, Storage, Event} = 21, - Tips: pallet_tips::{Pallet, Call, Storage, Event} = 22, + Treasury: pallet_treasury = 20, + Bounties: pallet_bounties = 21, + Tips: pallet_tips = 22, // Parachain - ParachainInfo: parachain_info::{Pallet, Storage, Config} = 31, + ParachainInfo: parachain_info exclude_parts { Call } = 31, // Collator. The order of the 4 below are important and shall not change. - Authorship: pallet_authorship::{Pallet, Storage} = 40, - CollatorSelection: module_collator_selection::{Pallet, Call, Storage, Event, Config} = 41, - Session: pallet_session::{Pallet, Call, Storage, Event, Config} = 42, - Aura: pallet_aura::{Pallet, Storage, Config} = 43, - AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config} = 44, - SessionManager: module_session_manager::{Pallet, Call, Storage, Event, Config} = 45, + Authorship: pallet_authorship = 40, + CollatorSelection: module_collator_selection = 41, + Session: pallet_session = 42, + Aura: pallet_aura = 43, + AuraExt: cumulus_pallet_aura_ext exclude_parts { Call } = 44, + SessionManager: module_session_manager = 45, // XCM - XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event} = 50, - PolkadotXcm: pallet_xcm::{Pallet, Storage, Call, Event, Origin, Config} = 51, - CumulusXcm: cumulus_pallet_xcm::{Pallet, Event, Origin} = 52, - DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event} = 53, - XTokens: orml_xtokens::{Pallet, Storage, Call, Event} = 54, - UnknownTokens: orml_unknown_tokens::{Pallet, Storage, Event} = 55, - OrmlXcm: orml_xcm::{Pallet, Call, Event} = 56, + XcmpQueue: cumulus_pallet_xcmp_queue = 50, + PolkadotXcm: pallet_xcm = 51, + CumulusXcm: cumulus_pallet_xcm exclude_parts { Call } = 52, + DmpQueue: cumulus_pallet_dmp_queue = 53, + XTokens: orml_xtokens = 54, + UnknownTokens: orml_unknown_tokens exclude_parts { Call } = 55, + OrmlXcm: orml_xcm = 56, // Governance - Authority: orml_authority::{Pallet, Call, Storage, Event, Origin} = 60, - GeneralCouncil: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 61, - GeneralCouncilMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 62, - FinancialCouncil: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 63, - FinancialCouncilMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 64, - HomaCouncil: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 65, - HomaCouncilMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 66, - TechnicalCommittee: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 67, - TechnicalCommitteeMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 68, - Democracy: pallet_democracy::{Pallet, Call, Storage, Config, Event} = 69, + Authority: orml_authority = 60, + GeneralCouncil: pallet_collective:: = 61, + GeneralCouncilMembership: pallet_membership:: = 62, + FinancialCouncil: pallet_collective:: = 63, + FinancialCouncilMembership: pallet_membership:: = 64, + HomaCouncil: pallet_collective:: = 65, + HomaCouncilMembership: pallet_membership:: = 66, + TechnicalCommittee: pallet_collective:: = 67, + TechnicalCommitteeMembership: pallet_membership:: = 68, + Democracy: pallet_democracy = 69, // Oracle // // NOTE: OperatorMembership must be placed after Oracle or else will have race condition on initialization - AcalaOracle: orml_oracle::::{Pallet, Storage, Call, Event} = 70, - OperatorMembershipAcala: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 71, + AcalaOracle: orml_oracle:: = 70, + OperatorMembershipAcala: pallet_membership:: = 71, // ORML Core - Auction: orml_auction::{Pallet, Storage, Call, Event} = 80, - Rewards: orml_rewards::{Pallet, Storage, Call} = 81, - OrmlNFT: orml_nft::{Pallet, Storage, Config} = 82, + Auction: orml_auction = 80, + Rewards: orml_rewards = 81, + OrmlNFT: orml_nft exclude_parts { Call } = 82, // Acala Core - Prices: module_prices::{Pallet, Storage, Call, Event} = 90, - Dex: module_dex::{Pallet, Storage, Call, Event, Config} = 91, - DexOracle: module_dex_oracle::{Pallet, Storage, Call} = 92, + Prices: module_prices = 90, + Dex: module_dex = 91, + DexOracle: module_dex_oracle = 92, // Honzon - AuctionManager: module_auction_manager::{Pallet, Storage, Call, Event, ValidateUnsigned} = 100, - Loans: module_loans::{Pallet, Storage, Call, Event} = 101, - Honzon: module_honzon::{Pallet, Storage, Call, Event} = 102, - CdpTreasury: module_cdp_treasury::{Pallet, Storage, Call, Config, Event} = 103, - CdpEngine: module_cdp_engine::{Pallet, Storage, Call, Event, Config, ValidateUnsigned} = 104, - EmergencyShutdown: module_emergency_shutdown::{Pallet, Storage, Call, Event} = 105, + AuctionManager: module_auction_manager = 100, + Loans: module_loans = 101, + Honzon: module_honzon = 102, + CdpTreasury: module_cdp_treasury = 103, + CdpEngine: module_cdp_engine = 104, + EmergencyShutdown: module_emergency_shutdown = 105, // Homa - Homa: module_homa::{Pallet, Call, Storage, Event} = 116, - XcmInterface: module_xcm_interface::{Pallet, Call, Storage, Event} = 117, + Homa: module_homa = 116, + XcmInterface: module_xcm_interface = 117, // Acala Other - Incentives: module_incentives::{Pallet, Storage, Call, Event} = 120, - NFT: module_nft::{Pallet, Call, Event} = 121, - AssetRegistry: module_asset_registry::{Pallet, Call, Storage, Event} = 122, + Incentives: module_incentives = 120, + NFT: module_nft = 121, + AssetRegistry: module_asset_registry = 122, // Smart contracts - EVM: module_evm::{Pallet, Config, Call, Storage, Event} = 130, - EVMBridge: module_evm_bridge::{Pallet} = 131, - EvmAccounts: module_evm_accounts::{Pallet, Call, Storage, Event} = 132, + EVM: module_evm = 130, + EVMBridge: module_evm_bridge exclude_parts { Call } = 131, + EvmAccounts: module_evm_accounts = 132, // Parachain System, always put it at the end - ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Config, Event} = 30, + ParachainSystem: cumulus_pallet_parachain_system = 30, // Temporary - Sudo: pallet_sudo::{Pallet, Call, Config, Storage, Event} = 255, + Sudo: pallet_sudo = 255, } ); diff --git a/runtime/common/src/mock.rs b/runtime/common/src/mock.rs index e3c4a7929..c76e683d8 100644 --- a/runtime/common/src/mock.rs +++ b/runtime/common/src/mock.rs @@ -235,13 +235,13 @@ frame_support::construct_runtime!( NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - EVM: module_evm::{Pallet, Config, Call, Storage, Event}, - EvmAccounts: module_evm_accounts::{Pallet, Call, Storage, Event}, - Tokens: orml_tokens::{Pallet, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Currencies: orml_currencies::{Pallet, Call, Event}, - IdleScheduler: module_idle_scheduler::{Pallet, Call, Storage, Event}, + System: frame_system, + EVM: module_evm, + EvmAccounts: module_evm_accounts, + Tokens: orml_tokens exclude_parts { Call }, + Balances: pallet_balances, + Currencies: orml_currencies, + IdleScheduler: module_idle_scheduler, } ); diff --git a/runtime/common/src/precompile/mock.rs b/runtime/common/src/precompile/mock.rs index 31ba09cbd..3c5623627 100644 --- a/runtime/common/src/precompile/mock.rs +++ b/runtime/common/src/precompile/mock.rs @@ -563,24 +563,24 @@ frame_support::construct_runtime!( NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Pallet, Call, Storage, Config, Event}, - Oracle: orml_oracle::{Pallet, Storage, Call, Event}, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, - Tokens: orml_tokens::{Pallet, Storage, Event, Config}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Currencies: module_currencies::{Pallet, Call, Event}, - EVMBridge: module_evm_bridge::{Pallet}, - AssetRegistry: module_asset_registry::{Pallet, Call, Storage, Event}, - NFTModule: module_nft::{Pallet, Call, Event}, - TransactionPayment: module_transaction_payment::{Pallet, Call, Storage, Event}, - Prices: module_prices::{Pallet, Storage, Call, Event}, - Proxy: pallet_proxy::{Pallet, Call, Storage, Event}, - Utility: pallet_utility::{Pallet, Call, Event}, - Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event}, - DexModule: module_dex::{Pallet, Storage, Call, Event, Config}, - EVMModule: module_evm::{Pallet, Config, Call, Storage, Event}, - EvmAccounts: module_evm_accounts::{Pallet, Call, Storage, Event}, - IdleScheduler: module_idle_scheduler::{Pallet, Call, Storage, Event}, + System: frame_system, + Oracle: orml_oracle, + Timestamp: pallet_timestamp, + Tokens: orml_tokens exclude_parts { Call }, + Balances: pallet_balances, + Currencies: module_currencies, + EVMBridge: module_evm_bridge exclude_parts { Call }, + AssetRegistry: module_asset_registry, + NFTModule: module_nft, + TransactionPayment: module_transaction_payment, + Prices: module_prices, + Proxy: pallet_proxy, + Utility: pallet_utility, + Scheduler: pallet_scheduler, + DexModule: module_dex, + EVMModule: module_evm, + EvmAccounts: module_evm_accounts, + IdleScheduler: module_idle_scheduler, } ); diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs index 907ea0394..d4cfea82b 100644 --- a/runtime/karura/src/lib.rs +++ b/runtime/karura/src/lib.rs @@ -19,8 +19,8 @@ //! The Dev runtime. This can be compiled with `#[no_std]`, ready for Wasm. #![cfg_attr(not(feature = "std"), no_std)] -// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. -#![recursion_limit = "256"] +// `construct_runtime!` does a lot of recursion and requires us to increase the limit. +#![recursion_limit = "512"] #![allow(clippy::unnecessary_mut_passed)] #![allow(clippy::or_fun_call)] #![allow(clippy::from_over_into)] @@ -759,8 +759,8 @@ parameter_type_with_key! { TokenSymbol::KUSD => cent(*currency_id), TokenSymbol::KSM => 10 * millicent(*currency_id), TokenSymbol::LKSM => 50 * millicent(*currency_id), - TokenSymbol::BNC => 800 * millicent(*currency_id), // 80BNC = 1KSM - TokenSymbol::VSKSM => 10 * millicent(*currency_id), // 1VSKSM = 1KSM + TokenSymbol::BNC => 800 * millicent(*currency_id), // 80BNC = 1KSM + TokenSymbol::VSKSM => 10 * millicent(*currency_id), // 1VSKSM = 1KSM TokenSymbol::PHA => 4000 * millicent(*currency_id), // 400PHA = 1KSM TokenSymbol::KINT => 13333 * microcent(*currency_id), // 1.33 KINT = 1 KSM TokenSymbol::KBTC => 66 * microcent(*currency_id), // 1KBTC = 150 KSM @@ -1635,107 +1635,107 @@ construct_runtime!( UncheckedExtrinsic = UncheckedExtrinsic { // Core & Utility - System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 1, - Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event} = 2, - Utility: pallet_utility::{Pallet, Call, Event} = 3, - Multisig: pallet_multisig::{Pallet, Call, Storage, Event} = 4, - Proxy: pallet_proxy::{Pallet, Call, Storage, Event} = 5, - TransactionPause: module_transaction_pause::{Pallet, Call, Storage, Event} = 6, - IdleScheduler: module_idle_scheduler::{Pallet, Call, Storage, Event} = 7, - Preimage: pallet_preimage::{Pallet, Call, Storage, Event} = 8, + System: frame_system = 0, + Timestamp: pallet_timestamp = 1, + Scheduler: pallet_scheduler = 2, + Utility: pallet_utility = 3, + Multisig: pallet_multisig = 4, + Proxy: pallet_proxy = 5, + TransactionPause: module_transaction_pause = 6, + IdleScheduler: module_idle_scheduler = 7, + Preimage: pallet_preimage = 8, // Tokens & Related - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 10, - Tokens: orml_tokens::{Pallet, Storage, Event, Config} = 11, - Currencies: module_currencies::{Pallet, Call, Event} = 12, - Vesting: orml_vesting::{Pallet, Storage, Call, Event, Config} = 13, - TransactionPayment: module_transaction_payment::{Pallet, Call, Storage, Event} = 14, + Balances: pallet_balances = 10, + Tokens: orml_tokens exclude_parts { Call } = 11, + Currencies: module_currencies = 12, + Vesting: orml_vesting = 13, + TransactionPayment: module_transaction_payment = 14, // Treasury - Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 20, - Bounties: pallet_bounties::{Pallet, Call, Storage, Event} = 21, - Tips: pallet_tips::{Pallet, Call, Storage, Event} = 22, + Treasury: pallet_treasury = 20, + Bounties: pallet_bounties = 21, + Tips: pallet_tips = 22, // Parachain - ParachainInfo: parachain_info::{Pallet, Storage, Config} = 31, + ParachainInfo: parachain_info exclude_parts { Call } = 31, // Collator. The order of the 4 below are important and shall not change. - Authorship: pallet_authorship::{Pallet, Storage} = 40, - CollatorSelection: module_collator_selection::{Pallet, Call, Storage, Event, Config} = 41, - Session: pallet_session::{Pallet, Call, Storage, Event, Config} = 42, - Aura: pallet_aura::{Pallet, Storage, Config} = 43, - AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config} = 44, - SessionManager: module_session_manager::{Pallet, Call, Storage, Event, Config} = 45, + Authorship: pallet_authorship = 40, + CollatorSelection: module_collator_selection = 41, + Session: pallet_session = 42, + Aura: pallet_aura = 43, + AuraExt: cumulus_pallet_aura_ext exclude_parts { Call } = 44, + SessionManager: module_session_manager = 45, // XCM - XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event} = 50, - PolkadotXcm: pallet_xcm::{Pallet, Storage, Call, Event, Origin, Config} = 51, - CumulusXcm: cumulus_pallet_xcm::{Pallet, Event, Origin} = 52, - DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event} = 53, - XTokens: orml_xtokens::{Pallet, Storage, Call, Event} = 54, - UnknownTokens: orml_unknown_tokens::{Pallet, Storage, Event} = 55, - OrmlXcm: orml_xcm::{Pallet, Call, Event} = 56, + XcmpQueue: cumulus_pallet_xcmp_queue = 50, + PolkadotXcm: pallet_xcm = 51, + CumulusXcm: cumulus_pallet_xcm exclude_parts { Call } = 52, + DmpQueue: cumulus_pallet_dmp_queue = 53, + XTokens: orml_xtokens = 54, + UnknownTokens: orml_unknown_tokens exclude_parts { Call } = 55, + OrmlXcm: orml_xcm = 56, // Governance - Authority: orml_authority::{Pallet, Call, Storage, Event, Origin} = 60, - GeneralCouncil: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 61, - GeneralCouncilMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 62, - FinancialCouncil: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 63, - FinancialCouncilMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 64, - HomaCouncil: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 65, - HomaCouncilMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 66, - TechnicalCommittee: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 67, - TechnicalCommitteeMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 68, - Democracy: pallet_democracy::{Pallet, Call, Storage, Config, Event} = 69, + Authority: orml_authority = 60, + GeneralCouncil: pallet_collective:: = 61, + GeneralCouncilMembership: pallet_membership:: = 62, + FinancialCouncil: pallet_collective:: = 63, + FinancialCouncilMembership: pallet_membership:: = 64, + HomaCouncil: pallet_collective:: = 65, + HomaCouncilMembership: pallet_membership:: = 66, + TechnicalCommittee: pallet_collective:: = 67, + TechnicalCommitteeMembership: pallet_membership:: = 68, + Democracy: pallet_democracy = 69, // Oracle // // NOTE: OperatorMembership must be placed after Oracle or else will have race condition on initialization - AcalaOracle: orml_oracle::::{Pallet, Storage, Call, Event} = 70, - OperatorMembershipAcala: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 71, + AcalaOracle: orml_oracle:: = 70, + OperatorMembershipAcala: pallet_membership:: = 71, // ORML Core - Auction: orml_auction::{Pallet, Storage, Call, Event} = 80, - Rewards: orml_rewards::{Pallet, Storage, Call} = 81, - OrmlNFT: orml_nft::{Pallet, Storage, Config} = 82, + Auction: orml_auction = 80, + Rewards: orml_rewards = 81, + OrmlNFT: orml_nft exclude_parts { Call } = 82, // Karura Core - Prices: module_prices::{Pallet, Storage, Call, Event} = 90, - Dex: module_dex::{Pallet, Storage, Call, Event, Config} = 91, - DexOracle: module_dex_oracle::{Pallet, Storage, Call} = 92, + Prices: module_prices = 90, + Dex: module_dex = 91, + DexOracle: module_dex_oracle = 92, // Honzon - AuctionManager: module_auction_manager::{Pallet, Storage, Call, Event, ValidateUnsigned} = 100, - Loans: module_loans::{Pallet, Storage, Call, Event} = 101, - Honzon: module_honzon::{Pallet, Storage, Call, Event} = 102, - CdpTreasury: module_cdp_treasury::{Pallet, Storage, Call, Config, Event} = 103, - CdpEngine: module_cdp_engine::{Pallet, Storage, Call, Event, Config, ValidateUnsigned} = 104, - EmergencyShutdown: module_emergency_shutdown::{Pallet, Storage, Call, Event} = 105, - HonzonBridge: module_honzon_bridge::{Pallet, Call, Event} = 106, + AuctionManager: module_auction_manager = 100, + Loans: module_loans = 101, + Honzon: module_honzon = 102, + CdpTreasury: module_cdp_treasury = 103, + CdpEngine: module_cdp_engine = 104, + EmergencyShutdown: module_emergency_shutdown = 105, + HonzonBridge: module_honzon_bridge = 106, // Homa - Homa: module_homa::{Pallet, Call, Storage, Event} = 116, - XcmInterface: module_xcm_interface::{Pallet, Call, Storage, Event} = 117, + Homa: module_homa = 116, + XcmInterface: module_xcm_interface = 117, // Karura Other - Incentives: module_incentives::{Pallet, Storage, Call, Event} = 120, - NFT: module_nft::{Pallet, Call, Event} = 121, - AssetRegistry: module_asset_registry::{Pallet, Call, Storage, Event} = 122, + Incentives: module_incentives = 120, + NFT: module_nft = 121, + AssetRegistry: module_asset_registry = 122, // Smart contracts - EVM: module_evm::{Pallet, Config, Call, Storage, Event} = 130, - EVMBridge: module_evm_bridge::{Pallet} = 131, - EvmAccounts: module_evm_accounts::{Pallet, Call, Storage, Event} = 132, + EVM: module_evm = 130, + EVMBridge: module_evm_bridge exclude_parts { Call } = 131, + EvmAccounts: module_evm_accounts = 132, // Stable asset - StableAsset: nutsfinance_stable_asset::{Pallet, Call, Storage, Event} = 200, + StableAsset: nutsfinance_stable_asset = 200, // Parachain System, always put it at the end - ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Config, Event} = 30, + ParachainSystem: cumulus_pallet_parachain_system = 30, // Temporary - Sudo: pallet_sudo::{Pallet, Call, Config, Storage, Event} = 255, + Sudo: pallet_sudo = 255, } ); diff --git a/runtime/mandala/src/lib.rs b/runtime/mandala/src/lib.rs index e64fb89d3..5c72ade04 100644 --- a/runtime/mandala/src/lib.rs +++ b/runtime/mandala/src/lib.rs @@ -19,8 +19,8 @@ //! The Dev runtime. This can be compiled with `#[no_std]`, ready for Wasm. #![cfg_attr(not(feature = "std"), no_std)] -// `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. -#![recursion_limit = "256"] +// `construct_runtime!` does a lot of recursion and requires us to increase the limit. +#![recursion_limit = "512"] #![allow(clippy::unnecessary_mut_passed)] #![allow(clippy::or_fun_call)] #![allow(clippy::from_over_into)] @@ -773,8 +773,8 @@ parameter_type_with_key! { TokenSymbol::AUSD => cent(*currency_id), TokenSymbol::DOT => 10 * millicent(*currency_id), TokenSymbol::LDOT => 50 * millicent(*currency_id), - TokenSymbol::BNC => 800 * millicent(*currency_id), // 80BNC = 1KSM - TokenSymbol::VSKSM => 10 * millicent(*currency_id), // 1VSKSM = 1KSM + TokenSymbol::BNC => 800 * millicent(*currency_id), // 80BNC = 1KSM + TokenSymbol::VSKSM => 10 * millicent(*currency_id), // 1VSKSM = 1KSM TokenSymbol::PHA => 4000 * millicent(*currency_id), // 400PHA = 1KSM TokenSymbol::KUSD | TokenSymbol::KSM | @@ -1842,131 +1842,131 @@ impl OnRuntimeUpgrade for TransactionPaymentMigration { } } -construct_runtime! { +construct_runtime!( pub enum Runtime where Block = Block, NodeBlock = primitives::Block, UncheckedExtrinsic = UncheckedExtrinsic { // Core - System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, - Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 1, - Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event} = 2, - TransactionPause: module_transaction_pause::{Pallet, Call, Storage, Event} = 3, - Preimage: pallet_preimage::{Pallet, Call, Storage, Event} = 4, + System: frame_system = 0, + Timestamp: pallet_timestamp = 1, + Scheduler: pallet_scheduler = 2, + TransactionPause: module_transaction_pause = 3, + Preimage: pallet_preimage = 4, // Tokens & Related - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event} = 10, - Tokens: orml_tokens::{Pallet, Storage, Event, Config} = 11, - Currencies: module_currencies::{Pallet, Call, Event} = 12, - Vesting: orml_vesting::{Pallet, Storage, Call, Event, Config} = 13, - TransactionPayment: module_transaction_payment::{Pallet, Call, Storage, Event} = 14, + Balances: pallet_balances = 10, + Tokens: orml_tokens exclude_parts { Call } = 11, + Currencies: module_currencies = 12, + Vesting: orml_vesting = 13, + TransactionPayment: module_transaction_payment = 14, // Treasury - Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event} = 20, - Bounties: pallet_bounties::{Pallet, Call, Storage, Event} = 21, - Tips: pallet_tips::{Pallet, Call, Storage, Event} = 22, + Treasury: pallet_treasury = 20, + Bounties: pallet_bounties = 21, + Tips: pallet_tips = 22, // Utility - Utility: pallet_utility::{Pallet, Call, Event} = 30, - Multisig: pallet_multisig::{Pallet, Call, Storage, Event} = 31, - Recovery: pallet_recovery::{Pallet, Call, Storage, Event} = 32, - Proxy: pallet_proxy::{Pallet, Call, Storage, Event} = 33, - IdleScheduler: module_idle_scheduler::{Pallet, Call, Storage, Event} = 34, + Utility: pallet_utility = 30, + Multisig: pallet_multisig = 31, + Recovery: pallet_recovery = 32, + Proxy: pallet_proxy = 33, + IdleScheduler: module_idle_scheduler = 34, - Indices: pallet_indices::{Pallet, Call, Storage, Config, Event} = 40, + Indices: pallet_indices = 40, // Governance - GeneralCouncil: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 50, - GeneralCouncilMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 51, - FinancialCouncil: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 52, - FinancialCouncilMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 53, - HomaCouncil: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 54, - HomaCouncilMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 55, - TechnicalCommittee: pallet_collective::::{Pallet, Call, Storage, Origin, Event, Config} = 56, - TechnicalCommitteeMembership: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 57, - - Authority: orml_authority::{Pallet, Call, Storage, Event, Origin} = 70, - PhragmenElection: pallet_elections_phragmen::{Pallet, Call, Storage, Event} = 71, - Democracy: pallet_democracy::{Pallet, Call, Storage, Config, Event} = 72, + GeneralCouncil: pallet_collective:: = 50, + GeneralCouncilMembership: pallet_membership:: = 51, + FinancialCouncil: pallet_collective:: = 52, + FinancialCouncilMembership: pallet_membership:: = 53, + HomaCouncil: pallet_collective:: = 54, + HomaCouncilMembership: pallet_membership:: = 55, + TechnicalCommittee: pallet_collective:: = 56, + TechnicalCommitteeMembership: pallet_membership:: = 57, + + Authority: orml_authority = 70, + PhragmenElection: pallet_elections_phragmen = 71, + Democracy: pallet_democracy = 72, // Oracle // // NOTE: OperatorMembership must be placed after Oracle or else will have race condition on initialization - AcalaOracle: orml_oracle::::{Pallet, Storage, Call, Event} = 80, - OperatorMembershipAcala: pallet_membership::::{Pallet, Call, Storage, Event, Config} = 82, + AcalaOracle: orml_oracle:: = 80, + OperatorMembershipAcala: pallet_membership:: = 82, // ORML Core - Auction: orml_auction::{Pallet, Storage, Call, Event} = 100, - Rewards: orml_rewards::{Pallet, Storage, Call} = 101, - OrmlNFT: orml_nft::{Pallet, Storage, Config} = 102, + Auction: orml_auction = 100, + Rewards: orml_rewards = 101, + OrmlNFT: orml_nft exclude_parts { Call } = 102, // Acala Core - Prices: module_prices::{Pallet, Storage, Call, Event} = 110, - Dex: module_dex::{Pallet, Storage, Call, Event, Config} = 111, - DexOracle: module_dex_oracle::{Pallet, Storage, Call} = 112, + Prices: module_prices = 110, + Dex: module_dex = 111, + DexOracle: module_dex_oracle = 112, // Honzon - AuctionManager: module_auction_manager::{Pallet, Storage, Call, Event, ValidateUnsigned} = 120, - Loans: module_loans::{Pallet, Storage, Call, Event} = 121, - Honzon: module_honzon::{Pallet, Storage, Call, Event} = 122, - CdpTreasury: module_cdp_treasury::{Pallet, Storage, Call, Config, Event} = 123, - CdpEngine: module_cdp_engine::{Pallet, Storage, Call, Event, Config, ValidateUnsigned} = 124, - EmergencyShutdown: module_emergency_shutdown::{Pallet, Storage, Call, Event} = 125, + AuctionManager: module_auction_manager = 120, + Loans: module_loans = 121, + Honzon: module_honzon = 122, + CdpTreasury: module_cdp_treasury = 123, + CdpEngine: module_cdp_engine = 124, + EmergencyShutdown: module_emergency_shutdown = 125, // Homa - NomineesElection: module_nominees_election::{Pallet, Call, Storage, Event} = 131, - Homa: module_homa::{Pallet, Call, Storage, Event} = 136, - XcmInterface: module_xcm_interface::{Pallet, Call, Storage, Event} = 137, + NomineesElection: module_nominees_election = 131, + Homa: module_homa = 136, + XcmInterface: module_xcm_interface = 137, // Acala Other - Incentives: module_incentives::{Pallet, Storage, Call, Event} = 140, - NFT: module_nft::{Pallet, Call, Event} = 141, - AssetRegistry: module_asset_registry::{Pallet, Call, Storage, Event} = 142, + Incentives: module_incentives = 140, + NFT: module_nft = 141, + AssetRegistry: module_asset_registry = 142, // Ecosystem modules - RenVmBridge: ecosystem_renvm_bridge::{Pallet, Call, Config, Storage, Event, ValidateUnsigned} = 150, - Starport: ecosystem_starport::{Pallet, Call, Storage, Event, Config} = 151, - CompoundCash: ecosystem_compound_cash::{Pallet, Storage, Event} = 152, + RenVmBridge: ecosystem_renvm_bridge = 150, + Starport: ecosystem_starport = 151, + CompoundCash: ecosystem_compound_cash exclude_parts { Call } = 152, // Parachain - ParachainInfo: parachain_info::{Pallet, Storage, Config} = 161, + ParachainInfo: parachain_info exclude_parts { Call } = 161, // XCM - XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event} = 170, - PolkadotXcm: pallet_xcm::{Pallet, Storage, Call, Event, Origin, Config} = 171, - CumulusXcm: cumulus_pallet_xcm::{Pallet, Event, Origin} = 172, - DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event} = 173, - XTokens: orml_xtokens::{Pallet, Storage, Call, Event} = 174, - UnknownTokens: orml_unknown_tokens::{Pallet, Storage, Event} = 175, - OrmlXcm: orml_xcm::{Pallet, Call, Event} = 176, + XcmpQueue: cumulus_pallet_xcmp_queue = 170, + PolkadotXcm: pallet_xcm = 171, + CumulusXcm: cumulus_pallet_xcm exclude_parts { Call } = 172, + DmpQueue: cumulus_pallet_dmp_queue = 173, + XTokens: orml_xtokens = 174, + UnknownTokens: orml_unknown_tokens exclude_parts { Call } = 175, + OrmlXcm: orml_xcm = 176, // Smart contracts - EVM: module_evm::{Pallet, Config, Call, Storage, Event} = 180, - EVMBridge: module_evm_bridge::{Pallet} = 181, - EvmAccounts: module_evm_accounts::{Pallet, Call, Storage, Event} = 182, + EVM: module_evm = 180, + EVMBridge: module_evm_bridge exclude_parts { Call } = 181, + EvmAccounts: module_evm_accounts = 182, // Collator support. the order of these 4 are important and shall not change. - Authorship: pallet_authorship::{Pallet, Call, Storage} = 190, - CollatorSelection: module_collator_selection::{Pallet, Call, Storage, Event, Config} = 191, - Session: pallet_session::{Pallet, Call, Storage, Event, Config} = 192, - Aura: pallet_aura::{Pallet, Storage, Config} = 193, - AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config} = 194, - SessionManager: module_session_manager::{Pallet, Call, Storage, Event, Config} = 195, + Authorship: pallet_authorship = 190, + CollatorSelection: module_collator_selection = 191, + Session: pallet_session = 192, + Aura: pallet_aura = 193, + AuraExt: cumulus_pallet_aura_ext exclude_parts { Call } = 194, + SessionManager: module_session_manager = 195, // Stable asset - StableAsset: nutsfinance_stable_asset::{Pallet, Call, Storage, Event} = 200, + StableAsset: nutsfinance_stable_asset = 200, // Staking related pallets - Earning: module_earning::{Pallet, Call, Storage, Event} = 210, + Earning: module_earning = 210, // Parachain System, always put it at the end - ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Config, Event} = 160, + ParachainSystem: cumulus_pallet_parachain_system = 160, // Dev - Sudo: pallet_sudo::{Pallet, Call, Config, Storage, Event} = 255, + Sudo: pallet_sudo = 255, } -} +); #[cfg(feature = "runtime-benchmarks")] #[macro_use]