From 1c474a706e5620af7dbe355777cd1df579c543e6 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang <745124335@qq.com> Date: Thu, 5 Sep 2019 18:00:24 +0800 Subject: [PATCH] modify gov docs --- docs/features/governance.md | 23 ++++++++++++----------- docs/zh/features/governance.md | 23 ++++++++++++----------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/docs/features/governance.md b/docs/features/governance.md index 4edd4fae9..326af2155 100644 --- a/docs/features/governance.md +++ b/docs/features/governance.md @@ -7,6 +7,7 @@ 3. On-chain governance proposals on software upgrade 4. On-chain governance proposals on software halt 5. On-chain governance proposals on tax usage +6. On-chain governance proposals on token addition ## Interactive process @@ -14,7 +15,7 @@ Specific Proposal for different levels： - Critical：`SoftwareUpgrade`, `SystemHalt` -- Important：`Parameter` +- Important：`Parameter`,`TokenAddition` - Normal：`CommunityTaxUsage`,`PlainText` `SoftwareUpgrade Proposal` and `SystemHalt Proposal` can only be submitted by the profiler. @@ -23,20 +24,20 @@ Different levels correspond to different parameters： | GovParams | Critical | Important | Normal |Range| | ------ | ------ | ------ | ------|------| -| govDepositProcedure/MinDeposit | 4000 iris | 2000 iris | 1000 iris |[10iris,10000iris]| -| govDepositProcedure/MaxDepositPeriod | 24 hours | 24 hours | 24 hours |[20s,3d]| -| govVotingProcedure/VotingPeriod | 72 hours | 60 hours | 48 hours |[20s,3d]| -| govVotingProcedure/MaxProposal | 1 | 5 | 7 |Critical==1, other(1,)| -| govTallyingProcedure/Participation | 1/2 | 1/2 | 1/2 |(0,1)| -| govTallyingProcedure/Threshold | 3/4 | 2/3 | 1/2 |(0,1)| -| govTallyingProcedure/Veto | 1/3 | 1/3 | 1/3 |(0,1)| -| govTallyingProcedure/Penalty | 0 | 0 | 0 |(0,1)| +| MinDeposit | 4000 iris | 2000 iris | 1000 iris |[10iris,10000iris]| +| DepositPeriod | 24 hours | 24 hours | 24 hours |[20s,3d]| +| VotingPeriod | 120 hours | 120 hours | 120 hours |[20s,3d]| +| MaxNum | 1 | 5 | 7 |Critical==1, other(1,)| +| Participation | 0.5 | 0.5 | 0.5 |(0,1)| +| Threshold | 0.75 | 0.67 | 0.5 |(0,1)| +| Veto | 0.33 | 0.33 | 0.33 |(0,1)| +| Penalty | 0 | 0 | 0 |(0,1)| * `MinDeposit` The minimum of deposit -* `MaxDepositPeriod` Window period for deposit +* `DepositPeriod` Window period for deposit * `VotingPeriod` Window period for voting -* `MaxProposal` The maximum number of proposal that can exist at the same time +* `MaxNum` The maximum number of proposal that can exist at the same time * `Penalty` The proportion of the slash * `Veto` the power of Veto / all voted power * `Threshold` the power of Yes / all voted power diff --git a/docs/zh/features/governance.md b/docs/zh/features/governance.md index f2ce1c8b6..cba7c15a0 100644 --- a/docs/zh/features/governance.md +++ b/docs/zh/features/governance.md @@ -7,6 +7,7 @@ 3. 软件升级提议的链上治理 4. 网络终止提议的链上治理 5. Tax收入分配提议的链上治理 +6. 添加外部资产提议的链上治理 ## 交互流程 @@ -14,7 +15,7 @@ 不同级别对应的具体 Proposal： - Critical：`SoftwareUpgrade`, `SystemHalt` -- Important：`Parameter` +- Important：`Parameter`,`TokenAddition` - Normal：`CommunityTaxUsage`,`PlainText` `SoftwareUpgrade Proposal` 和 `SystemHalt Proposal` 只能由profiler发起。 @@ -23,20 +24,20 @@ | Gov参数 | Critical | Important | Normal |Range| | ------ | ------ | ------ | ------|------| -| govDepositProcedure/MinDeposit | 4000 iris | 2000 iris | 1000 iris |[10iris,10000iris]| -| govDepositProcedure/MaxDepositPeriod | 24 hours | 24 hours | 24 hours |[20s,3d]| -| govVotingProcedure/VotingPeriod | 72 hours | 60 hours | 48 hours |[20s,3d]| -| govVotingProcedure/MaxProposal | 1 | 5 | 7 |Critical==1, other(1,)| -| govTallyingProcedure/Participation | 1/2 | 1/2 | 1/2 |(0,1)| -| govTallyingProcedure/Threshold | 3/4 | 2/3 | 1/2 |(0,1)| -| govTallyingProcedure/Veto | 1/3 | 1/3 | 1/3 |(0,1)| -| govTallyingProcedure/Penalty | 0 | 0 | 0 |(0,1)| +| MinDeposit | 4000 iris | 2000 iris | 1000 iris |[10iris,10000iris]| +| DepositPeriod | 24 hours | 24 hours | 24 hours |[20s,3d]| +| VotingPeriod | 120 hours | 120 hours | 120 hours |[20s,3d]| +| MaxNum | 1 | 5 | 7 |Critical==1, other(1,)| +| Participation | 0.5 | 0.5 | 0.5 |(0,1)| +| Threshold | 0.75 | 0.67 | 0.5 |(0,1)| +| Veto | 0.33 | 0.33 | 0.33 |(0,1)| +| Penalty | 0 | 0 | 0 |(0,1)| * `MinDeposit` 最小抵押金额 -* `MaxDepositPeriod` 抵押阶段的窗口期 +* `DepositPeriod` 抵押阶段的窗口期 * `VotingPeriod` 投票阶段的窗口期 -* `MaxProposal` 该类型提议在网络中同时能存在的最大个数 +* `MaxNum` 该类型提议在网络中同时能存在的最大个数 * `Penalty` slash验证人绑定通证的比例 * `Veto` 强烈反对的power占参与投票power的比例， 如果达到这个比例则提议被拒绝， 提议结果为“强烈反对” * `Threshold` 提议通过所需"赞成"的power占参与投票power的比例， 如果达到这个比例则提议通过， 提议结果为“同意”