[Global Disputes] Fix issues after first battery station live test

Cargo.toml

@@ -255,6 +255,7 @@ hex-literal = { version = "0.3.4", default-features = false }
 log = { version = "0.4.17", default-features = false }
 num-traits = { version = "0.2.15", default-features = false }
 rand = { version = "0.8.5", default-features = false }
+rand_chacha = { version = "0.3.1", default-features = false }
 serde = { version = "1.0.152", default-features = false }
 
 [profile.dev.package]

Makefile

@@ -20,7 +20,7 @@ check-dummy:
 	RUST_LOG=runtime=trace,try-runtime::cli=trace,executor=trace \
 		cargo run \
 		--bin=zeitgeist \
-		--features=parachain,try-runtime \
+		--features=parachain,try-runtime${ADDITIONAL_FEATURES} \
 		try-runtime \
 		--chain=${TRYRUNTIME_CHAIN} \
 		--runtime=${RUNTIME_PATH} \

docs/changelog_for_devs.md

@@ -8,20 +8,99 @@ and does not represent a complete changelog for the zeitgeistpm/zeitgeist
 repository.
 
 As of 0.3.9, the changelog's format is based on
-https://keepachangelog.com/en/1.0.0/ and ⚠️ marks changes that might break
+<https://keepachangelog.com/en/1.0.0/> and ⚠️ marks changes that might break
 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.
+  - `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.
+  - `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.
+  - `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:
+  - `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.
+  - `JurorVoted` - A juror voted on a specific court case.
+  - `JurorRevealedVote` - A juror revealed the previously casted secret vote.
+  - `DenouncedJurorVote` - A juror was denounced.
+  - `DelegatorJoined` - A delegator joined the court system.
+  - `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.
+  - `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
 
@@ -32,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
 
@@ -43,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])
@@ -113,7 +196,7 @@ APIs/RPC interface.
   - Added xTokens pallet to transfer tokens accross chains
   - Added AssetRegistry pallet to register foreign asset
   - Added UnknownTokens pallet to handle unknown foreign assets
-  - More information at https://github.com/zeitgeistpm/zeitgeist/pull/661#top
+  - More information at <https://github.com/zeitgeistpm/zeitgeist/pull/661#top>
 
 - Transformed integer scalar markets to fixed point with ten digits after the
   decimal point. As soon as this update is deployed, the interpretation of the
@@ -212,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`

primitives/Cargo.toml

@@ -28,7 +28,6 @@ std = [
     "sp-core/std",
     "sp-runtime/std",
 ]
-with-global-disputes = []
 
 [package]
 authors = ["Zeitgeist PM <[email protected]>"]

primitives/src/constants.rs

@@ -30,11 +30,11 @@ use crate::types::{Balance, BlockNumber};
 use frame_support::{parameter_types, PalletId};
 
 // Definitions for time
-pub const BLOCKS_PER_YEAR: BlockNumber = (BLOCKS_PER_DAY * 36525) / 100;
-pub const BLOCKS_PER_DAY: BlockNumber = BLOCKS_PER_HOUR * 24;
+pub const BLOCKS_PER_YEAR: BlockNumber = (BLOCKS_PER_DAY * 36525) / 100; // 2_629_800
+pub const BLOCKS_PER_DAY: BlockNumber = BLOCKS_PER_HOUR * 24; // 7_200
 pub const MILLISECS_PER_BLOCK: u32 = 12000;
-pub const BLOCKS_PER_MINUTE: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);
-pub const BLOCKS_PER_HOUR: BlockNumber = BLOCKS_PER_MINUTE * 60;
+pub const BLOCKS_PER_MINUTE: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber); // 5
+pub const BLOCKS_PER_HOUR: BlockNumber = BLOCKS_PER_MINUTE * 60; // 300
 
 // Definitions for currency
 pub const BASE: u128 = 10_000_000_000;
@@ -70,6 +70,8 @@ pub const AUTHORIZED_PALLET_ID: PalletId = PalletId(*b"zge/atzd");
 // Court
 /// Pallet identifier, mainly used for named balance reserves.
 pub const COURT_PALLET_ID: PalletId = PalletId(*b"zge/cout");
+/// Lock identifier, mainly used for the locks on the accounts.
+pub const COURT_LOCK_ID: [u8; 8] = *b"zge/colk";
 
 // Global Disputes
 pub const GLOBAL_DISPUTES_PALLET_ID: PalletId = PalletId(*b"zge/gldp");

primitives/src/constants/mock.rs

@@ -34,19 +34,33 @@ parameter_types! {
 
 // Court
 parameter_types! {
-    pub const CourtCaseDuration: u64 = BLOCKS_PER_DAY;
+    pub const AppealBond: Balance = 5 * BASE;
+    pub const AppealBondFactor: Balance = 2 * BASE;
+    pub const BlocksPerYear: BlockNumber = 10000;
     pub const CourtPalletId: PalletId = PalletId(*b"zge/cout");
-    pub const StakeWeight: u128 = 2 * BASE;
+    pub const RequestInterval: BlockNumber = 15;
+    pub const VotePeriod: BlockNumber = 3;
+    pub const AggregationPeriod: BlockNumber = 4;
+    pub const AppealPeriod: BlockNumber = 5;
+    pub const LockId: LockIdentifier = *b"zge/cloc";
+    pub const MaxAppeals: u32 = 4;
+    pub const MaxDelegations: u32 = 5;
+    pub const MaxSelectedDraws: u32 = 510;
+    pub const MaxCourtParticipants: u32 = 1_000;
+    pub const MinJurorStake: Balance = 50 * CENT;
+    pub const InflationPeriod: BlockNumber = 20;
 }
 
 // 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;
 }
 
@@ -58,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;

primitives/src/market.rs

@@ -178,6 +178,7 @@ pub enum MarketCreation {
 }
 
 /// Defines a global dispute item for the initialisation of a global dispute.
+#[derive(Clone, Decode, Encode, MaxEncodedLen, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 pub struct GlobalDisputeItem<AccountId, Balance> {
     /// The account that already paid somehow for the outcome.
     pub owner: AccountId,

primitives/src/traits/dispute_api.rs

@@ -98,7 +98,7 @@ pub trait DisputeApi {
     fn get_auto_resolve(
         market_id: &Self::MarketId,
         market: &MarketOfDisputeApi<Self>,
-    ) -> Result<ResultWithWeightInfo<Option<Self::BlockNumber>>, DispatchError>;
+    ) -> ResultWithWeightInfo<Option<Self::BlockNumber>>;
 
     /// Returns `true` if the market dispute mechanism
     /// was unable to come to a conclusion.
@@ -108,7 +108,7 @@ pub trait DisputeApi {
         market: &MarketOfDisputeApi<Self>,
     ) -> Result<ResultWithWeightInfo<bool>, DispatchError>;
 
-    /// Called, when a global dispute is started.
+    /// Initialise a global dispute for the failed market dispute mechanism.
     /// **May** assume that `market.dispute_mechanism` refers to the calling dispute API.
     ///
     /// # Returns

runtime/battery-station/Cargo.toml

@@ -324,7 +324,7 @@ std = [
     "zrml-prediction-markets/std",
     "zrml-rikiddo/std",
     "zrml-simple-disputes/std",
-    "zrml-global-disputes?/std",
+    "zrml-global-disputes/std",
     "zrml-styx/std",
     "zrml-swaps-runtime-api/std",
     "zrml-swaps/std",
@@ -377,7 +377,7 @@ try-runtime = [
     "zrml-prediction-markets/try-runtime",
     "zrml-rikiddo/try-runtime",
     "zrml-simple-disputes/try-runtime",
-    "zrml-global-disputes?/try-runtime",
+    "zrml-global-disputes/try-runtime",
     "zrml-styx/try-runtime",
     "zrml-swaps/try-runtime",
 
@@ -401,11 +401,6 @@ try-runtime = [
     "cumulus-pallet-xcmp-queue?/try-runtime",
     "parachain-info?/try-runtime",
 ]
-with-global-disputes = [
-    "zrml-global-disputes",
-    "common-runtime/with-global-disputes",
-    "zrml-prediction-markets/with-global-disputes",
-]
 
 [package]
 authors = ["Zeitgeist PM <[email protected]>"]

runtime/battery-station/src/lib.rs

@@ -166,19 +166,23 @@ impl Contains<RuntimeCall> for ContractsCallfilter {
 #[derive(scale_info::TypeInfo)]
 pub struct IsCallable;
 
-// Currently disables Court, Rikiddo and creation of markets using Court.
+// Currently disables Rikiddo.
 impl Contains<RuntimeCall> for IsCallable {
     fn contains(call: &RuntimeCall) -> bool {
         #[allow(clippy::match_like_matches_macro)]
         match call {
-            RuntimeCall::Court(_) => false,
+            RuntimeCall::SimpleDisputes(_) => false,
             RuntimeCall::LiquidityMining(_) => false,
             RuntimeCall::PredictionMarkets(inner_call) => {
                 match inner_call {
-                    // Disable Rikiddo markets
+                    // Disable Rikiddo and SimpleDisputes markets
                     create_market {
                         scoring_rule: ScoringRule::RikiddoSigmoidFeeMarketEma, ..
                     } => false,
+                    create_market {
+                        dispute_mechanism: MarketDisputeMechanism::SimpleDisputes,
+                        ..
+                    } => false,
                     edit_market {
                         scoring_rule: ScoringRule::RikiddoSigmoidFeeMarketEma, ..
                     } => false,
@@ -188,7 +192,15 @@ impl Contains<RuntimeCall> for IsCallable {
                         dispute_mechanism: MarketDisputeMechanism::Court,
                         ..
                     } => false,
+                    create_cpmm_market_and_deploy_assets {
+                        dispute_mechanism: MarketDisputeMechanism::SimpleDisputes,
+                        ..
+                    } => false,
                     edit_market { dispute_mechanism: MarketDisputeMechanism::Court, .. } => false,
+                    edit_market {
+                        dispute_mechanism: MarketDisputeMechanism::SimpleDisputes,
+                        ..
+                    } => false,
                     _ => true,
                 }
             }
@@ -199,13 +211,6 @@ impl Contains<RuntimeCall> for IsCallable {
 
 decl_common_types!();
 
-#[cfg(feature = "with-global-disputes")]
-create_runtime_with_additional_pallets!(
-    GlobalDisputes: zrml_global_disputes::{Call, Event<T>, Pallet, Storage} = 59,
-    Sudo: pallet_sudo::{Call, Config<T>, Event<T>, Pallet, Storage} = 150,
-);
-
-#[cfg(not(feature = "with-global-disputes"))]
 create_runtime_with_additional_pallets!(
     Sudo: pallet_sudo::{Call, Config<T>, Event<T>, Pallet, Storage} = 150,
 );