Audit fixes

Cargo.toml

@@ -291,6 +291,15 @@ rand_chacha = { version = "0.3.1", default-features = false }
 serde = { version = "1.0.198", default-features = false }
 typenum = { version = "1.17.0", default-features = false }
 
+[profile.test]
+overflow-checks = true
+
+[profile.test.package."*"]
+overflow-checks = true
+
+[profile.dev]
+overflow-checks = true
+
 [profile.dev.package]
 blake2 = { opt-level = 3 }
 blake2b_simd = { opt-level = 3 }
@@ -336,17 +345,28 @@ x25519-dalek = { opt-level = 3 }
 yamux = { opt-level = 3 }
 zeroize = { opt-level = 3 }
 
+[profile.dev.package."*"]
+overflow-checks = true
+
 [profile.production]
 codegen-units = 1
 incremental = false
 inherits = "release"
 lto = true
+overflow-checks = true
+
+[profile.production.package."*"]
+overflow-checks = true
 
 [profile.release]
 opt-level = 3
+overflow-checks = true
 # Zeitgeist runtime requires unwinding.
 panic = "unwind"
 
+[profile.release.package."*"]
+overflow-checks = true
+
 
 # xcm-emulator incompatible block number type fixed
 # Commits:

primitives/src/asset.rs

@@ -48,14 +48,14 @@ use serde::{Deserialize, Serialize};
 pub enum Asset<MarketId> {
     CategoricalOutcome(MarketId, CategoryIndex),
     ScalarOutcome(MarketId, ScalarPosition),
-    CombinatorialToken(CombinatorialId),
+    CombinatorialOutcomeLegacy, // Here to avoid having to migrate all holdings on the chain.
     PoolShare(PoolId),
     #[default]
     Ztg,
     ForeignAsset(u32),
     ParimutuelShare(MarketId, CategoryIndex),
+    CombinatorialToken(CombinatorialId),
 }
-// TODO Needs storage migration
 
 #[cfg(feature = "runtime-benchmarks")]
 impl<MarketId: MaxEncodedLen> ZeitgeistAssetEnumerator<MarketId> for Asset<MarketId> {

primitives/src/math/checked_ops_res.rs

@@ -64,6 +64,13 @@ where
     fn checked_rem_res(&self, other: &Self) -> Result<Self, DispatchError>;
 }
 
+pub trait CheckedIncRes
+where
+    Self: Sized,
+{
+    fn checked_inc_res(&self) -> Result<Self, DispatchError>;
+}
+
 impl<T> CheckedAddRes for T
 where
     T: CheckedAdd,
@@ -123,3 +130,13 @@ where
         self.checked_rem(other).ok_or(DispatchError::Arithmetic(ArithmeticError::DivisionByZero))
     }
 }
+
+impl<T> CheckedIncRes for T
+where
+    T: CheckedAdd + From<u8>,
+{
+    #[inline]
+    fn checked_inc_res(&self) -> Result<Self, DispatchError> {
+        self.checked_add(&1u8.into()).ok_or(DispatchError::Arithmetic(ArithmeticError::Overflow))
+    }
+}

primitives/src/traits.rs

@@ -18,6 +18,7 @@
 
 mod combinatorial_tokens_api;
 mod combinatorial_tokens_benchmark_helper;
+mod combinatorial_tokens_fuel;
 mod combinatorial_tokens_unsafe_api;
 mod complete_set_operations_api;
 mod deploy_pool_api;
@@ -36,6 +37,7 @@ mod zeitgeist_asset;
 
 pub use combinatorial_tokens_api::*;
 pub use combinatorial_tokens_benchmark_helper::*;
+pub use combinatorial_tokens_fuel::*;
 pub use combinatorial_tokens_unsafe_api::*;
 pub use complete_set_operations_api::*;
 pub use deploy_pool_api::*;

primitives/src/traits/combinatorial_tokens_api.rs

@@ -15,22 +15,26 @@
 // You should have received a copy of the GNU General Public License
 // along with Zeitgeist. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::types::SplitPositionDispatchInfo;
+use crate::{traits::CombinatorialTokensFuel, types::SplitPositionDispatchInfo};
 use alloc::vec::Vec;
+use core::fmt::Debug;
+use parity_scale_codec::{Decode, Encode};
+use scale_info::TypeInfo;
 use sp_runtime::DispatchError;
 
 pub trait CombinatorialTokensApi {
     type AccountId;
     type Balance;
     type CombinatorialId;
     type MarketId;
+    type Fuel: Clone + CombinatorialTokensFuel + Debug + Decode + Encode + Eq + TypeInfo;
 
     fn split_position(
         who: Self::AccountId,
         parent_collection_id: Option<Self::CombinatorialId>,
         market_id: Self::MarketId,
         partition: Vec<Vec<bool>>,
         amount: Self::Balance,
-        force_max_work: bool,
+        force_max_work: Self::Fuel,
     ) -> Result<SplitPositionDispatchInfo<Self::CombinatorialId, Self::MarketId>, DispatchError>;
 }

primitives/src/traits/combinatorial_tokens_fuel.rs

@@ -0,0 +1,10 @@
+/// A trait for keeping track of a certain amount of work to be done.
+pub trait CombinatorialTokensFuel {
+    /// Creates a `Fuel` object from a `total` value which indicates the total amount of work to be
+    /// done. This is usually done for benchmarking purposes.
+    fn from_total(total: u32) -> Self;
+
+    /// Returns a `u32` which indicates the total amount of work to be done. Must be `O(1)` to avoid
+    /// excessive calculation if this call is used when calculating extrinsic weight.
+    fn total(&self) -> u32;
+}

primitives/src/traits/futarchy_oracle.rs

@@ -18,7 +18,12 @@
 use frame_support::pallet_prelude::Weight;
 
 pub trait FutarchyOracle {
+    type BlockNumber;
+
     /// Evaluates the query at the current block and returns the weight consumed and a `bool`
     /// indicating whether the query evaluated positively.
     fn evaluate(&self) -> (Weight, bool);
+
+    /// Updates the oracle's data and returns the weight consumed.
+    fn update(&mut self, now: Self::BlockNumber) -> Weight;
 }

runtime/battery-station/src/parameters.rs

@@ -165,9 +165,10 @@ parameter_types! {
     /// can lead to extrinsic with very big weight: see delegate for instance.
     pub const MaxVotes: u32 = 100;
     /// The maximum number of public proposals that can exist at any time.
-    pub const MaxProposals: u32 = 100;
+    pub const DemocracyMaxProposals: u32 = 100;
 
     // Futarchy
+    pub const FutarchyMaxProposals: u32 = 4;
     pub const MinDuration: BlockNumber = 7 * BLOCKS_PER_DAY;
 
     // Hybrid Router parameters
@@ -456,6 +457,7 @@ parameter_type_with_key! {
         match currency_id {
             Asset::CategoricalOutcome(_,_) => ExistentialDeposit::get(),
             Asset::CombinatorialToken(_) => ExistentialDeposit::get(),
+            Asset::CombinatorialOutcomeLegacy => ExistentialDeposit::get(),
             Asset::PoolShare(_)  => ExistentialDeposit::get(),
             Asset::ScalarOutcome(_,_)  => ExistentialDeposit::get(),
             #[cfg(feature = "parachain")]

runtime/common/src/lib.rs

@@ -84,7 +84,7 @@ macro_rules! decl_common_types {
             generic, DispatchError, DispatchResult, RuntimeDebug, SaturatedConversion,
         };
         use zeitgeist_primitives::traits::{DeployPoolApi, DistributeFees, MarketCommonsPalletApi};
-        use zrml_combinatorial_tokens::types::CryptographicIdManager;
+        use zrml_combinatorial_tokens::types::{CryptographicIdManager, Fuel};
         use zrml_neo_swaps::types::DecisionMarketOracle;
 
         #[cfg(feature = "try-runtime")]
@@ -815,7 +815,7 @@ macro_rules! impl_config_traits {
             type PalletsOrigin = OriginCaller;
             type MaxVotes = MaxVotes;
             type WeightInfo = weights::pallet_democracy::WeightInfo<Runtime>;
-            type MaxProposals = MaxProposals;
+            type MaxProposals = DemocracyMaxProposals;
             type Preimages = Preimage;
             type MaxBlacklisted = ConstU32<100>;
             type MaxDeposits = ConstU32<100>;
@@ -1160,6 +1160,7 @@ macro_rules! impl_config_traits {
             #[cfg(feature = "runtime-benchmarks")]
             type BenchmarkHelper = PredictionMarketsCombinatorialTokensBenchmarkHelper<Runtime>;
             type CombinatorialIdManager = CryptographicIdManager<MarketId, Blake2_256>;
+            type Fuel = Fuel;
             type MarketCommons = MarketCommons;
             type MultiCurrency = AssetManager;
             type Payout = PredictionMarkets;
@@ -1198,11 +1199,11 @@ macro_rules! impl_config_traits {
         impl zrml_futarchy::Config for Runtime {
             #[cfg(feature = "runtime-benchmarks")]
             type BenchmarkHelper = DecisionMarketBenchmarkHelper<Runtime>;
+            type MaxProposals = FutarchyMaxProposals;
             type MinDuration = MinDuration;
             type Oracle = DecisionMarketOracle<Runtime>;
             type RuntimeEvent = RuntimeEvent;
             type Scheduler = Scheduler;
-            type SubmitOrigin = EnsureRoot<AccountId>;
             type WeightInfo = zrml_futarchy::weights::WeightInfo<Runtime>;
         }
 
@@ -2286,7 +2287,7 @@ macro_rules! create_common_tests {
                 };
                 use zrml_futarchy::types::Proposal;
                 use zrml_market_commons::types::MarketBuilder;
-                use zrml_neo_swaps::types::DecisionMarketOracle;
+                use zrml_neo_swaps::types::{DecisionMarketOracle, DecisionMarketOracleScoreboard};
 
                 #[test]
                 fn futarchy_schedules_and_executes_call() {
@@ -2360,10 +2361,13 @@ macro_rules! create_common_tests {
                         };
                         let call =
                             Preimage::bound(RuntimeCall::from(remark_dispatched_as)).unwrap();
+                        let scoreboard =
+                            DecisionMarketOracleScoreboard::new(40_000, 10_000, one / 7, one);
                         let oracle = DecisionMarketOracle::new(
                             market_id,
                             Asset::CategoricalOutcome(market_id, 0),
                             Asset::CategoricalOutcome(market_id, 1),
+                            scoreboard,
                         );
                         let when = duration + 10;
                         let proposal = Proposal { when, call, oracle };

runtime/zeitgeist/src/parameters.rs

@@ -165,9 +165,10 @@ parameter_types! {
     /// can lead to extrinsic with very big weight: see delegate for instance.
     pub const MaxVotes: u32 = 100;
     /// The maximum number of public proposals that can exist at any time.
-    pub const MaxProposals: u32 = 100;
+    pub const DemocracyMaxProposals: u32 = 100;
 
     // Futarchy
+    pub const FutarchyMaxProposals: u32 = 4;
     pub const MinDuration: BlockNumber = 7 * BLOCKS_PER_DAY;
 
     // Hybrid Router parameters
@@ -456,6 +457,7 @@ parameter_type_with_key! {
         match currency_id {
             Asset::CategoricalOutcome(_,_) => ExistentialDeposit::get(),
             Asset::CombinatorialToken(_) => ExistentialDeposit::get(),
+            Asset::CombinatorialOutcomeLegacy => ExistentialDeposit::get(),
             Asset::PoolShare(_)  => ExistentialDeposit::get(),
             Asset::ScalarOutcome(_,_)  => ExistentialDeposit::get(),
             #[cfg(feature = "parachain")]