difftreelog
Merge pull request #993 from UniqueNetwork/fix/governance-with-batch
in: master
Fix/governance with batch
10 files changed
Cargo.tomldiffbeforeafterboth--- a/Cargo.toml
+++ b/Cargo.toml
@@ -119,6 +119,7 @@
pallet-state-trie-migration = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
+pallet-utility = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
pallet-transaction-payment = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
pallet-transaction-payment-rpc-runtime-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
runtime/common/config/governance/technical_committee.rsdiffbeforeafterboth--- a/runtime/common/config/governance/technical_committee.rs
+++ b/runtime/common/config/governance/technical_committee.rs
@@ -38,7 +38,7 @@
type RemoveOrigin = RootOrMoreThanHalfCouncil;
type SwapOrigin = RootOrMoreThanHalfCouncil;
type ResetOrigin = EnsureRoot<AccountId>;
- type PrimeOrigin = EnsureRoot<AccountId>;
+ type PrimeOrigin = RootOrMoreThanHalfCouncil;
type MembershipInitialized = TechnicalCommittee;
type MembershipChanged = TechnicalCommittee;
type MaxMembers = TechnicalMaxMembers;
runtime/common/config/substrate.rsdiffbeforeafterboth--- a/runtime/common/config/substrate.rs
+++ b/runtime/common/config/substrate.rs
@@ -35,8 +35,8 @@
};
use pallet_transaction_payment::{Multiplier, ConstFeeMultiplier};
use crate::{
- runtime_common::DealWithFees, Runtime, RuntimeEvent, RuntimeCall, RuntimeOrigin, PalletInfo,
- System, Balances, SS58Prefix, Version,
+ runtime_common::DealWithFees, Runtime, RuntimeEvent, RuntimeCall, RuntimeOrigin, OriginCaller,
+ PalletInfo, System, Balances, SS58Prefix, Version,
};
use up_common::{types::*, constants::*};
use sp_std::vec;
@@ -248,3 +248,10 @@
type DisabledValidators = ();
type MaxAuthorities = MaxAuthorities;
}
+
+impl pallet_utility::Config for Runtime {
+ type RuntimeEvent = RuntimeEvent;
+ type RuntimeCall = RuntimeCall;
+ type PalletsOrigin = OriginCaller;
+ type WeightInfo = pallet_utility::weights::SubstrateWeight<Self>;
+}
runtime/common/construct_runtime.rsdiffbeforeafterboth--- a/runtime/common/construct_runtime.rs
+++ b/runtime/common/construct_runtime.rs
@@ -136,6 +136,8 @@
BalancesAdapter: pallet_balances_adapter = 155,
+ Utility: pallet_utility = 156,
+
#[cfg(feature = "pallet-test-utils")]
TestUtils: pallet_test_utils = 255,
}
runtime/opal/Cargo.tomldiffbeforeafterboth1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Opal Runtime'8edition = '2021'9homepage = 'https://unique.network'10license = 'GPLv3'11name = 'opal-runtime'12repository = 'https://github.com/UniqueNetwork/unique-chain'13version.workspace = true1415[package.metadata.docs.rs]16targets = ['x86_64-unknown-linux-gnu']1718[features]19default = ['opal-runtime', 'std']20limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']21opal-runtime = [22 'app-promotion',23 'collator-selection',24 'foreign-assets',25 'governance',26 'pallet-test-utils',27 'preimage',28 'refungible',29]30pov-estimate = []31runtime-benchmarks = [32 "pallet-preimage/runtime-benchmarks",33 'cumulus-pallet-parachain-system/runtime-benchmarks',34 'frame-benchmarking',35 'frame-support/runtime-benchmarks',36 'frame-system-benchmarking',37 'frame-system/runtime-benchmarks',38 'pallet-app-promotion/runtime-benchmarks',39 'pallet-balances/runtime-benchmarks',40 'pallet-collator-selection/runtime-benchmarks',41 'pallet-common/runtime-benchmarks',42 'pallet-configuration/runtime-benchmarks',43 'pallet-ethereum/runtime-benchmarks',44 'pallet-evm-coder-substrate/runtime-benchmarks',45 'pallet-evm-migration/runtime-benchmarks',46 'pallet-foreign-assets/runtime-benchmarks',47 'pallet-fungible/runtime-benchmarks',48 'pallet-identity/runtime-benchmarks',49 'pallet-inflation/runtime-benchmarks',50 'pallet-maintenance/runtime-benchmarks',51 'pallet-nonfungible/runtime-benchmarks',52 'pallet-democracy/runtime-benchmarks',53 'pallet-collective/runtime-benchmarks',54 'pallet-ranked-collective/runtime-benchmarks',55 'pallet-membership/runtime-benchmarks',56 'pallet-referenda/runtime-benchmarks',57 'pallet-scheduler/runtime-benchmarks',58 'pallet-refungible/runtime-benchmarks',59 'pallet-structure/runtime-benchmarks',60 'pallet-timestamp/runtime-benchmarks',61 'pallet-unique-scheduler-v2/runtime-benchmarks',62 'pallet-unique/runtime-benchmarks',63 'pallet-xcm/runtime-benchmarks',64 'sp-runtime/runtime-benchmarks',65 'xcm-builder/runtime-benchmarks',66]67std = [68 'codec/std',69 'cumulus-pallet-aura-ext/std',70 'cumulus-pallet-parachain-system/std',71 'cumulus-pallet-xcm/std',72 'cumulus-pallet-xcmp-queue/std',73 'cumulus-primitives-core/std',74 'cumulus-primitives-utility/std',75 'frame-executive/std',76 'frame-support/std',77 'frame-system-rpc-runtime-api/std',78 'frame-system/std',79 'frame-try-runtime/std',80 'pallet-aura/std',81 'pallet-balances/std',82 'pallet-democracy/std',83 'pallet-collective/std',84 'pallet-ranked-collective/std',85 'pallet-membership/std',86 'pallet-referenda/std',87 'pallet-gov-origins/std',88 'pallet-scheduler/std',89 # 'pallet-contracts/std',90 # 'pallet-contracts-primitives/std',91 # 'pallet-contracts-rpc-runtime-api/std',92 # 'pallet-contract-helpers/std',93 "pallet-authorship/std",94 "pallet-preimage/std",95 "pallet-session/std",96 "pallet-state-trie-migration/std",97 "sp-consensus-aura/std",98 'app-promotion-rpc/std',99 'evm-coder/std',100 'fp-rpc/std',101 'fp-self-contained/std',102 'pallet-app-promotion/std',103 'pallet-balances-adapter/std',104 'pallet-base-fee/std',105 'pallet-charge-transaction/std',106 'pallet-collator-selection/std',107 'pallet-common/std',108 'pallet-configuration/std',109 'pallet-ethereum/std',110 'pallet-evm-coder-substrate/std',111 'pallet-evm-contract-helpers/std',112 'pallet-evm-migration/std',113 'pallet-evm-transaction-payment/std',114 'pallet-evm/std',115 'pallet-fungible/std',116 'pallet-identity/std',117 'pallet-inflation/std',118 'pallet-nonfungible/std',119 'pallet-refungible/std',120 'pallet-structure/std',121 'pallet-sudo/std',122 'pallet-timestamp/std',123 'pallet-transaction-payment-rpc-runtime-api/std',124 'pallet-transaction-payment/std',125 'pallet-treasury/std',126 'pallet-unique-scheduler-v2/std',127 'pallet-unique/std',128 'parachain-info/std',129 'serde',130 'sp-api/std',131 'sp-block-builder/std',132 'sp-core/std',133 'sp-inherents/std',134 'sp-io/std',135 'sp-offchain/std',136 'sp-runtime/std',137 'sp-session/std',138 'sp-std/std',139 'sp-transaction-pool/std',140 'sp-version/std',141 'up-common/std',142 'up-data-structs/std',143 'up-pov-estimate-rpc/std',144 'up-rpc/std',145 'up-sponsorship/std',146 'xcm-builder/std',147 'xcm-executor/std',148 'xcm/std',149150 "orml-tokens/std",151 "orml-traits/std",152 "orml-vesting/std",153 "orml-xcm-support/std",154 "orml-xtokens/std",155 "pallet-foreign-assets/std",156157 'pallet-maintenance/std',158 'pallet-test-utils?/std',159]160try-runtime = [161 "pallet-authorship/try-runtime",162 "pallet-collator-selection/try-runtime",163 "pallet-identity/try-runtime",164 "pallet-preimage/try-runtime",165 "pallet-session/try-runtime",166 "pallet-state-trie-migration/try-runtime",167 'cumulus-pallet-aura-ext/try-runtime',168 'cumulus-pallet-dmp-queue/try-runtime',169 'cumulus-pallet-parachain-system/try-runtime',170 'cumulus-pallet-xcm/try-runtime',171 'cumulus-pallet-xcmp-queue/try-runtime',172 'fp-self-contained/try-runtime',173 'frame-executive/try-runtime',174 'frame-support/try-runtime',175 'frame-system/try-runtime',176 'frame-try-runtime',177 'frame-try-runtime?/try-runtime',178 'orml-tokens/try-runtime',179 'orml-vesting/try-runtime',180 'orml-xtokens/try-runtime',181 'pallet-app-promotion/try-runtime',182 'pallet-aura/try-runtime',183 'pallet-balances-adapter/try-runtime',184 'pallet-balances/try-runtime',185 'pallet-base-fee/try-runtime',186 'pallet-charge-transaction/try-runtime',187 'pallet-collective/try-runtime',188 'pallet-common/try-runtime',189 'pallet-configuration/try-runtime',190 'pallet-democracy/try-runtime',191 'pallet-ethereum/try-runtime',192 'pallet-evm-coder-substrate/try-runtime',193 'pallet-evm-contract-helpers/try-runtime',194 'pallet-evm-migration/try-runtime',195 'pallet-evm-transaction-payment/try-runtime',196 'pallet-evm/try-runtime',197 'pallet-foreign-assets/try-runtime',198 'pallet-fungible/try-runtime',199 'pallet-inflation/try-runtime',200 'pallet-maintenance/try-runtime',201 'pallet-membership/try-runtime',202 'pallet-nonfungible/try-runtime',203 'pallet-democracy/try-runtime',204 'pallet-collective/try-runtime',205 'pallet-ranked-collective/try-runtime',206 'pallet-membership/try-runtime',207 'pallet-referenda/try-runtime',208 'pallet-gov-origins/try-runtime',209 'pallet-scheduler/try-runtime',210 'pallet-refungible/try-runtime',211 'pallet-scheduler/try-runtime',212 'pallet-structure/try-runtime',213 'pallet-sudo/try-runtime',214 'pallet-test-utils?/try-runtime',215 'pallet-timestamp/try-runtime',216 'pallet-transaction-payment/try-runtime',217 'pallet-treasury/try-runtime',218 'pallet-unique-scheduler-v2/try-runtime',219 'pallet-unique/try-runtime',220 'pallet-xcm/try-runtime',221 'parachain-info/try-runtime',222]223224app-promotion = []225collator-selection = []226foreign-assets = []227governance = []228gov-test-timings = []229preimage = []230refungible = []231unique-scheduler = []232session-test-timings = []233234################################################################################235# local dependencies236237[dependencies]238# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it.239codec = { workspace = true, package = "parity-scale-codec" }240241cumulus-pallet-aura-ext = { workspace = true }242cumulus-pallet-dmp-queue = { workspace = true }243cumulus-pallet-parachain-system = { workspace = true }244cumulus-pallet-xcm = { workspace = true }245cumulus-pallet-xcmp-queue = { workspace = true }246cumulus-primitives-core = { workspace = true }247cumulus-primitives-timestamp = { workspace = true }248cumulus-primitives-utility = { workspace = true }249frame-executive = { workspace = true }250frame-support = { workspace = true }251frame-system = { workspace = true }252frame-system-rpc-runtime-api = { workspace = true }253orml-tokens = { workspace = true }254orml-traits = { workspace = true }255orml-vesting = { workspace = true }256orml-xcm-support = { workspace = true }257orml-xtokens = { workspace = true }258pallet-aura = { workspace = true }259pallet-authorship = { workspace = true }260pallet-balances = { features = ["insecure_zero_ed"], workspace = true }261pallet-preimage = { workspace = true }262pallet-session = { workspace = true }263pallet-state-trie-migration = { workspace = true }264pallet-sudo = { workspace = true }265pallet-timestamp = { workspace = true }266pallet-transaction-payment = { workspace = true }267pallet-transaction-payment-rpc-runtime-api = { workspace = true }268pallet-treasury = { workspace = true }269pallet-xcm = { workspace = true }270parachain-info = { workspace = true }271polkadot-parachain = { workspace = true }272smallvec = { workspace = true }273sp-api = { workspace = true }274sp-arithmetic = { workspace = true }275sp-block-builder = { workspace = true }276sp-consensus-aura = { workspace = true }277sp-core = { workspace = true }278sp-inherents = { workspace = true }279sp-io = { workspace = true }280sp-offchain = { workspace = true }281sp-runtime = { workspace = true }282sp-session = { workspace = true }283sp-std = { workspace = true }284sp-transaction-pool = { workspace = true }285sp-version = { workspace = true }286xcm = { workspace = true }287xcm-builder = { workspace = true }288xcm-executor = { workspace = true }289290app-promotion-rpc = { workspace = true }291derivative = { workspace = true }292evm-coder = { workspace = true }293fp-evm = { workspace = true }294fp-rpc = { workspace = true }295fp-self-contained = { workspace = true }296log = { workspace = true }297num_enum = { workspace = true }298pallet-app-promotion = { workspace = true }299pallet-balances-adapter = { workspace = true }300pallet-base-fee = { workspace = true }301pallet-charge-transaction = { workspace = true }302pallet-collator-selection = { workspace = true }303pallet-common = { workspace = true }304pallet-configuration = { workspace = true }305pallet-ethereum = { workspace = true }306pallet-evm = { workspace = true }307pallet-evm-coder-substrate = { workspace = true }308pallet-evm-contract-helpers = { workspace = true }309pallet-evm-migration = { workspace = true }310pallet-evm-precompile-simple = { workspace = true }311pallet-evm-transaction-payment = { workspace = true }312pallet-foreign-assets = { workspace = true }313pallet-fungible = { workspace = true }314pallet-identity = { workspace = true }315pallet-inflation = { workspace = true }316pallet-maintenance = { workspace = true }317pallet-nonfungible = { workspace = true }318pallet-democracy = { workspace = true }319pallet-collective = { workspace = true }320pallet-ranked-collective = { workspace = true }321pallet-membership = { workspace = true }322pallet-referenda = { workspace = true }323pallet-gov-origins = { workspace = true }324pallet-scheduler = { workspace = true }325pallet-refungible = { workspace = true }326pallet-structure = { workspace = true }327pallet-unique = { workspace = true }328pallet-unique-scheduler-v2 = { workspace = true }329precompile-utils-macro = { workspace = true }330scale-info = { workspace = true }331up-common = { workspace = true }332up-data-structs = { workspace = true }333up-pov-estimate-rpc = { workspace = true }334up-rpc = { workspace = true }335up-sponsorship = { workspace = true }336337################################################################################338# Optional dependencies339340frame-benchmarking = { workspace = true, optional = true }341frame-system-benchmarking = { workspace = true, optional = true }342frame-try-runtime = { workspace = true, optional = true }343serde = { workspace = true, optional = true }344345################################################################################346# Test dependencies347348pallet-test-utils = { workspace = true, optional = true }349350################################################################################351# Other Dependencies352353hex-literal = { workspace = true }354impl-trait-for-tuples = { workspace = true }355356[build-dependencies]357substrate-wasm-builder = { workspace = true }1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Opal Runtime'8edition = '2021'9homepage = 'https://unique.network'10license = 'GPLv3'11name = 'opal-runtime'12repository = 'https://github.com/UniqueNetwork/unique-chain'13version.workspace = true1415[package.metadata.docs.rs]16targets = ['x86_64-unknown-linux-gnu']1718[features]19default = ['opal-runtime', 'std']20limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']21opal-runtime = [22 'app-promotion',23 'collator-selection',24 'foreign-assets',25 'governance',26 'pallet-test-utils',27 'preimage',28 'refungible',29]30pov-estimate = []31runtime-benchmarks = [32 "pallet-preimage/runtime-benchmarks",33 'cumulus-pallet-parachain-system/runtime-benchmarks',34 'frame-benchmarking',35 'frame-support/runtime-benchmarks',36 'frame-system-benchmarking',37 'frame-system/runtime-benchmarks',38 'pallet-app-promotion/runtime-benchmarks',39 'pallet-balances/runtime-benchmarks',40 'pallet-collator-selection/runtime-benchmarks',41 'pallet-common/runtime-benchmarks',42 'pallet-configuration/runtime-benchmarks',43 'pallet-ethereum/runtime-benchmarks',44 'pallet-evm-coder-substrate/runtime-benchmarks',45 'pallet-evm-migration/runtime-benchmarks',46 'pallet-foreign-assets/runtime-benchmarks',47 'pallet-fungible/runtime-benchmarks',48 'pallet-identity/runtime-benchmarks',49 'pallet-inflation/runtime-benchmarks',50 'pallet-maintenance/runtime-benchmarks',51 'pallet-nonfungible/runtime-benchmarks',52 'pallet-democracy/runtime-benchmarks',53 'pallet-collective/runtime-benchmarks',54 'pallet-ranked-collective/runtime-benchmarks',55 'pallet-membership/runtime-benchmarks',56 'pallet-referenda/runtime-benchmarks',57 'pallet-scheduler/runtime-benchmarks',58 'pallet-refungible/runtime-benchmarks',59 'pallet-structure/runtime-benchmarks',60 'pallet-timestamp/runtime-benchmarks',61 'pallet-utility/runtime-benchmarks',62 'pallet-unique-scheduler-v2/runtime-benchmarks',63 'pallet-unique/runtime-benchmarks',64 'pallet-xcm/runtime-benchmarks',65 'sp-runtime/runtime-benchmarks',66 'xcm-builder/runtime-benchmarks',67]68std = [69 'codec/std',70 'cumulus-pallet-aura-ext/std',71 'cumulus-pallet-parachain-system/std',72 'cumulus-pallet-xcm/std',73 'cumulus-pallet-xcmp-queue/std',74 'cumulus-primitives-core/std',75 'cumulus-primitives-utility/std',76 'frame-executive/std',77 'frame-support/std',78 'frame-system-rpc-runtime-api/std',79 'frame-system/std',80 'frame-try-runtime/std',81 'pallet-aura/std',82 'pallet-balances/std',83 'pallet-democracy/std',84 'pallet-collective/std',85 'pallet-ranked-collective/std',86 'pallet-membership/std',87 'pallet-referenda/std',88 'pallet-gov-origins/std',89 'pallet-scheduler/std',90 # 'pallet-contracts/std',91 # 'pallet-contracts-primitives/std',92 # 'pallet-contracts-rpc-runtime-api/std',93 # 'pallet-contract-helpers/std',94 "pallet-authorship/std",95 "pallet-preimage/std",96 "pallet-session/std",97 "pallet-state-trie-migration/std",98 "sp-consensus-aura/std",99 'app-promotion-rpc/std',100 'evm-coder/std',101 'fp-rpc/std',102 'fp-self-contained/std',103 'pallet-app-promotion/std',104 'pallet-balances-adapter/std',105 'pallet-base-fee/std',106 'pallet-charge-transaction/std',107 'pallet-collator-selection/std',108 'pallet-common/std',109 'pallet-configuration/std',110 'pallet-ethereum/std',111 'pallet-evm-coder-substrate/std',112 'pallet-evm-contract-helpers/std',113 'pallet-evm-migration/std',114 'pallet-evm-transaction-payment/std',115 'pallet-evm/std',116 'pallet-fungible/std',117 'pallet-identity/std',118 'pallet-inflation/std',119 'pallet-nonfungible/std',120 'pallet-refungible/std',121 'pallet-structure/std',122 'pallet-sudo/std',123 'pallet-timestamp/std',124 'pallet-utility/std',125 'pallet-transaction-payment-rpc-runtime-api/std',126 'pallet-transaction-payment/std',127 'pallet-treasury/std',128 'pallet-unique-scheduler-v2/std',129 'pallet-unique/std',130 'parachain-info/std',131 'serde',132 'sp-api/std',133 'sp-block-builder/std',134 'sp-core/std',135 'sp-inherents/std',136 'sp-io/std',137 'sp-offchain/std',138 'sp-runtime/std',139 'sp-session/std',140 'sp-std/std',141 'sp-transaction-pool/std',142 'sp-version/std',143 'up-common/std',144 'up-data-structs/std',145 'up-pov-estimate-rpc/std',146 'up-rpc/std',147 'up-sponsorship/std',148 'xcm-builder/std',149 'xcm-executor/std',150 'xcm/std',151152 "orml-tokens/std",153 "orml-traits/std",154 "orml-vesting/std",155 "orml-xcm-support/std",156 "orml-xtokens/std",157 "pallet-foreign-assets/std",158159 'pallet-maintenance/std',160 'pallet-test-utils?/std',161]162try-runtime = [163 "pallet-authorship/try-runtime",164 "pallet-collator-selection/try-runtime",165 "pallet-identity/try-runtime",166 "pallet-preimage/try-runtime",167 "pallet-session/try-runtime",168 "pallet-state-trie-migration/try-runtime",169 'cumulus-pallet-aura-ext/try-runtime',170 'cumulus-pallet-dmp-queue/try-runtime',171 'cumulus-pallet-parachain-system/try-runtime',172 'cumulus-pallet-xcm/try-runtime',173 'cumulus-pallet-xcmp-queue/try-runtime',174 'fp-self-contained/try-runtime',175 'frame-executive/try-runtime',176 'frame-support/try-runtime',177 'frame-system/try-runtime',178 'frame-try-runtime',179 'frame-try-runtime?/try-runtime',180 'orml-tokens/try-runtime',181 'orml-vesting/try-runtime',182 'orml-xtokens/try-runtime',183 'pallet-app-promotion/try-runtime',184 'pallet-aura/try-runtime',185 'pallet-balances-adapter/try-runtime',186 'pallet-balances/try-runtime',187 'pallet-base-fee/try-runtime',188 'pallet-charge-transaction/try-runtime',189 'pallet-collective/try-runtime',190 'pallet-common/try-runtime',191 'pallet-configuration/try-runtime',192 'pallet-democracy/try-runtime',193 'pallet-ethereum/try-runtime',194 'pallet-evm-coder-substrate/try-runtime',195 'pallet-evm-contract-helpers/try-runtime',196 'pallet-evm-migration/try-runtime',197 'pallet-evm-transaction-payment/try-runtime',198 'pallet-evm/try-runtime',199 'pallet-foreign-assets/try-runtime',200 'pallet-fungible/try-runtime',201 'pallet-inflation/try-runtime',202 'pallet-maintenance/try-runtime',203 'pallet-membership/try-runtime',204 'pallet-nonfungible/try-runtime',205 'pallet-democracy/try-runtime',206 'pallet-collective/try-runtime',207 'pallet-ranked-collective/try-runtime',208 'pallet-membership/try-runtime',209 'pallet-referenda/try-runtime',210 'pallet-gov-origins/try-runtime',211 'pallet-scheduler/try-runtime',212 'pallet-refungible/try-runtime',213 'pallet-scheduler/try-runtime',214 'pallet-structure/try-runtime',215 'pallet-sudo/try-runtime',216 'pallet-test-utils?/try-runtime',217 'pallet-timestamp/try-runtime',218 'pallet-utility/try-runtime',219 'pallet-transaction-payment/try-runtime',220 'pallet-treasury/try-runtime',221 'pallet-unique-scheduler-v2/try-runtime',222 'pallet-unique/try-runtime',223 'pallet-xcm/try-runtime',224 'parachain-info/try-runtime',225]226227app-promotion = []228collator-selection = []229foreign-assets = []230governance = []231gov-test-timings = []232preimage = []233refungible = []234unique-scheduler = []235session-test-timings = []236237################################################################################238# local dependencies239240[dependencies]241# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it.242codec = { workspace = true, package = "parity-scale-codec" }243244cumulus-pallet-aura-ext = { workspace = true }245cumulus-pallet-dmp-queue = { workspace = true }246cumulus-pallet-parachain-system = { workspace = true }247cumulus-pallet-xcm = { workspace = true }248cumulus-pallet-xcmp-queue = { workspace = true }249cumulus-primitives-core = { workspace = true }250cumulus-primitives-timestamp = { workspace = true }251cumulus-primitives-utility = { workspace = true }252frame-executive = { workspace = true }253frame-support = { workspace = true }254frame-system = { workspace = true }255frame-system-rpc-runtime-api = { workspace = true }256orml-tokens = { workspace = true }257orml-traits = { workspace = true }258orml-vesting = { workspace = true }259orml-xcm-support = { workspace = true }260orml-xtokens = { workspace = true }261pallet-aura = { workspace = true }262pallet-authorship = { workspace = true }263pallet-balances = { features = ["insecure_zero_ed"], workspace = true }264pallet-preimage = { workspace = true }265pallet-session = { workspace = true }266pallet-state-trie-migration = { workspace = true }267pallet-sudo = { workspace = true }268pallet-timestamp = { workspace = true }269pallet-utility = { workspace = true }270pallet-transaction-payment = { workspace = true }271pallet-transaction-payment-rpc-runtime-api = { workspace = true }272pallet-treasury = { workspace = true }273pallet-xcm = { workspace = true }274parachain-info = { workspace = true }275polkadot-parachain = { workspace = true }276smallvec = { workspace = true }277sp-api = { workspace = true }278sp-arithmetic = { workspace = true }279sp-block-builder = { workspace = true }280sp-consensus-aura = { workspace = true }281sp-core = { workspace = true }282sp-inherents = { workspace = true }283sp-io = { workspace = true }284sp-offchain = { workspace = true }285sp-runtime = { workspace = true }286sp-session = { workspace = true }287sp-std = { workspace = true }288sp-transaction-pool = { workspace = true }289sp-version = { workspace = true }290xcm = { workspace = true }291xcm-builder = { workspace = true }292xcm-executor = { workspace = true }293294app-promotion-rpc = { workspace = true }295derivative = { workspace = true }296evm-coder = { workspace = true }297fp-evm = { workspace = true }298fp-rpc = { workspace = true }299fp-self-contained = { workspace = true }300log = { workspace = true }301num_enum = { workspace = true }302pallet-app-promotion = { workspace = true }303pallet-balances-adapter = { workspace = true }304pallet-base-fee = { workspace = true }305pallet-charge-transaction = { workspace = true }306pallet-collator-selection = { workspace = true }307pallet-common = { workspace = true }308pallet-configuration = { workspace = true }309pallet-ethereum = { workspace = true }310pallet-evm = { workspace = true }311pallet-evm-coder-substrate = { workspace = true }312pallet-evm-contract-helpers = { workspace = true }313pallet-evm-migration = { workspace = true }314pallet-evm-precompile-simple = { workspace = true }315pallet-evm-transaction-payment = { workspace = true }316pallet-foreign-assets = { workspace = true }317pallet-fungible = { workspace = true }318pallet-identity = { workspace = true }319pallet-inflation = { workspace = true }320pallet-maintenance = { workspace = true }321pallet-nonfungible = { workspace = true }322pallet-democracy = { workspace = true }323pallet-collective = { workspace = true }324pallet-ranked-collective = { workspace = true }325pallet-membership = { workspace = true }326pallet-referenda = { workspace = true }327pallet-gov-origins = { workspace = true }328pallet-scheduler = { workspace = true }329pallet-refungible = { workspace = true }330pallet-structure = { workspace = true }331pallet-unique = { workspace = true }332pallet-unique-scheduler-v2 = { workspace = true }333precompile-utils-macro = { workspace = true }334scale-info = { workspace = true }335up-common = { workspace = true }336up-data-structs = { workspace = true }337up-pov-estimate-rpc = { workspace = true }338up-rpc = { workspace = true }339up-sponsorship = { workspace = true }340341################################################################################342# Optional dependencies343344frame-benchmarking = { workspace = true, optional = true }345frame-system-benchmarking = { workspace = true, optional = true }346frame-try-runtime = { workspace = true, optional = true }347serde = { workspace = true, optional = true }348349################################################################################350# Test dependencies351352pallet-test-utils = { workspace = true, optional = true }353354################################################################################355# Other Dependencies356357hex-literal = { workspace = true }358impl-trait-for-tuples = { workspace = true }359360[build-dependencies]361substrate-wasm-builder = { workspace = true }runtime/quartz/Cargo.tomldiffbeforeafterboth--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -55,6 +55,7 @@
'pallet-scheduler/runtime-benchmarks',
'pallet-structure/runtime-benchmarks',
'pallet-timestamp/runtime-benchmarks',
+ 'pallet-utility/runtime-benchmarks',
'pallet-unique/runtime-benchmarks',
'pallet-xcm/runtime-benchmarks',
'sp-runtime/runtime-benchmarks',
@@ -120,6 +121,7 @@
'pallet-structure/std',
'pallet-sudo/std',
'pallet-timestamp/std',
+ 'pallet-utility/std',
'pallet-transaction-payment-rpc-runtime-api/std',
'pallet-transaction-payment/std',
'pallet-treasury/std',
@@ -203,6 +205,7 @@
'pallet-structure/try-runtime',
'pallet-sudo/try-runtime',
'pallet-timestamp/try-runtime',
+ 'pallet-utility/try-runtime',
'pallet-transaction-payment/try-runtime',
'pallet-treasury/try-runtime',
'pallet-unique/try-runtime',
@@ -252,6 +255,7 @@
pallet-state-trie-migration = { workspace = true }
pallet-sudo = { workspace = true }
pallet-timestamp = { workspace = true }
+pallet-utility = { workspace = true }
pallet-transaction-payment = { workspace = true }
pallet-transaction-payment-rpc-runtime-api = { workspace = true }
pallet-treasury = { workspace = true }
runtime/unique/Cargo.tomldiffbeforeafterboth--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -52,6 +52,7 @@
'pallet-scheduler/runtime-benchmarks',
'pallet-structure/runtime-benchmarks',
'pallet-timestamp/runtime-benchmarks',
+ 'pallet-utility/runtime-benchmarks',
'pallet-unique/runtime-benchmarks',
'pallet-xcm/runtime-benchmarks',
'sp-runtime/runtime-benchmarks',
@@ -118,6 +119,7 @@
'pallet-structure/std',
'pallet-sudo/std',
'pallet-timestamp/std',
+ 'pallet-utility/std',
'pallet-transaction-payment-rpc-runtime-api/std',
'pallet-transaction-payment/std',
'pallet-treasury/std',
@@ -205,6 +207,7 @@
'pallet-structure/try-runtime',
'pallet-sudo/try-runtime',
'pallet-timestamp/try-runtime',
+ 'pallet-utility/try-runtime',
'pallet-transaction-payment/try-runtime',
'pallet-treasury/try-runtime',
'pallet-unique/try-runtime',
@@ -255,6 +258,7 @@
pallet-state-trie-migration = { workspace = true }
pallet-sudo = { workspace = true }
pallet-timestamp = { workspace = true }
+pallet-utility = { workspace = true }
pallet-transaction-payment = { workspace = true }
pallet-transaction-payment-rpc-runtime-api = { workspace = true }
pallet-treasury = { workspace = true }
tests/src/governance/init.test.tsdiffbeforeafterboth--- /dev/null
+++ b/tests/src/governance/init.test.ts
@@ -0,0 +1,192 @@
+import {IKeyringPair} from '@polkadot/types/types';
+import {usingPlaygrounds, itSub, expect, Pallets, requirePalletsOrSkip, describeGov} from '../util';
+import {Event} from '../util/playgrounds/unique.dev';
+import {ICounselors, democracyLaunchPeriod, democracyVotingPeriod, ITechComms, democracyEnactmentPeriod, clearCouncil, clearTechComm, clearFellowship} from './util';
+
+describeGov('Governance: Initialization', () => {
+ let donor: IKeyringPair;
+ let sudoer: IKeyringPair;
+ let counselors: ICounselors;
+ let techcomms: ITechComms;
+ let coreDevs: any;
+
+ const expectedAlexFellowRank = 7;
+ const expectedFellowRank = 6;
+
+ before(async function() {
+ await usingPlaygrounds(async (helper, privateKey) => {
+ requirePalletsOrSkip(this, helper, [Pallets.Democracy, Pallets.Council, Pallets.TechnicalCommittee]);
+
+ const councilMembers = await helper.council.membership.getMembers();
+ const techcommMembers = await helper.technicalCommittee.membership.getMembers();
+ expect(councilMembers.length == 0, 'The Council must be empty before the Gov Init');
+ expect(techcommMembers.length == 0, 'The Technical Commettee must be empty before the Gov Init');
+
+ donor = await privateKey({url: import.meta.url});
+ sudoer = await privateKey('//Alice');
+
+ const counselorsNum = 5;
+ const techCommsNum = 3;
+ const coreDevsNum = 2;
+ const [
+ alex,
+ ildar,
+ charu,
+ filip,
+ irina,
+
+ greg,
+ andy,
+ constantine,
+
+ yaroslav,
+ daniel,
+ ] = await helper.arrange.createAccounts(new Array(counselorsNum + techCommsNum + coreDevsNum).fill(10_000n), donor);
+
+ counselors = {
+ alex,
+ ildar,
+ charu,
+ filip,
+ irina,
+ };
+
+ techcomms = {
+ greg,
+ andy,
+ constantine,
+ };
+
+ coreDevs = {
+ yaroslav: yaroslav,
+ daniel: daniel,
+ };
+ });
+ });
+
+ itSub('Initialize Governance', async ({helper}) => {
+ const promoteFellow = (fellow: string, promotionsNum: number) => new Array(promotionsNum).fill(helper.fellowship.collective.promoteCall(fellow));
+
+ const expectFellowRank = async (fellow: string, expectedRank: number) => {
+ expect(await helper.fellowship.collective.getMemberRank(fellow)).to.be.equal(expectedRank);
+ };
+
+ console.log('\t- Setup the Prime of the Council via sudo');
+ await helper.getSudo().utility.batchAll(sudoer, [
+ helper.council.membership.addMemberCall(counselors.alex.address),
+ helper.council.membership.setPrimeCall(counselors.alex.address),
+
+ helper.fellowship.collective.addMemberCall(counselors.alex.address),
+ ...promoteFellow(counselors.alex.address, expectedAlexFellowRank),
+ ]);
+
+ let councilMembers = await helper.council.membership.getMembers();
+ const councilPrime = await helper.council.collective.getPrimeMember();
+ const alexFellowRank = await helper.fellowship.collective.getMemberRank(counselors.alex.address);
+ expect(councilMembers).to.be.deep.equal([counselors.alex.address]);
+ expect(councilPrime).to.be.equal(counselors.alex.address);
+ expect(alexFellowRank).to.be.equal(expectedAlexFellowRank);
+
+ console.log('\t- The Council Prime initializes the Technical Commettee');
+ const councilProposalThreshold = 1;
+
+ await helper.council.collective.propose(
+ counselors.alex,
+ helper.utility.batchAllCall([
+ helper.technicalCommittee.membership.addMemberCall(techcomms.greg.address),
+ helper.technicalCommittee.membership.addMemberCall(techcomms.andy.address),
+ helper.technicalCommittee.membership.addMemberCall(techcomms.constantine.address),
+
+ helper.technicalCommittee.membership.setPrimeCall(techcomms.greg.address),
+ ]),
+ councilProposalThreshold,
+ );
+
+ const techCommMembers = await helper.technicalCommittee.membership.getMembers();
+ const techCommPrime = await helper.technicalCommittee.membership.getPrimeMember();
+ const expectedTechComms = [techcomms.greg.address, techcomms.andy.address, techcomms.constantine.address];
+ expect(techCommMembers.length).to.be.equal(expectedTechComms.length);
+ expect(techCommMembers).to.containSubset(expectedTechComms);
+ expect(techCommPrime).to.be.equal(techcomms.greg.address);
+
+ console.log('\t- The Council Prime initiates a referendum to add counselors');
+ const returnPreimageHash = true;
+ const preimageHash = await helper.preimage.notePreimageFromCall(counselors.alex, helper.utility.batchAllCall([
+ helper.council.membership.addMemberCall(counselors.ildar.address),
+ helper.council.membership.addMemberCall(counselors.charu.address),
+ helper.council.membership.addMemberCall(counselors.filip.address),
+ helper.council.membership.addMemberCall(counselors.irina.address),
+
+ helper.fellowship.collective.addMemberCall(counselors.charu.address),
+ helper.fellowship.collective.addMemberCall(counselors.ildar.address),
+ helper.fellowship.collective.addMemberCall(counselors.irina.address),
+ helper.fellowship.collective.addMemberCall(counselors.filip.address),
+ helper.fellowship.collective.addMemberCall(techcomms.greg.address),
+ helper.fellowship.collective.addMemberCall(techcomms.andy.address),
+ helper.fellowship.collective.addMemberCall(techcomms.constantine.address),
+ helper.fellowship.collective.addMemberCall(coreDevs.yaroslav.address),
+ helper.fellowship.collective.addMemberCall(coreDevs.daniel.address),
+
+ ...promoteFellow(counselors.charu.address, expectedFellowRank),
+ ...promoteFellow(counselors.ildar.address, expectedFellowRank),
+ ...promoteFellow(counselors.irina.address, expectedFellowRank),
+ ...promoteFellow(counselors.filip.address, expectedFellowRank),
+ ...promoteFellow(techcomms.greg.address, expectedFellowRank),
+ ...promoteFellow(techcomms.andy.address, expectedFellowRank),
+ ...promoteFellow(techcomms.constantine.address, expectedFellowRank),
+ ...promoteFellow(coreDevs.yaroslav.address, expectedFellowRank),
+ ...promoteFellow(coreDevs.daniel.address, expectedFellowRank),
+ ]), returnPreimageHash);
+
+ await helper.council.collective.propose(
+ counselors.alex,
+ helper.democracy.externalProposeDefaultWithPreimageCall(preimageHash),
+ councilProposalThreshold,
+ );
+
+ console.log('\t- The referendum is being decided');
+ const startedEvent = await helper.wait.expectEvent(democracyLaunchPeriod, Event.Democracy.Started);
+
+ await helper.democracy.vote(counselors.filip, startedEvent.referendumIndex, {
+ Standard: {
+ vote: {
+ aye: true,
+ conviction: 1,
+ },
+ balance: 10_000n,
+ },
+ });
+
+ const passedReferendumEvent = await helper.wait.expectEvent(democracyVotingPeriod, Event.Democracy.Passed);
+ expect(passedReferendumEvent.referendumIndex).to.be.equal(startedEvent.referendumIndex);
+
+ await helper.wait.expectEvent(democracyEnactmentPeriod, Event.Scheduler.Dispatched);
+
+ councilMembers = await helper.council.membership.getMembers();
+ const expectedCounselors = [
+ counselors.alex.address,
+ counselors.ildar.address,
+ counselors.charu.address,
+ counselors.filip.address,
+ counselors.irina.address,
+ ];
+ expect(councilMembers.length).to.be.equal(expectedCounselors.length);
+ expect(councilMembers).to.containSubset(expectedCounselors);
+
+ await expectFellowRank(counselors.ildar.address, expectedFellowRank);
+ await expectFellowRank(counselors.charu.address, expectedFellowRank);
+ await expectFellowRank(counselors.filip.address, expectedFellowRank);
+ await expectFellowRank(counselors.irina.address, expectedFellowRank);
+ await expectFellowRank(techcomms.greg.address, expectedFellowRank);
+ await expectFellowRank(techcomms.andy.address, expectedFellowRank);
+ await expectFellowRank(techcomms.constantine.address, expectedFellowRank);
+ await expectFellowRank(coreDevs.yaroslav.address, expectedFellowRank);
+ await expectFellowRank(coreDevs.daniel.address, expectedFellowRank);
+ });
+
+ after(async function() {
+ await clearFellowship(sudoer);
+ await clearTechComm(sudoer);
+ await clearCouncil(sudoer);
+ });
+});
tests/src/pallet-presence.test.tsdiffbeforeafterboth--- a/tests/src/pallet-presence.test.ts
+++ b/tests/src/pallet-presence.test.ts
@@ -27,6 +27,7 @@
'statetriemigration',
'structure',
'system',
+ 'utility',
'vesting',
'parachainsystem',
'parachaininfo',
tests/src/util/playgrounds/unique.tsdiffbeforeafterboth--- a/tests/src/util/playgrounds/unique.ts
+++ b/tests/src/util/playgrounds/unique.ts
@@ -3255,8 +3255,8 @@
return this.helper.executeExtrinsic(signer, `api.tx.${this.collective}.promoteMember`, [member]);
}
- promoteCall(newMember: string) {
- return this.helper.constructApiCall(`api.tx.${this.collective}.promoteMember`, [newMember]);
+ promoteCall(member: string) {
+ return this.helper.constructApiCall(`api.tx.${this.collective}.promoteMember`, [member]);
}
demote(signer: TSigner, member: string) {
@@ -3275,6 +3275,10 @@
return (await this.helper.getApi().query.fellowshipCollective.members.keys())
.map((key) => key.args[0].toString());
}
+
+ async getMemberRank(member: string) {
+ return (await this.helper.callRpc('api.query.fellowshipCollective.members', [member])).toJSON().rank;
+ }
}
class ReferendaGroup extends HelperGroup<UniqueHelper> {
@@ -3381,6 +3385,10 @@
return this.helper.constructApiCall('api.tx.democracy.externalProposeDefault', [{Inline: proposalCall.method.toHex()}]);
}
+ externalProposeDefaultWithPreimageCall(preimage: string) {
+ return this.helper.constructApiCall('api.tx.democracy.externalProposeDefault', [{Legacy: preimage}]);
+ }
+
// ... and blacklist external proposal hash.
vetoExternal(signer: TSigner, proposalHash: string) {
return this.helper.executeExtrinsic(signer, 'api.tx.democracy.vetoExternal', [proposalHash]);
@@ -3733,6 +3741,20 @@
}
}
+class UtilityGroup<T extends ChainHelperBase> extends HelperGroup<T> {
+ async batch(signer: TSigner, txs: any[]) {
+ return await this.helper.executeExtrinsic(signer, 'api.tx.utility.batch', [txs]);
+ }
+
+ async batchAll(signer: TSigner, txs: any[]) {
+ return await this.helper.executeExtrinsic(signer, 'api.tx.utility.batchAll', [txs]);
+ }
+
+ batchAllCall(txs: any[]) {
+ return this.helper.constructApiCall('api.tx.utility.batchAll', [txs]);
+ }
+}
+
class AcalaAssetRegistryGroup extends HelperGroup<AcalaHelper> {
async registerForeignAsset(signer: TSigner, destination: any, metadata: AcalaAssetMetadata) {
await this.helper.executeExtrinsic(signer, 'api.tx.assetRegistry.registerForeignAsset', [destination, metadata], true);
@@ -3835,6 +3857,7 @@
xcm: XcmGroup<UniqueHelper>;
xTokens: XTokensGroup<UniqueHelper>;
tokens: TokensGroup<UniqueHelper>;
+ utility: UtilityGroup<UniqueHelper>;
constructor(logger?: ILogger, options: { [key: string]: any } = {}) {
super(logger, options.helperBase ?? UniqueHelper);
@@ -3865,6 +3888,7 @@
this.xcm = new XcmGroup(this, 'polkadotXcm');
this.xTokens = new XTokensGroup(this);
this.tokens = new TokensGroup(this);
+ this.utility = new UtilityGroup(this);
}
getSudo<T extends UniqueHelper>() {