ZIP-0 Part II

primitives/src/constants/mock.rs

@@ -40,8 +40,7 @@ parameter_types! {
 // Prediction Market parameters
 parameter_types! {
     pub const AdvisoryBond: Balance = 25 * CENT;
-    pub const DisputeBond: Balance = 5 * BASE;
-    pub const DisputeFactor: Balance = 2 * BASE;
+    pub const DisputeBond: Balance = 20 * BASE;
     pub const GlobalDisputePeriod: BlockNumber = 7 * BLOCKS_PER_DAY;
     pub const MaxCategories: u16 = 10;
     pub const MaxDisputes: u16 = 6;
@@ -66,6 +65,8 @@ parameter_types! {
 // Simple disputes parameters
 parameter_types! {
     pub const SimpleDisputesPalletId: PalletId = PalletId(*b"zge/sedp");
+    pub const OutcomeBond: Balance = 5 * BASE;
+    pub const OutcomeFactor: Balance = 2 * BASE;
 }
 
 // Swaps parameters

primitives/src/market.rs

@@ -83,6 +83,7 @@ impl<AI, BA> Bond<AI, BA> {
 pub struct MarketBonds<AI, BA> {
     pub creation: Option<Bond<AI, BA>>,
     pub oracle: Option<Bond<AI, BA>>,
+    pub dispute: Option<Bond<AI, BA>>,
 }
 
 impl<AI: Ord, BA: frame_support::traits::tokens::Balance> MarketBonds<AI, BA> {
@@ -92,14 +93,16 @@ impl<AI: Ord, BA: frame_support::traits::tokens::Balance> MarketBonds<AI, BA> {
             Some(bond) if bond.who == *who => bond.value,
             _ => BA::zero(),
         };
-        value_or_default(&self.creation).saturating_add(value_or_default(&self.oracle))
+        value_or_default(&self.creation)
+            .saturating_add(value_or_default(&self.oracle))
+            .saturating_add(value_or_default(&self.dispute))
     }
 }
 
 // Used primarily for testing purposes.
 impl<AI, BA> Default for MarketBonds<AI, BA> {
     fn default() -> Self {
-        MarketBonds { creation: None, oracle: None }
+        MarketBonds { creation: None, oracle: None, dispute: None }
     }
 }
 
@@ -166,13 +169,22 @@ pub enum MarketCreation {
     Advised,
 }
 
+// TODO to remove, when Disputes storage item is removed
 #[derive(Clone, Decode, Encode, Eq, MaxEncodedLen, PartialEq, RuntimeDebug, TypeInfo)]
-pub struct MarketDispute<AccountId, BlockNumber> {
+pub struct OldMarketDispute<AccountId, BlockNumber> {
     pub at: BlockNumber,
     pub by: AccountId,
     pub outcome: OutcomeReport,
 }
 
+#[derive(Clone, Decode, Encode, Eq, MaxEncodedLen, PartialEq, RuntimeDebug, TypeInfo)]
+pub struct MarketDispute<AccountId, BlockNumber, Balance> {
+    pub at: BlockNumber,
+    pub by: AccountId,
+    pub outcome: OutcomeReport,
+    pub bond: Balance,
+}
+
 /// How a market should resolve disputes
 #[derive(Clone, Decode, Encode, Eq, MaxEncodedLen, PartialEq, RuntimeDebug, TypeInfo)]
 pub enum MarketDisputeMechanism {

runtime/battery-station/src/parameters.rs

@@ -149,11 +149,9 @@ parameter_types! {
     pub const AdvisoryBond: Balance = 25 * CENT;
     pub const AdvisoryBondSlashPercentage: Percent = Percent::from_percent(0);
     /// (Slashable) Bond that is provided for disputing the outcome.
-    /// Slashed in case the final outcome does not match the dispute for which the `DisputeBond`
-    /// was deposited.
-    pub const DisputeBond: Balance = 5 * BASE;
-    /// `DisputeBond` is increased by this factor after every dispute.
-    pub const DisputeFactor: Balance = 2 * BASE;
+    /// Unreserved in case the dispute was justified otherwise slashed.
+    /// This is when the resolved outcome is different to the default (reported) outcome.
+    pub const DisputeBond: Balance = 25 * BASE;
     /// Maximum Categories a prediciton market can have (excluding base asset).
     pub const MaxCategories: u16 = MAX_CATEGORIES;
     /// Maximum number of disputes.
@@ -217,6 +215,12 @@ parameter_types! {
     // Simple disputes parameters
     /// Pallet identifier, mainly used for named balance reserves.
     pub const SimpleDisputesPalletId: PalletId = SD_PALLET_ID;
+    /// (Slashable) Bond that is provided for overriding the last outcome addition.
+    /// Slashed in case the final outcome does not match the dispute for which the `OutcomeBond`
+    /// was deposited.
+    pub const OutcomeBond: Balance = 5 * BASE;
+    /// `OutcomeBond` is increased by this factor after every new outcome addition.
+    pub const OutcomeFactor: Balance = 2 * BASE;
 
     // Swaps parameters
     /// A precentage from the withdrawal amount a liquidity provider wants to withdraw

runtime/common/src/lib.rs

@@ -986,6 +986,7 @@ macro_rules! impl_config_traits {
             type Court = Court;
             type CloseOrigin = EnsureRootOrTwoThirdsAdvisoryCommittee;
             type DestroyOrigin = EnsureRootOrAllAdvisoryCommittee;
+            type DisputeBond = DisputeBond;
             type Event = Event;
             #[cfg(feature = "with-global-disputes")]
             type GlobalDisputes = GlobalDisputes;
@@ -1041,8 +1042,8 @@ macro_rules! impl_config_traits {
 
         impl zrml_simple_disputes::Config for Runtime {
             type AssetManager = AssetManager;
-            type DisputeBond = DisputeBond;
-            type DisputeFactor = DisputeFactor;
+            type OutcomeBond = OutcomeBond;
+            type OutcomeFactor = OutcomeFactor;
             type DisputeResolution = zrml_prediction_markets::Pallet<Runtime>;
             type Event = Event;
             #[cfg(feature = "with-global-disputes")]

runtime/zeitgeist/src/parameters.rs

@@ -149,11 +149,9 @@ parameter_types! {
     pub const AdvisoryBond: Balance = 200 * BASE;
     pub const AdvisoryBondSlashPercentage: Percent = Percent::from_percent(0);
     /// (Slashable) Bond that is provided for disputing the outcome.
-    /// Slashed in case the final outcome does not match the dispute for which the `DisputeBond`
-    /// was deposited.
-    pub const DisputeBond: Balance = 2_000 * BASE;
-    /// `DisputeBond` is increased by this factor after every dispute.
-    pub const DisputeFactor: Balance = 2 * BASE;
+    /// Unreserved in case the dispute was justified otherwise slashed.
+    /// This is when the resolved outcome is different to the default (reported) outcome.
+    pub const DisputeBond: Balance = 5_000 * BASE;
     /// Maximum Categories a prediciton market can have (excluding base asset).
     pub const MaxCategories: u16 = MAX_CATEGORIES;
     /// Maximum number of disputes.
@@ -217,6 +215,12 @@ parameter_types! {
     // Simple disputes parameters
     /// Pallet identifier, mainly used for named balance reserves. DO NOT CHANGE.
     pub const SimpleDisputesPalletId: PalletId = SD_PALLET_ID;
+    /// (Slashable) Bond that is provided for overriding the last outcome addition.
+    /// Slashed in case the final outcome does not match the dispute for which the `OutcomeBond`
+    /// was deposited.
+    pub const OutcomeBond: Balance = 2_000 * BASE;
+    /// `OutcomeBond` is increased by this factor after every new outcome addition.
+    pub const OutcomeFactor: Balance = 2 * BASE;
 
     // Swaps parameters
     /// A precentage from the withdrawal amount a liquidity provider wants to withdraw

zrml/court/src/lib.rs

@@ -103,10 +103,7 @@ mod pallet {
             // TODO take a bond from the caller
             ensure_signed(origin)?;
             let market = T::MarketCommons::market(&market_id)?;
-            ensure!(
-                market.status == MarketStatus::Disputed,
-                Error::<T>::MarketIsNotDisputed
-            );
+            ensure!(market.status == MarketStatus::Disputed, Error::<T>::MarketIsNotDisputed);
             ensure!(
                 market.dispute_mechanism == MarketDisputeMechanism::Court,
                 Error::<T>::MarketDoesNotHaveCourtMechanism
@@ -427,7 +424,9 @@ mod pallet {
         //
         // Result is capped to `usize::MAX` or in other words, capped to a very, very, very
         // high number of jurors.
-        fn necessary_jurors_num(disputes: &[MarketDispute<T::AccountId, T::BlockNumber>]) -> usize {
+        fn necessary_jurors_num(
+            disputes: &[MarketDispute<T::AccountId, T::BlockNumber, BalanceOf<T>>],
+        ) -> usize {
             let len = disputes.len();
             INITIAL_JURORS_NUM.saturating_add(SUBSEQUENT_JURORS_FACTOR.saturating_mul(len))
         }
@@ -545,7 +544,7 @@ mod pallet {
         type Moment = MomentOf<T>;
         type Origin = T::Origin;
 
-        fn on_dispute(market_id: &Self::MarketId, market: &MarketOf<T>) -> DispatchResult {
+        fn on_dispute(_: &Self::MarketId, market: &MarketOf<T>) -> DispatchResult {
             ensure!(
                 market.dispute_mechanism == MarketDisputeMechanism::Court,
                 Error::<T>::MarketDoesNotHaveCourtMechanism

zrml/court/src/tests.rs

@@ -52,7 +52,7 @@ const DEFAULT_MARKET: MarketOf<Runtime> = Market {
     resolved_outcome: None,
     status: MarketStatus::Disputed,
     scoring_rule: ScoringRule::CPMM,
-    bonds: MarketBonds { creation: None, oracle: None },
+    bonds: MarketBonds { creation: None, oracle: None, dispute: None },
 };
 const DEFAULT_SET_OF_JURORS: &[(u128, Juror)] = &[
     (7, Juror { status: JurorStatus::Ok }),

zrml/market-commons/src/tests.rs

@@ -45,7 +45,7 @@ const MARKET_DUMMY: Market<AccountIdTest, Balance, BlockNumber, Moment> = Market
     resolved_outcome: None,
     scoring_rule: ScoringRule::CPMM,
     status: MarketStatus::Disputed,
-    bonds: MarketBonds { creation: None, oracle: None },
+    bonds: MarketBonds { creation: None, oracle: None, dispute: None },
 };
 
 #[test]

zrml/prediction-markets/src/lib.rs

@@ -58,9 +58,9 @@ mod pallet {
         constants::MILLISECS_PER_BLOCK,
         traits::{DisputeApi, DisputeResolutionApi, Swaps, ZeitgeistAssetManager},
         types::{
-            Asset, Bond, Deadlines, Market, MarketBonds, MarketCreation, MarketDispute,
-            MarketDisputeMechanism, MarketPeriod, MarketStatus, MarketType, MultiHash,
-            OutcomeReport, Report, ScalarPosition, ScoringRule, SubsidyUntil,
+            Asset, Bond, Deadlines, Market, MarketBonds, MarketCreation, MarketDisputeMechanism,
+            MarketPeriod, MarketStatus, MarketType, MultiHash, OldMarketDispute, OutcomeReport,
+            Report, ScalarPosition, ScoringRule, SubsidyUntil,
         },
     };
     #[cfg(feature = "with-global-disputes")]
@@ -520,7 +520,7 @@ mod pallet {
             origin: OriginFor<T>,
             #[pallet::compact] market_id: MarketIdOf<T>,
         ) -> DispatchResultWithPostInfo {
-            ensure_signed(origin)?;
+            let who = ensure_signed(origin)?;
 
             let market = <zrml_market_commons::Pallet<T>>::market(&market_id)?;
             ensure!(market.status == MarketStatus::Reported, Error::<T>::InvalidMarketStatus);
@@ -536,7 +536,15 @@ mod pallet {
                 }
             }
 
-            Self::set_market_as_disputed(&market, &market_id)?;
+            let dispute_bond = T::DisputeBond::get();
+
+            T::AssetManager::reserve_named(&Self::reserve_id(), Asset::Ztg, &who, dispute_bond)?;
+
+            <zrml_market_commons::Pallet<T>>::mutate_market(&market_id, |m| {
+                m.status = MarketStatus::Disputed;
+                m.bonds.dispute = Some(Bond::new(who.clone(), dispute_bond));
+                Ok(())
+            })?;
 
             Self::deposit_event(Event::MarketDisputed(market_id, MarketStatus::Disputed));
 
@@ -650,10 +658,12 @@ mod pallet {
                 MarketCreation::Advised => MarketBonds {
                     creation: Some(Bond::new(sender.clone(), T::AdvisoryBond::get())),
                     oracle: Some(Bond::new(sender.clone(), T::OracleBond::get())),
+                    ..Default::default()
                 },
                 MarketCreation::Permissionless => MarketBonds {
                     creation: Some(Bond::new(sender.clone(), T::ValidityBond::get())),
                     oracle: Some(Bond::new(sender.clone(), T::OracleBond::get())),
+                    ..Default::default()
                 },
             };
 
@@ -1399,6 +1409,10 @@ mod pallet {
         /// The origin that is allowed to destroy markets.
         type DestroyOrigin: EnsureOrigin<Self::Origin>;
 
+        /// The base amount of currency that must be bonded in order to create a dispute.
+        #[pallet::constant]
+        type DisputeBond: Get<BalanceOf<Self>>;
+
         /// Event
         type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
 
@@ -1793,7 +1807,7 @@ mod pallet {
         _,
         Blake2_128Concat,
         MarketIdOf<T>,
-        BoundedVec<MarketDispute<T::AccountId, T::BlockNumber>, T::MaxDisputes>,
+        BoundedVec<OldMarketDispute<T::AccountId, T::BlockNumber>, T::MaxDisputes>,
         ValueQuery,
     >;
 
@@ -1879,8 +1893,10 @@ mod pallet {
     impl<T: Config> Pallet<T> {
         impl_unreserve_bond!(unreserve_creation_bond, creation);
         impl_unreserve_bond!(unreserve_oracle_bond, oracle);
+        impl_unreserve_bond!(unreserve_dispute_bond, dispute);
         impl_slash_bond!(slash_creation_bond, creation);
         impl_slash_bond!(slash_oracle_bond, oracle);
+        impl_slash_bond!(slash_dispute_bond, dispute);
 
         pub fn outcome_assets(
             market_id: MarketIdOf<T>,
@@ -2340,6 +2356,15 @@ mod pallet {
                 // overall_imbalance.subsume(imbalance);
             }
 
+            if report.outcome != resolved_outcome {
+                // If the report outcome was wrong, the dispute was justified
+                Self::unreserve_dispute_bond(market_id)?;
+            } else {
+                // TODO what should be done with the DisputeBond imbalance?
+                let _imbalance = Self::slash_dispute_bond(market_id, None)?;
+                // overall_imbalance.subsume(imbalance);
+            }
+
             Ok(resolved_outcome)
         }
 
@@ -2621,20 +2646,6 @@ mod pallet {
             ))
         }
 
-        // If the market is already disputed, does nothing.
-        fn set_market_as_disputed(
-            market: &MarketOf<T>,
-            market_id: &MarketIdOf<T>,
-        ) -> DispatchResult {
-            if market.status != MarketStatus::Disputed {
-                <zrml_market_commons::Pallet<T>>::mutate_market(market_id, |m| {
-                    m.status = MarketStatus::Disputed;
-                    Ok(())
-                })?;
-            }
-            Ok(())
-        }
-
         // If a market has a pool that is `Active`, then changes from `Active` to `Clean`. If
         // the market does not exist or the market does not have a pool, does nothing.
         fn clean_up_pool(

zrml/prediction-markets/src/migrations.rs

@@ -123,7 +123,7 @@ impl<T: Config + zrml_market_commons::Config> OnRuntimeUpgrade for RecordBonds<T
                     resolved_outcome: old_market.resolved_outcome,
                     dispute_mechanism: old_market.dispute_mechanism,
                     deadlines: old_market.deadlines,
-                    bonds: MarketBonds { creation, oracle },
+                    bonds: MarketBonds { creation, oracle, dispute: None },
                 };
                 (key, new_market)
             })
@@ -318,6 +318,7 @@ mod tests {
                         value: <Runtime as Config>::OracleBond::get(),
                         is_settled: false,
                     }),
+                    dispute: None,
                 },
             ),
             construct_markets(
@@ -334,6 +335,7 @@ mod tests {
                         value: <Runtime as Config>::OracleBond::get(),
                         is_settled: true,
                     }),
+                    dispute: None,
                 },
             ),
             construct_markets(
@@ -350,6 +352,7 @@ mod tests {
                         value: <Runtime as Config>::OracleBond::get(),
                         is_settled: false,
                     }),
+                    dispute: None,
                 },
             ),
             construct_markets(
@@ -366,6 +369,7 @@ mod tests {
                         value: <Runtime as Config>::OracleBond::get(),
                         is_settled: false,
                     }),
+                    dispute: None,
                 },
             ),
             construct_markets(
@@ -382,6 +386,7 @@ mod tests {
                         value: <Runtime as Config>::OracleBond::get(),
                         is_settled: true,
                     }),
+                    dispute: None,
                 },
             ),
             // Technically, the market below has the wrong scoring rule, but that's irrelevant to
@@ -400,6 +405,7 @@ mod tests {
                         value: <Runtime as Config>::OracleBond::get(),
                         is_settled: true,
                     }),
+                    dispute: None,
                 },
             ),
         ]