zeitgeistpm · Chralt98 · Aug 23, 2023 · Mar 27, 2023 · Mar 27, 2023 · Mar 27, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docs/changelog_for_devs.md b/docs/changelog_for_devs.md
@@ -13,27 +13,47 @@ components which query the chain's storage, the extrinsics or the runtime
 APIs/RPC interface.
 
 ## v0.4.0
+
 [#976]: https://github.com/zeitgeistpm/zeitgeist/pull/976
 
+### Changed
+
+All things about Global Disputes Fix ⚠️ :
+
+- Replace `WinnerInfo` by `GlobalDisputeInfo` with the following fields:
+  - `winner_outcome: OutcomeReport`
+  - `outcome_info: OutcomeInfo`
+  - `status: GdStatus`
+
+### Removed
+
+All things about Global Disputes Fix ⚠️ :
+
+- Remove the following event:
+  - `OutcomeOwnersRewardedWithNoFunds`
+
 ### Added
-- ⚠️ Add court production implementation ([#976]).
-  Dispatchable calls are:
-  - `join_court` - Join the court with a stake to become a juror in order to get the stake-weighted
-      chance to be selected for decision making.
+
+- ⚠️ Add court production implementation ([#976]). Dispatchable calls are:
+  - `join_court` - Join the court with a stake to become a juror in order to get
+    the stake-weighted chance to be selected for decision making.
   - `delegate` - Join the court with a stake to become a delegator in order to
-      delegate the voting power to actively participating jurors.
-  - `prepare_exit_court` - Prepare as a court participant to leave the court system.
+    delegate the voting power to actively participating jurors.
+  - `prepare_exit_court` - Prepare as a court participant to leave the court
+    system.
   - `exit_court` - Exit the court system in order to get the stake back.
-  - `vote` - An actively participating juror votes secretely on a specific court case,
-      in which the juror got selected.
+  - `vote` - An actively participating juror votes secretely on a specific court
+    case, in which the juror got selected.
   - `denounce_vote` - Denounce a selected and active juror, if the secret and
-      vote is known before the actual reveal period.
-  - `reveal_vote` - An actively participating juror reveals the previously casted secret vote.
-  - `appeal` - After the reveal phase (aggregation period), the jurors decision can be appealed.
-  - `reassign_juror_stakes` - After the appeal period is over,
-      losers pay the winners for the jurors and delegators.
-  - `set_inflation` - Set the yearly inflation rate of the court system.
-  Events are:
+    vote is known before the actual reveal period.
+  - `reveal_vote` - An actively participating juror reveals the previously
+    casted secret vote.
+  - `appeal` - After the reveal phase (aggregation period), the jurors decision
+    can be appealed.
+  - `reassign_juror_stakes` - After the appeal period is over, losers pay the
+    winners for the jurors and delegators.
+  - `set_inflation` - Set the yearly inflation rate of the court system. Events
+    are:
   - `JurorJoined` - A juror joined the court system.
   - `ExitPrepared` - A court participant prepared to exit the court system.
   - `ExitedCourt` - A court participant exited the court system.
@@ -44,22 +64,43 @@ APIs/RPC interface.
   - `CourtAppealed` - A court case was appealed.
   - `MintedInCourt` - A court participant was rewarded with newly minted tokens.
   - `StakesReassigned` - The juror and delegator stakes have been reassigned.
-      The losing jurors have been slashed.
-      The winning jurors have been rewarded by the losers.
-      The losing jurors are those, who did not vote, or did not vote with the plurality,
-      were denounced or did not reveal their vote.
+    The losing jurors have been slashed. The winning jurors have been rewarded
+    by the losers. The losing jurors are those, who did not vote, or did not
+    vote with the plurality, were denounced or did not reveal their vote.
   - `InflationSet` - The yearly inflation rate of the court system was set.
 
+All things about Global Disputes Fix ⚠️ :
+
+- Add new dispatchable function:
+  - `refund_vote_fees` - Return all vote funds and fees, when a global dispute
+    was destroyed.
+- Add the following events:
+  - `OutcomeOwnerRewarded` for `Possession::Paid`
+  - `OutcomeOwnersRewarded` for `Possession::Shared`
+  - `OutcomesFullyCleaned` and `OutcomesPartiallyCleaned` for extrinsic
+    `refund_vote_fees`
+- Add enum `Possession` with variants:
+- `Paid { owner: AccountId, fee: Balance }`
+- `Shared { owners: BoundedVec }`
+- `OutcomeInfo` has the following fields:
+  - `outcome_sum: Balance`
+  - `possession: Possession`
+- Add `GdStatus` with the following enum variants:
+  - `Active { add_outcome_end: BlockNumber, vote_end: BlockNumber }`
+  - `Finished`
+  - `Destroyed`
+
 ## v0.3.11
 
 [#1049]: https://github.com/zeitgeistpm/zeitgeist/pull/1049
 
 ### Changed
 
 - ⚠️ All tokens now use 10 fractional decimal places ([#1049]).
-- Cross-consensus messages (XCM) assume the global canonical representation for token balances.
-- The token metadata in the asset registry now assumes that the existential deposit and fee factor
-  are stored in base 10,000,000,000.
+- Cross-consensus messages (XCM) assume the global canonical representation for
+  token balances.
+- The token metadata in the asset registry now assumes that the existential
+  deposit and fee factor are stored in base 10,000,000,000.
 
 ## v0.3.10
 
@@ -70,6 +111,7 @@ APIs/RPC interface.
 - Use pallet-asset-tx-payment for allowing to pay transaction fees in foreign
   currencies ([#1022]). This requires each transaction to specify the fee
   payment token with `asset_id` (`None` is ZTG).
+  > > > > > > > chralt98-court-overhaul
 
 ## v0.3.9
 
@@ -81,6 +123,9 @@ APIs/RPC interface.
 
 - ⚠️ Add `outsider` field to `MarketBonds` struct. In particular, the `Market`
   struct's layout has changed ([#903]).
+
+  # v0.3.9
+
 - Adjust `deposit` function used to calculate storage fees for the following
   pallets: identity, multisig, preimage, proxy. The cost of adding an identity
   reduced from a minimum of 125 ZTG to a minimum of 1.5243 ZTG ([#1011])
@@ -250,8 +295,8 @@ APIs/RPC interface.
 - The `MarketCounter` of the `market-commons` pallet is incremented by one. This
   means that `MarketCounter` is now equal to the total number of markets ever
   created, instead of equal to the id of the last market created. For details
-  regarding this fix, see <https://github.com/zeitgeistpm/zeitgeist/pull/636> and
-  <https://github.com/zeitgeistpm/zeitgeist/issues/365>.
+  regarding this fix, see <https://github.com/zeitgeistpm/zeitgeist/pull/636>
+  and <https://github.com/zeitgeistpm/zeitgeist/issues/365>.
 
 - Made the `min_asset_amount_out` and `max_price` parameters of
   `swap_exact_amount_in` and the `max_asset_amount_in` and `max_price`

diff --git a/primitives/src/constants/mock.rs b/primitives/src/constants/mock.rs
@@ -53,12 +53,14 @@ parameter_types! {
 
 // Global disputes parameters
 parameter_types! {
+    pub const AddOutcomePeriod: BlockNumber = 20;
     pub const GlobalDisputeLockId: LockIdentifier = *b"zge/vote";
     pub const GlobalDisputesPalletId: PalletId = PalletId(*b"zge/gldp");
     pub const MaxGlobalDisputeVotes: u32 = 50;
     pub const MaxOwners: u32 = 10;
     pub const MinOutcomeVoteAmount: Balance = 10 * CENT;
     pub const RemoveKeysLimit: u32 = 250;
+    pub const GdVotingPeriod: BlockNumber = 140;
     pub const VotingOutcomeFee: Balance = 100 * CENT;
 }
 
@@ -70,8 +72,8 @@ parameter_types! {
 // Prediction Market parameters
 parameter_types! {
     pub const AdvisoryBond: Balance = 25 * CENT;
-    pub const DisputeBond: Balance = 20 * BASE;
-    pub const GlobalDisputePeriod: BlockNumber = 7 * BLOCKS_PER_DAY;
+    pub const DisputeBond: Balance = 5 * BASE;
+    pub const DisputeFactor: Balance = 2 * BASE;
     pub const MaxCategories: u16 = 10;
     pub const MaxDisputeDuration: BlockNumber = 50;
     pub const MaxDisputes: u16 = 6;

diff --git a/runtime/battery-station/src/parameters.rs b/runtime/battery-station/src/parameters.rs
@@ -402,18 +402,20 @@ parameter_types! {
 
 parameter_types! {
     // Global Disputes
+    /// The time period in which the addition of new outcomes are allowed.
+    pub const AddOutcomePeriod: BlockNumber = BLOCKS_PER_DAY;
     /// Vote lock identifier, mainly used for the LockableCurrency on the native token.
     pub const GlobalDisputeLockId: LockIdentifier = GLOBAL_DISPUTES_LOCK_ID;
     /// Pallet identifier
     pub const GlobalDisputesPalletId: PalletId = GLOBAL_DISPUTES_PALLET_ID;
-    /// The period for a global dispute to end.
-    pub const GlobalDisputePeriod: BlockNumber = 3 * BLOCKS_PER_DAY;
-    /// The maximum number of owners for a voting outcome for private API calls of `push_voting_outcome`.
+    /// The maximum number of owners for a voting outcome for private API calls of `push_vote_outcome`.
     pub const MaxOwners: u32 = 10;
     /// The maximum number of market ids (participate in multiple different global disputes at the same time) for one account to vote on outcomes.
     pub const MaxGlobalDisputeVotes: u32 = 50;
     /// The minimum required amount to vote on an outcome.
     pub const MinOutcomeVoteAmount: Balance = 10 * BASE;
+    /// The time period in which votes are allowed.
+    pub const GdVotingPeriod: BlockNumber = 3 * BLOCKS_PER_DAY;
     /// The fee required to add a voting outcome.
     pub const VotingOutcomeFee: Balance = 200 * BASE;
     /// The remove limit for the Outcomes storage double map.

diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
@@ -61,6 +61,8 @@ macro_rules! decl_common_types {
             // IMPORTANT that AddDisputeBond comes before MoveDataToSimpleDisputes!!!
             zrml_prediction_markets::migrations::AddDisputeBond<Runtime>,
             zrml_prediction_markets::migrations::MoveDataToSimpleDisputes<Runtime>,
+            // TODO check when to execute this migration and what happens for main-net, since global-disputes was only present on battery station
+            zrml_global_disputes::migrations::ModifyGlobalDisputesStructures<Runtime>,
         );
 
         pub type Executive = frame_executive::Executive<
@@ -1094,7 +1096,6 @@ macro_rules! impl_config_traits {
             type DisputeBond = DisputeBond;
             type RuntimeEvent = RuntimeEvent;
             type GlobalDisputes = GlobalDisputes;
-            type GlobalDisputePeriod = GlobalDisputePeriod;
             // LiquidityMining is currently unstable.
             // NoopLiquidityMining will be applied only to mainnet once runtimes are separated.
             type LiquidityMining = NoopLiquidityMining;
@@ -1156,7 +1157,9 @@ macro_rules! impl_config_traits {
         }
 
         impl zrml_global_disputes::Config for Runtime {
+            type AddOutcomePeriod = AddOutcomePeriod;
             type Currency = Balances;
+            type DisputeResolution = zrml_prediction_markets::Pallet<Runtime>;
             type RuntimeEvent = RuntimeEvent;
             type GlobalDisputeLockId = GlobalDisputeLockId;
             type GlobalDisputesPalletId = GlobalDisputesPalletId;
@@ -1165,6 +1168,7 @@ macro_rules! impl_config_traits {
             type MaxOwners = MaxOwners;
             type MinOutcomeVoteAmount = MinOutcomeVoteAmount;
             type RemoveKeysLimit = RemoveKeysLimit;
+            type GdVotingPeriod = GdVotingPeriod;
             type VotingOutcomeFee = VotingOutcomeFee;
             type WeightInfo = zrml_global_disputes::weights::WeightInfo<Runtime>;
         }

diff --git a/runtime/zeitgeist/src/parameters.rs b/runtime/zeitgeist/src/parameters.rs
@@ -402,18 +402,20 @@ parameter_types! {
 
 parameter_types! {
     // Global Disputes
+    /// The time period in which the addition of new outcomes are allowed.
+    pub const AddOutcomePeriod: BlockNumber = BLOCKS_PER_DAY;
     /// Vote lock identifier, mainly used for the LockableCurrency on the native token.
     pub const GlobalDisputeLockId: LockIdentifier = GLOBAL_DISPUTES_LOCK_ID;
     /// Pallet identifier
     pub const GlobalDisputesPalletId: PalletId = GLOBAL_DISPUTES_PALLET_ID;
-    /// The period for a global dispute to end.
-    pub const GlobalDisputePeriod: BlockNumber = 7 * BLOCKS_PER_DAY;
-    /// The maximum number of owners for a voting outcome for private API calls of `push_voting_outcome`.
+    /// The maximum number of owners for a voting outcome for private API calls of `push_vote_outcome`.
     pub const MaxOwners: u32 = 10;
     /// The maximum number of market ids (participate in multiple different global disputes at the same time) for one account to vote on outcomes.
     pub const MaxGlobalDisputeVotes: u32 = 50;
     /// The minimum required amount to vote on an outcome.
     pub const MinOutcomeVoteAmount: Balance = 10 * BASE;
+    /// The time period in which votes are allowed.
+    pub const GdVotingPeriod: BlockNumber = 7 * BLOCKS_PER_DAY;
     /// The fee required to add a voting outcome.
     pub const VotingOutcomeFee: Balance = 200 * BASE;
     /// The remove limit for the Outcomes storage double map.

diff --git a/zrml/court/src/lib.rs b/zrml/court/src/lib.rs
@@ -402,12 +402,12 @@ mod pallet {
         /// The caller has not enough funds to join the court with the specified amount.
         AmountExceedsBalance,
         /// After the first join of the court the amount has to be equal or higher than the current stake.
-        /// This is to ensure the slashable amount in active court rounds 
+        /// This is to ensure the slashable amount in active court rounds
         /// is still smaller or equal to the stake.
         /// It is also necessary to calculate the `unconsumed` stake properly.
         /// Otherwise a juror could just reduce the probability to get selected whenever they want.
         /// But this has to be done by `prepare_exit_court` and `exit_court`.
-        /// Additionally, the `join_court` and `delegate` extrinsics 
+        /// Additionally, the `join_court` and `delegate` extrinsics
         /// use `extend_lock` and not `set_lock` or `remove_lock`.
         /// This means those extrinsics are not meant to get out, but only to get into the court.
         AmountBelowLastJoin,
@@ -2319,39 +2319,50 @@ mod pallet {
                 Error::<T>::MarketDoesNotHaveCourtMechanism
             );
 
-            let court_id = <MarketIdToCourtId<T>>::get(market_id)
-                .ok_or(Error::<T>::MarketIdToCourtIdNotFound)?;
-
-            let court = <Courts<T>>::get(court_id).ok_or(Error::<T>::CourtNotFound)?;
+            // oracle outcome is added by pm-pallet
+            let mut gd_outcomes: Vec<GlobalDisputeItem<Self::AccountId, Self::Balance>> =
+                Vec::new();
 
-            let report = market.report.as_ref().ok_or(Error::<T>::MarketReportNotFound)?;
-            let oracle_outcome = &report.outcome;
+            let mut appeals_len = 0u32;
+            let mut draws_len = 0u32;
 
-            let appeals_len = court.appeals.len() as u32;
-
-            let gd_outcomes = court
-                .appeals
-                .iter()
-                .filter_map(|a| {
-                    match a.appealed_vote_item.clone().into_outcome() {
-                        // oracle outcome is added by pm pallet
-                        Some(outcome) if outcome != *oracle_outcome => Some(GlobalDisputeItem {
-                            outcome,
-                            // we have no better global dispute outcome owner
-                            owner: Self::treasury_account_id(),
-                            // initial vote amount
-                            initial_vote_amount: <BalanceOf<T>>::zero(),
-                        }),
-                        _ => None,
-                    }
-                })
-                .collect::<Vec<GlobalDisputeItem<Self::AccountId, Self::Balance>>>();
+            // None case can happen if no dispute could be created,
+            // because there is not enough juror and delegator stake,
+            // in this case allow a global dispute
+            if let Some(court_id) = <MarketIdToCourtId<T>>::get(market_id) {
+                let court = <Courts<T>>::get(court_id).ok_or(Error::<T>::CourtNotFound)?;
+
+                appeals_len = court.appeals.len() as u32;
+
+                let report = market.report.as_ref().ok_or(Error::<T>::MarketReportNotFound)?;
+                let oracle_outcome = &report.outcome;
+
+                gd_outcomes = court
+                    .appeals
+                    .iter()
+                    .filter_map(|a| {
+                        match a.appealed_vote_item.clone().into_outcome() {
+                            // oracle outcome is added by pm pallet
+                            Some(outcome) if outcome != *oracle_outcome => {
+                                Some(GlobalDisputeItem {
+                                    outcome,
+                                    // we have no better global dispute outcome owner
+                                    owner: Self::treasury_account_id(),
+                                    // initial vote amount
+                                    initial_vote_amount: <BalanceOf<T>>::zero(),
+                                })
+                            }
+                            _ => None,
+                        }
+                    })
+                    .collect::<Vec<GlobalDisputeItem<Self::AccountId, Self::Balance>>>();
 
-            let old_draws = SelectedDraws::<T>::get(court_id);
-            let draws_len = old_draws.len() as u32;
-            Self::unlock_participants_from_last_draw(court_id, old_draws);
-            <SelectedDraws<T>>::remove(court_id);
-            <Courts<T>>::remove(court_id);
+                let old_draws = SelectedDraws::<T>::get(court_id);
+                draws_len = old_draws.len() as u32;
+                Self::unlock_participants_from_last_draw(court_id, old_draws);
+                <SelectedDraws<T>>::remove(court_id);
+                <Courts<T>>::remove(court_id);
+            }
 
             let res = ResultWithWeightInfo {
                 result: gd_outcomes,

diff --git a/zrml/global-disputes/README.md b/zrml/global-disputes/README.md
@@ -32,11 +32,19 @@ on which the market finally resolves.
   get their reward. Fails if the global dispute is not concluded yet.
 - `reward_outcome_owner` - Reward the collected fees to the owner(s) of a voting
   outcome. Fails if not all outcomes are already purged.
+- `refund_vote_fees` - Return all vote funds and fees, when a global dispute was
+  destroyed.
 
 #### Private Pallet API
 
-- `push_voting_outcome` - Start a global dispute, add an initial voting outcome
-  and vote on it.
+- `push_vote_outcome` - Add an initial voting outcome and vote on it with
+  `initial_vote_balance`.
 - `determine_voting_winner` - Determine the canonical voting outcome based on
   total locked tokens.
-- `is_started` - Check if the global dispute started already.
+- `does_exist` - Check if the global dispute does already exist.
+- `is_active` - Check if the global dispute is active to get votes
+  (`vote_on_outcome`) and allow the addition of new voting outcomes with
+  `add_vote_outcome`.
+- `start_global_dispute` - Start a global dispute.
+- `destroy_global_dispute` - Allow the users to get their voting funds and fee
+  payments back.