diff --git a/docs/general/polkadot-direction.md b/docs/general/polkadot-direction.md index b087ca70bff9..7b096e52dfbf 100644 --- a/docs/general/polkadot-direction.md +++ b/docs/general/polkadot-direction.md @@ -245,7 +245,7 @@ are breakable and prone to cyber-attacks. Polkadot is basing its resilience on d execution is not currently a scaling solution to build resilient systems. However, a library of richly featured and high-performance ZK primitives ready for specific use cases is being built. The first use-case will be used to improve privacy for on-chain collectives such as - [the Polkadot Technical Fellowship](../learn/learn-polkadot-opengov.md#the-technical-fellowship). + [the Polkadot Technical Fellowship](../learn/learn-polkadot-technical-fellowship.md). - **[Sassafras](../learn/learn-sassafras.md) consensus:** New forkless block-production consensus algorithm replacing [BABE](../learn/learn-consensus.md#block-production-babe) and where block are not produced unless they are expected to be finalized. This will provide several benefits, such diff --git a/docs/general/start-building.md b/docs/general/start-building.md index d4b05a42d168..077d81fcb22c 100644 --- a/docs/general/start-building.md +++ b/docs/general/start-building.md @@ -16,11 +16,10 @@ to the network protocol, runtime logic, and public interfaces, and other technic To submit an RFC, follow the instructions [here](https://github.com/polkadot-fellows/RFCs#process). RFCs can only be approved and merged by III-Dan members of -[Polkadot Technical Fellowship](../learn/learn-polkadot-opengov.md#the-technical-fellowship) via -on-chain voting mechanism. Definitive approval or rejection is done by issuing the -`RFC_APPROVE(xxxx, h)` or `RFC_REJECT(xxxx, h)` on-chain remark from the Fellowship origin on the -Polkadot Collectives parachain, where `xxxx` is the RFC number and `h` is the hash of the raw -proposal text. +[Polkadot Technical Fellowship](../learn/learn-polkadot-technical-fellowship.md) via on-chain voting +mechanism. Definitive approval or rejection is done by issuing the `RFC_APPROVE(xxxx, h)` or +`RFC_REJECT(xxxx, h)` on-chain remark from the Fellowship origin on the Polkadot Collectives +parachain, where `xxxx` is the RFC number and `h` is the hash of the raw proposal text. For example, the first RFC [RFC-1](https://github.com/polkadot-fellows/RFCs/pull/1) about Agile Coretime was proposed by Gavin Wood on the 30th of June 2023 and merged on the 12th of August 2023. diff --git a/docs/learn/learn-polkadot-opengov-origins.md b/docs/learn/learn-polkadot-opengov-origins.md index 39a637d7f403..8f478d49b336 100644 --- a/docs/learn/learn-polkadot-opengov-origins.md +++ b/docs/learn/learn-polkadot-opengov-origins.md @@ -95,12 +95,12 @@ ample time to vote on the proposal during the decision period. ### Whitelisted Caller -Origin commanded by the [Fellowship](../learn/learn-polkadot-opengov.md#the-technical-fellowship) -whitelist some hash of a call and allow the call to be dispatched with the root origin (after the -referendum passes). This track allows for a shorter voting turnaround, safe in the knowledge through -an open and transparent process for time-critical proposals. For instance, a referendum proposed in -this track needs to amass {{ polkadot: 20% :polkadot }}{{ kusama: 14% :kusama }} support (much -lesser than the root) by the end of the first day with over +Origin commanded by the [Fellowship](../learn/learn-polkadot-technical-fellowship.md) whitelist some +hash of a call and allow the call to be dispatched with the root origin (after the referendum +passes). This track allows for a shorter voting turnaround, safe in the knowledge through an open +and transparent process for time-critical proposals. For instance, a referendum proposed in this +track needs to amass {{ polkadot: 20% :polkadot }}{{ kusama: 14% :kusama }} support (much lesser +than the root) by the end of the first day with over {{ polkadot: 93.5% :polkadot }}{{ kusama: 88% :kusama }} approval to be considered to be part of the confirm period. diff --git a/docs/learn/learn-polkadot-opengov.md b/docs/learn/learn-polkadot-opengov.md index 06323aca61f5..9dd3ac996733 100644 --- a/docs/learn/learn-polkadot-opengov.md +++ b/docs/learn/learn-polkadot-opengov.md @@ -106,7 +106,7 @@ following main changes: - Dissolving the current [Council](./learn-governance.md#council) collective - Allowing users to delegate voting power in more ways to community members - Dissolving the [Technical Committee](./learn-governance.md#technical-committee) and establishing - the broader [Polkadot Technical Fellowship](#the-technical-fellowship) + the broader [Polkadot Technical Fellowship](./learn-polkadot-technical-fellowship.md) The figure below shows an overview of Polkadot OpenGov's structure. @@ -128,7 +128,7 @@ be submitted in different tracks depending on the amount requested. A proposal f need to be submitted in the Small Tipper track, while a proposal requiring substantial funds will need to be submitted to the Medium or Big Spender track. -The [Polkadot Technical Fellowship](#the-technical-fellowship) can decide to +The [Polkadot Technical Fellowship](./learn-polkadot-technical-fellowship.md) can decide to [whitelist](#whitelisting) a proposal that will be enacted through the Whitelist Caller origin. Those proposals will have a shorter Lead-in, Confirmation, and Enactment period when compared to the Root Origin track. @@ -162,7 +162,7 @@ and learn how to use it. | Governance V1 | Polkadot OpenGov | Polkadot OpenGov Benefit | | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| Includes the [Council](./learn-governance.md#council), the [Technical Committee](./learn-governance.md#technical-committee), and the Public (i.e. token holders). | Includes the Public and the [Technical Fellowship](#the-technical-fellowship). | Simpler and more decentralized structure. | +| Includes the [Council](./learn-governance.md#council), the [Technical Committee](./learn-governance.md#technical-committee), and the Public (i.e. token holders). | Includes the Public and the [Technical Fellowship](./learn-polkadot-technical-fellowship.md). | Simpler and more decentralized structure. | | Referenda executed only from one origin (Root). Referenda in this origin must be carefully scrutinized. Therefore, there is only one track (i.e. only one referendum at a time can be executed). | Referenda executed from [multiple origins](./learn-polkadot-opengov-origins.md#origins-and-tracks-info), each with a different track that shapes proposals’ timelines. Depending on the origin, multiple referenda within the same track are possible. | Possibility to categorize proposals (based on importance and urgency) and execute them simultaneously within and between origin tracks. | | Proposals can be submitted by either the Council or the Public. | The public submits proposals. | More democratic. | | Uses [Adaptive Quorum Biasing](./learn-governance.md#adaptive-quorum-biasing) to define the approval threshold based on turnout. Given the same turnout, council-initiated referenda require fewer Aye votes to pass compared to public referenda. | Uses origin-specific approval and support curves defining the amount of approval and support (i.e. turnout) needed as a function of time. The same curves are applied to all referenda within the same origin track. | Referenda timeline depends on the origin and not on who submitted the proposal (i.e. Council or Public). This is a more democratic and equalitarian system. | @@ -229,8 +229,8 @@ in Governance v1. ::: **In Polkadot OpenGov all referenda are public.** The -[Technical Fellowship](#the-technical-fellowship) has the option to [whitelist](#whitelisting) -referenda that can be then proposed in the track with +[Technical Fellowship](./learn-polkadot-technical-fellowship.md) has the option to +[whitelist](#whitelisting) referenda that can be then proposed in the track with [whitelist origin](./learn-polkadot-opengov-origins.md#whitelisted-caller). ### Referenda Timeline @@ -535,26 +535,30 @@ to pay for transaction fees. #### Voting Without Conviction A lock is placed on the {{ polkadot: DOT :polkadot }}{{ kusama: KSM :kusama }} when you vote on an -Ongoing referendum. If you choose to remove your vote when the referendum is still in the decision period, -your voting lock is removed. Once the referendum is decided (accepted or rejected), your {{ polkadot: DOT :polkadot }}{{ kusama: KSM :kusama }} -will be available for unlocking if you voted with zero conviction. The governance app or interface you -used for participating in Polkadot OpenGov should show an option to unlock your {{ polkadot: DOT :polkadot }}{{ kusama: KSM :kusama }}. -[Here](https://support.polkadot.network/support/solutions/articles/65000184129) are the instructions to -do it on the Polkadot-JS UI. +Ongoing referendum. If you choose to remove your vote when the referendum is still in the decision +period, your voting lock is removed. Once the referendum is decided (accepted or rejected), your +{{ polkadot: DOT :polkadot }}{{ kusama: KSM :kusama }} will be available for unlocking if you voted +with zero conviction. The governance app or interface you used for participating in Polkadot OpenGov +should show an option to unlock your {{ polkadot: DOT :polkadot }}{{ kusama: KSM :kusama }}. +[Here](https://support.polkadot.network/support/solutions/articles/65000184129) are the instructions +to do it on the Polkadot-JS UI. #### Voting with Conviction -If you voted with conviction, the corresponding locks start at the end of the Referendum and not at the moment you voted. -For instance, let's say you voted AYE with 6X conviction on a referendum, and it got accepted; the -{{ polkadot: DOT :polkadot }}{{ kusama: KSM :kusama }} you voted with is locked for 32 weeks from that moment. -If you voted NAY with 6X conviction on a referendum and it got accepted, then your {{ polkadot: DOT :polkadot }}{{ kusama: KSM :kusama }} -would be ready to be unlocked immediately. Polkadot OpenGov is designed to ensure that only the winning side -is mandated to lock their {{ polkadot: DOT :polkadot }}{{ kusama: KSM :kusama }} and the losing side can claim -{{ polkadot: DOT :polkadot }}{{ kusama: KSM :kusama }} and have it added to the transferable balance on their account. - -For unlocking generic account locks, navigate to [this section](./learn-guides-accounts.md#unlocking-locks). When you -delegate your votes, the locking mechanism differs slightly. Please check the next section on Multirole Delegation for -more information. +If you voted with conviction, the corresponding locks start at the end of the Referendum and not at +the moment you voted. For instance, let's say you voted AYE with 6X conviction on a referendum, and +it got accepted; the {{ polkadot: DOT :polkadot }}{{ kusama: KSM :kusama }} you voted with is locked +for 32 weeks from that moment. If you voted NAY with 6X conviction on a referendum and it got +accepted, then your {{ polkadot: DOT :polkadot }}{{ kusama: KSM :kusama }} would be ready to be +unlocked immediately. Polkadot OpenGov is designed to ensure that only the winning side is mandated +to lock their {{ polkadot: DOT :polkadot }}{{ kusama: KSM :kusama }} and the losing side can claim +{{ polkadot: DOT :polkadot }}{{ kusama: KSM :kusama }} and have it added to the transferable balance +on their account. + +For unlocking generic account locks, navigate to +[this section](./learn-guides-accounts.md#unlocking-locks). When you delegate your votes, the +locking mechanism differs slightly. Please check the next section on Multirole Delegation for more +information. ### Multirole Delegation diff --git a/docs/learn/learn-system-chains.md b/docs/learn/learn-system-chains.md index fb412d7bf352..5628fd45f964 100644 --- a/docs/learn/learn-system-chains.md +++ b/docs/learn/learn-system-chains.md @@ -116,8 +116,8 @@ Polkadot network. Some of these collectives are the [Polkadot Alliance](https://polkadot.polkassembly.io/referendum/94) and the Polkadot Technical -[Fellowship](./learn-polkadot-opengov.md#the-technical-fellowship). These on-chain collectives will -play important roles in the future of network stewardship and decentralized governance. +[Fellowship](./learn-polkadot-technical-fellowship.md). These on-chain collectives will play +important roles in the future of network stewardship and decentralized governance. Networks themselves can act as collectives and express their legislative voices as single opinions within other networks. This is achieved with the assistance from a [bridge hub](#bridge-hubs).