feat: dynamic council threshold (#1890)

Signed-off-by: Cheng JIANG <[email protected]> Signed-off-by: Cheng JIANG <[email protected]>
parallel-finance · Oct 7, 2022 · ee7d41e · ee7d41e
1 parent 3dfb1a8
commit ee7d41e
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 13 deletions.
diff --git a/scripts/helper/src/commands/democracy/runtime-upgrade.ts b/scripts/helper/src/commands/democracy/runtime-upgrade.ts
@@ -3,7 +3,7 @@ import https from 'https'
 import { Command, CreateCommandParameters, program } from '@caporal/core'
 import { Keyring } from '@polkadot/api'
 import { blake2AsHex } from '@polkadot/util-crypto'
-import { getApi, nextNonce } from '../../utils'
+import { getApi, getCouncilThreshold, nextNonce } from '../../utils'
 
 export default function ({ createCommand }: CreateCommandParameters): Command {
   return createCommand('runtime upgrade via democracy')
@@ -50,7 +50,7 @@ export default function ({ createCommand }: CreateCommandParameters): Command {
 
       const tx = api.tx.utility.batchAll([
         api.tx.democracy.notePreimage(encoded),
-        api.tx.generalCouncil.propose(3, external, external.length)
+        api.tx.generalCouncil.propose(await getCouncilThreshold(api), external, external.length)
       ])
       if (dryRun) {
         return logger.info(`hex-encoded call: ${tx.toHex()}`)

diff --git a/scripts/helper/src/commands/hrmp/accept.ts b/scripts/helper/src/commands/hrmp/accept.ts
@@ -1,4 +1,11 @@
-import { createXcm, getApi, getRelayApi, nextNonce, sovereignRelayOf } from '../../utils'
+import {
+  createXcm,
+  getApi,
+  getCouncilThreshold,
+  getRelayApi,
+  nextNonce,
+  sovereignRelayOf
+} from '../../utils'
 import { Command, CreateCommandParameters, program } from '@caporal/core'
 import { Keyring } from '@polkadot/api'
 
@@ -41,7 +48,11 @@ export default function ({ createCommand }: CreateCommandParameters): Command {
         },
         createXcm(`0x${encoded.slice(6)}`, sovereignRelayOf(target.valueOf() as number))
       )
-      const tx = api.tx.generalCouncil.propose(3, proposal, proposal.length)
+      const tx = api.tx.generalCouncil.propose(
+        await getCouncilThreshold(api),
+        proposal,
+        proposal.length
+      )
 
       if (dryRun) {
         return logger.info(`hex-encoded call: ${tx.toHex()}`)

diff --git a/scripts/helper/src/commands/hrmp/open.ts b/scripts/helper/src/commands/hrmp/open.ts
@@ -5,7 +5,8 @@ import {
   nextNonce,
   sovereignRelayOf,
   getDefaultRelayChainWsUrl,
-  getDefaultParachainWsUrl
+  getDefaultParachainWsUrl,
+  getCouncilThreshold
 } from '../../utils'
 import { Command, CreateCommandParameters, program } from '@caporal/core'
 import { Keyring } from '@polkadot/api'
@@ -60,7 +61,11 @@ export default function ({ createCommand }: CreateCommandParameters): Command {
         },
         createXcm(`0x${encoded.slice(6)}`, sovereignRelayOf(source.valueOf() as number))
       )
-      const tx = api.tx.generalCouncil.propose(3, proposal, proposal.length)
+      const tx = api.tx.generalCouncil.propose(
+        await getCouncilThreshold(api),
+        proposal,
+        proposal.length
+      )
 
       if (dryRun) {
         return logger.info(`hex-encoded call: ${tx.toHex()}`)

diff --git a/scripts/helper/src/commands/set/add-market.ts b/scripts/helper/src/commands/set/add-market.ts
@@ -1,4 +1,4 @@
-import { getApi, nextNonce } from '../../utils'
+import { getApi, getCouncilThreshold, nextNonce } from '../../utils'
 import { Command, CreateCommandParameters, program } from '@caporal/core'
 import { Keyring } from '@polkadot/api'
 import { readFile } from '../../utils'
@@ -115,7 +115,11 @@ export default function ({ createCommand }: CreateCommandParameters): Command {
         )
       )
 
-      const tx = api.tx.generalCouncil.propose(3, proposal, proposal.length)
+      const tx = api.tx.generalCouncil.propose(
+        await getCouncilThreshold(api),
+        proposal,
+        proposal.length
+      )
 
       if (dryRun) {
         return logger.info(`hex-encoded call: ${tx.toHex()}`)

diff --git a/scripts/helper/src/commands/set/market-reward.ts b/scripts/helper/src/commands/set/market-reward.ts
@@ -1,4 +1,4 @@
-import { getApi, nextNonce } from '../../utils'
+import { getApi, getCouncilThreshold, nextNonce } from '../../utils'
 import { Command, CreateCommandParameters, program } from '@caporal/core'
 import { Keyring } from '@polkadot/api'
 import { readFile } from '../../utils'
@@ -48,7 +48,11 @@ export default function ({ createCommand }: CreateCommandParameters): Command {
         })
       )
 
-      const tx = api.tx.generalCouncil.propose(3, proposal, proposal.length)
+      const tx = api.tx.generalCouncil.propose(
+        await getCouncilThreshold(api),
+        proposal,
+        proposal.length
+      )
 
       if (dryRun) {
         return logger.info(`hex-encoded call: ${tx.toHex()}`)

diff --git a/scripts/helper/src/commands/ump/transact.ts b/scripts/helper/src/commands/ump/transact.ts
@@ -1,4 +1,4 @@
-import { createXcm, getApi, nextNonce, sovereignRelayOf } from '../../utils'
+import { createXcm, getApi, getCouncilThreshold, nextNonce, sovereignRelayOf } from '../../utils'
 import { Command, CreateCommandParameters, program } from '@caporal/core'
 import { Keyring } from '@polkadot/api'
 import { u32 } from '@polkadot/types'
@@ -38,7 +38,11 @@ export default function ({ createCommand }: CreateCommandParameters): Command {
           'SovereignAccount'
         )
       )
-      const tx = api.tx.generalCouncil.propose(3, proposal, proposal.length)
+      const tx = api.tx.generalCouncil.propose(
+        await getCouncilThreshold(api),
+        proposal,
+        proposal.length
+      )
 
       if (dryRun) {
         return logger.info(`hex-encoded call: ${tx.toHex()}`)

diff --git a/scripts/helper/src/utils.ts b/scripts/helper/src/utils.ts
@@ -6,8 +6,9 @@ import { blake2AsU8a } from '@polkadot/util-crypto'
 import { stringToU8a, bnToU8a, u8aConcat, u8aToHex } from '@polkadot/util'
 import { decodeAddress, encodeAddress } from '@polkadot/keyring'
 import { KeyringPair } from '@polkadot/keyring/types'
-import { Index } from '@polkadot/types/interfaces'
+import { AccountId, Index } from '@polkadot/types/interfaces'
 import { promisify } from 'util'
+import { Vec } from '@polkadot/types'
 
 const EMPTY_U8A_32 = new Uint8Array(32)
 
@@ -153,6 +154,11 @@ export const getRelayApi = async (endpoint: string): Promise<ApiPromise> => {
   })
 }
 
+export const getCouncilThreshold = async (api: ApiPromise): Promise<number> => {
+  const members = (await api.query.generalCouncilMembership.members()) as unknown as Vec<AccountId>
+  return Math.ceil(members.length / 2)
+}
+
 export const calcWeightPerSecond = (precision: number, price: number): number => {
   const WEIGHT_PER_SECOND = 10 ** 12
   // for fixed weigher always 600_000_000