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.tomldiffbeforeafterboth--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -58,6 +58,7 @@
'pallet-refungible/runtime-benchmarks',
'pallet-structure/runtime-benchmarks',
'pallet-timestamp/runtime-benchmarks',
+ 'pallet-utility/runtime-benchmarks',
'pallet-unique-scheduler-v2/runtime-benchmarks',
'pallet-unique/runtime-benchmarks',
'pallet-xcm/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',
@@ -213,6 +215,7 @@
'pallet-sudo/try-runtime',
'pallet-test-utils?/try-runtime',
'pallet-timestamp/try-runtime',
+ 'pallet-utility/try-runtime',
'pallet-transaction-payment/try-runtime',
'pallet-treasury/try-runtime',
'pallet-unique-scheduler-v2/try-runtime',
@@ -263,6 +266,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/quartz/Cargo.tomldiffbeforeafterboth1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Quartz Runtime'8edition = '2021'9homepage = 'https://unique.network'10license = 'GPLv3'11name = 'quartz-runtime'12repository = 'https://github.com/UniqueNetwork/unique-chain'13version.workspace = true1415[package.metadata.docs.rs]16targets = ['x86_64-unknown-linux-gnu']1718[features]19become-sapphire = []20default = ['quartz-runtime', 'std']21limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']22pov-estimate = []23quartz-runtime = ['app-promotion', 'collator-selection', 'foreign-assets', 'governance', 'preimage', 'refungible']24runtime-benchmarks = [25 "pallet-preimage/runtime-benchmarks",26 'cumulus-pallet-parachain-system/runtime-benchmarks',27 'frame-benchmarking',28 'frame-support/runtime-benchmarks',29 'frame-system-benchmarking',30 'frame-system/runtime-benchmarks',31 'pallet-app-promotion/runtime-benchmarks',32 'pallet-balances/runtime-benchmarks',33 'pallet-collator-selection/runtime-benchmarks',34 'pallet-collective/runtime-benchmarks',35 'pallet-common/runtime-benchmarks',36 'pallet-configuration/runtime-benchmarks',37 'pallet-democracy/runtime-benchmarks',38 'pallet-ethereum/runtime-benchmarks',39 'pallet-evm-coder-substrate/runtime-benchmarks',40 'pallet-evm-migration/runtime-benchmarks',41 'pallet-foreign-assets/runtime-benchmarks',42 'pallet-fungible/runtime-benchmarks',43 'pallet-identity/runtime-benchmarks',44 'pallet-inflation/runtime-benchmarks',45 'pallet-maintenance/runtime-benchmarks',46 'pallet-membership/runtime-benchmarks',47 'pallet-nonfungible/runtime-benchmarks',48 'pallet-democracy/runtime-benchmarks',49 'pallet-collective/runtime-benchmarks',50 'pallet-ranked-collective/runtime-benchmarks',51 'pallet-membership/runtime-benchmarks',52 'pallet-referenda/runtime-benchmarks',53 'pallet-scheduler/runtime-benchmarks',54 'pallet-refungible/runtime-benchmarks',55 'pallet-scheduler/runtime-benchmarks',56 'pallet-structure/runtime-benchmarks',57 'pallet-timestamp/runtime-benchmarks',58 'pallet-unique/runtime-benchmarks',59 'pallet-xcm/runtime-benchmarks',60 'sp-runtime/runtime-benchmarks',61 'xcm-builder/runtime-benchmarks',62]63std = [64 'codec/std',65 'cumulus-pallet-aura-ext/std',66 'cumulus-pallet-parachain-system/std',67 'cumulus-pallet-xcm/std',68 'cumulus-pallet-xcmp-queue/std',69 'cumulus-primitives-core/std',70 'cumulus-primitives-utility/std',71 'frame-executive/std',72 'frame-support/std',73 'frame-system-rpc-runtime-api/std',74 'frame-system/std',75 'frame-try-runtime/std',76 'pallet-aura/std',77 'pallet-balances-adapter/std',78 'pallet-balances/std',79 'pallet-collective/std',80 'pallet-democracy/std',81 'pallet-membership/std',82 'pallet-scheduler/std',83 # 'pallet-contracts/std',84 # 'pallet-contracts-primitives/std',85 # 'pallet-contracts-rpc-runtime-api/std',86 # 'pallet-contract-helpers/std',87 "pallet-authorship/std",88 "pallet-identity/std",89 "pallet-preimage/std",90 "pallet-session/std",91 "pallet-state-trie-migration/std",92 "sp-consensus-aura/std",93 'app-promotion-rpc/std',94 'evm-coder/std',95 'fp-rpc/std',96 'fp-self-contained/std',97 'pallet-app-promotion/std',98 'pallet-base-fee/std',99 'pallet-charge-transaction/std',100 'pallet-collator-selection/std',101 'pallet-common/std',102 'pallet-configuration/std',103 'pallet-ethereum/std',104 'pallet-evm-coder-substrate/std',105 'pallet-evm-contract-helpers/std',106 'pallet-evm-migration/std',107 'pallet-evm-transaction-payment/std',108 'pallet-evm/std',109 'pallet-fungible/std',110 'pallet-inflation/std',111 'pallet-nonfungible/std',112 'pallet-democracy/std',113 'pallet-collective/std',114 'pallet-ranked-collective/std',115 'pallet-membership/std',116 'pallet-referenda/std',117 'pallet-gov-origins/std',118 'pallet-scheduler/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/std',127 'parachain-info/std',128 'serde',129 'sp-api/std',130 'sp-block-builder/std',131 'sp-core/std',132 'sp-inherents/std',133 'sp-io/std',134 'sp-offchain/std',135 'sp-runtime/std',136 'sp-session/std',137 'sp-std/std',138 'sp-transaction-pool/std',139 'sp-version/std',140 'up-common/std',141 'up-data-structs/std',142 'up-pov-estimate-rpc/std',143 'up-rpc/std',144 'up-sponsorship/std',145 'xcm-builder/std',146 'xcm-executor/std',147 'xcm/std',148149 "orml-tokens/std",150 "orml-traits/std",151 "orml-vesting/std",152 "orml-xcm-support/std",153 "orml-xtokens/std",154 "pallet-foreign-assets/std",155 "pallet-maintenance/std",156]157try-runtime = [158 "pallet-authorship/try-runtime",159 "pallet-collator-selection/try-runtime",160 "pallet-identity/try-runtime",161 "pallet-preimage/try-runtime",162 "pallet-session/try-runtime",163 "pallet-state-trie-migration/try-runtime",164 'cumulus-pallet-aura-ext/try-runtime',165 'cumulus-pallet-dmp-queue/try-runtime',166 'cumulus-pallet-parachain-system/try-runtime',167 'cumulus-pallet-xcm/try-runtime',168 'cumulus-pallet-xcmp-queue/try-runtime',169 'fp-self-contained/try-runtime',170 'frame-executive/try-runtime',171 'frame-support/try-runtime',172 'frame-system/try-runtime',173 'frame-try-runtime',174 'orml-tokens/try-runtime',175 'orml-vesting/try-runtime',176 'orml-xtokens/try-runtime',177 'pallet-app-promotion/try-runtime',178 'pallet-aura/try-runtime',179 'pallet-balances-adapter/try-runtime',180 'pallet-balances/try-runtime',181 'pallet-charge-transaction/try-runtime',182 'pallet-common/try-runtime',183 'pallet-configuration/try-runtime',184 'pallet-ethereum/try-runtime',185 'pallet-evm-coder-substrate/try-runtime',186 'pallet-evm-contract-helpers/try-runtime',187 'pallet-evm-migration/try-runtime',188 'pallet-evm-transaction-payment/try-runtime',189 'pallet-evm/try-runtime',190 'pallet-foreign-assets/try-runtime',191 'pallet-fungible/try-runtime',192 'pallet-inflation/try-runtime',193 'pallet-maintenance/try-runtime',194 'pallet-nonfungible/try-runtime',195 'pallet-democracy/try-runtime',196 'pallet-collective/try-runtime',197 'pallet-ranked-collective/try-runtime',198 'pallet-membership/try-runtime',199 'pallet-referenda/try-runtime',200 'pallet-gov-origins/try-runtime',201 'pallet-scheduler/try-runtime',202 'pallet-refungible/try-runtime',203 'pallet-structure/try-runtime',204 'pallet-sudo/try-runtime',205 'pallet-timestamp/try-runtime',206 'pallet-transaction-payment/try-runtime',207 'pallet-treasury/try-runtime',208 'pallet-unique/try-runtime',209 'pallet-xcm/try-runtime',210 'parachain-info/try-runtime',211]212213app-promotion = []214collator-selection = []215foreign-assets = []216governance = []217preimage = []218refungible = []219unique-scheduler = []220gov-test-timings = []221session-test-timings = []222223################################################################################224# local dependencies225226[dependencies]227# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it.228codec = { workspace = true, package = "parity-scale-codec" }229230cumulus-pallet-aura-ext = { workspace = true }231cumulus-pallet-dmp-queue = { workspace = true }232cumulus-pallet-parachain-system = { workspace = true }233cumulus-pallet-xcm = { workspace = true }234cumulus-pallet-xcmp-queue = { workspace = true }235cumulus-primitives-core = { workspace = true }236cumulus-primitives-timestamp = { workspace = true }237cumulus-primitives-utility = { workspace = true }238frame-executive = { workspace = true }239frame-support = { workspace = true }240frame-system = { workspace = true }241frame-system-rpc-runtime-api = { workspace = true }242orml-tokens = { workspace = true }243orml-traits = { workspace = true }244orml-vesting = { workspace = true }245orml-xcm-support = { workspace = true }246orml-xtokens = { workspace = true }247pallet-aura = { workspace = true }248pallet-authorship = { workspace = true }249pallet-balances = { features = ["insecure_zero_ed"], workspace = true }250pallet-preimage = { workspace = true }251pallet-session = { workspace = true }252pallet-state-trie-migration = { workspace = true }253pallet-sudo = { workspace = true }254pallet-timestamp = { workspace = true }255pallet-transaction-payment = { workspace = true }256pallet-transaction-payment-rpc-runtime-api = { workspace = true }257pallet-treasury = { workspace = true }258pallet-xcm = { workspace = true }259parachain-info = { workspace = true }260polkadot-parachain = { workspace = true }261smallvec = { workspace = true }262sp-api = { workspace = true }263sp-arithmetic = { workspace = true }264sp-block-builder = { workspace = true }265sp-consensus-aura = { workspace = true }266sp-core = { workspace = true }267sp-inherents = { workspace = true }268sp-io = { workspace = true }269sp-offchain = { workspace = true }270sp-runtime = { workspace = true }271sp-session = { workspace = true }272sp-std = { workspace = true }273sp-transaction-pool = { workspace = true }274sp-version = { workspace = true }275xcm = { workspace = true }276xcm-builder = { workspace = true }277xcm-executor = { workspace = true }278279app-promotion-rpc = { workspace = true }280derivative = { workspace = true }281fp-evm = { workspace = true }282log = { workspace = true }283pallet-app-promotion = { workspace = true }284pallet-balances-adapter = { workspace = true }285pallet-collator-selection = { workspace = true }286pallet-common = { workspace = true }287pallet-configuration = { workspace = true }288pallet-fungible = { workspace = true }289pallet-identity = { workspace = true }290pallet-inflation = { workspace = true }291pallet-nonfungible = { workspace = true }292pallet-democracy = { workspace = true }293pallet-collective = { workspace = true }294pallet-ranked-collective = { workspace = true }295pallet-membership = { workspace = true }296pallet-referenda = { workspace = true }297pallet-gov-origins = { workspace = true }298pallet-scheduler = { workspace = true }299pallet-refungible = { workspace = true }300pallet-structure = { workspace = true }301pallet-unique = { workspace = true }302scale-info = { workspace = true }303up-common = { workspace = true }304up-data-structs = { workspace = true }305up-pov-estimate-rpc = { workspace = true }306up-rpc = { workspace = true }307# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }308evm-coder = { workspace = true }309fp-rpc = { workspace = true }310fp-self-contained = { workspace = true }311num_enum = { version = "0.5.3", default-features = false }312pallet-base-fee = { workspace = true }313pallet-charge-transaction = { workspace = true }314pallet-ethereum = { workspace = true }315pallet-evm = { workspace = true }316pallet-evm-coder-substrate = { workspace = true }317pallet-evm-contract-helpers = { workspace = true }318pallet-evm-migration = { workspace = true }319pallet-evm-precompile-simple = { workspace = true }320pallet-evm-transaction-payment = { workspace = true }321pallet-foreign-assets = { workspace = true }322pallet-maintenance = { workspace = true }323precompile-utils-macro = { workspace = true }324up-sponsorship = { workspace = true }325326################################################################################327# Optional dependencies328329frame-benchmarking = { workspace = true, optional = true }330frame-system-benchmarking = { workspace = true, optional = true }331frame-try-runtime = { workspace = true, optional = true }332serde = { workspace = true, optional = true }333334335################################################################################336# Test dependencies337338pallet-test-utils = { workspace = true }339340################################################################################341# Other Dependencies342343hex-literal = { workspace = true }344impl-trait-for-tuples = { workspace = true }345346[build-dependencies]347substrate-wasm-builder = { 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>() {