Merge branch 'develop' of https://github.com/serai-dex/serai into move-emissions-tests

.github/workflows/tests.yml

@@ -63,6 +63,11 @@ jobs:
             -p serai-dex-pallet \
             -p serai-validator-sets-primitives \
             -p serai-validator-sets-pallet \
+            -p serai-genesis-liquidity-primitives \
+            -p serai-genesis-liquidity-pallet \
+            -p serai-emissions-primitives \
+            -p serai-emissions-pallet \
+            -p serai-economic-security-pallet \
             -p serai-in-instructions-primitives \
             -p serai-in-instructions-pallet \
             -p serai-signals-primitives \

Cargo.lock

@@ -8090,6 +8090,19 @@ dependencies = [
  "chrono",
 ]
 
+[[package]]
+name = "serai-economic-security-pallet"
+version = "0.1.0"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "serai-coins-pallet",
+ "serai-dex-pallet",
+ "serai-primitives",
+]
+
 [[package]]
 name = "serai-emissions-pallet"
 version = "0.1.0"
@@ -8105,6 +8118,7 @@ dependencies = [
  "serai-abi",
  "serai-coins-pallet",
  "serai-dex-pallet",
+ "serai-economic-security-pallet",
  "serai-emissions-primitives",
  "serai-genesis-liquidity-pallet",
  "serai-primitives",
@@ -8173,6 +8187,7 @@ dependencies = [
  "scale-info",
  "serai-coins-pallet",
  "serai-dex-pallet",
+ "serai-economic-security-pallet",
  "serai-genesis-liquidity-primitives",
  "serai-primitives",
  "serai-validator-sets-pallet",
@@ -8476,6 +8491,7 @@ dependencies = [
  "serai-abi",
  "serai-coins-pallet",
  "serai-dex-pallet",
+ "serai-economic-security-pallet",
  "serai-emissions-pallet",
  "serai-genesis-liquidity-pallet",
  "serai-in-instructions-pallet",

Cargo.toml

@@ -79,6 +79,14 @@ members = [
   "substrate/validator-sets/primitives",
   "substrate/validator-sets/pallet",
 
+  "substrate/genesis-liquidity/primitives",
+  "substrate/genesis-liquidity/pallet",
+
+  "substrate/emissions/primitives",
+  "substrate/emissions/pallet",
+
+  "substrate/economic-security/pallet",
+
   "substrate/in-instructions/primitives",
   "substrate/in-instructions/pallet",
 

deny.toml

@@ -56,6 +56,8 @@ exceptions = [
   { allow = ["AGPL-3.0"], name = "serai-genesis-liquidity-pallet" },
   { allow = ["AGPL-3.0"], name = "serai-emissions-pallet" },
 
+  { allow = ["AGPL-3.0"], name = "serai-economic-security-pallet" },
+
   { allow = ["AGPL-3.0"], name = "serai-in-instructions-pallet" },
 
   { allow = ["AGPL-3.0"], name = "serai-validator-sets-pallet" },

networks/monero/src/tests/vectors/transactions.json

@@ -252,7 +252,7 @@
     {
         "id": "55ba10662968c57fc8fed2c82a99d6fd9516730c245f58e9e87bb9a35378014a",
         "hex": "01000302b0f9cf0e0100e53d3d97d11974ccf49d23513b9465bc139bda14b8207288e41557707e59c2dc02c08092de06010133e69f524f1989738827c9fb9087d45d7b6865645453f620189939d926735b3902b0b2c4f62201001d680e360c156c7cc952b0c4fc39a39c95a766423109766ae3dcf0c5cf8abf9e06a0f736026bcac41f5468fd1bcf8994e1a4282aecb420005ec294324faec5c6f46806614780c8afa025027998ef0ac319d96b224fa3c33fe12677ef06f4aed80916f28e3f7a684a1c89d78094ebdc03028e0004b98f7c622f1d0364a2d0270c40e6606793bd948a41af9287016d264d7580ade20402f911ad66eabcd8112e90130d7594cb8fc413431da9b5b004c8651d100a2ac8fb8084af5f029caa24c41b1b4938e7e066a7e59592fdc3c832e2516048e57af5d8acca9bef0ac0b80202e99b6a2e000f03f73c1966e16875945ffad20b1895efa17202c6e240191b01e421011da6ff966df43bd44f513aaafa260c54e2ad31469664fa7b0a44fed4ead9a483056cd88c350b340289694ad525f1316367ed16673dc23911e624e6bac4a48b032a623d09ce5bd85a839534de4fbbfb72da2a6779a66f775c16379e8abd122401a5a19c47bb8ecd0c7aa9610513b611602d246f3b07fa19512dc8fde7b180c704694b2d75abbaa2907cda52f888f18ded34308dd1b40f1fb33a01340a1ddc5f07ce19ab4357c52764600861d2d331cfed5972fff42dac64583d617fa4ee27a509a8c29ff77fc71bc7cd106ce54cd3020d1c18c6c794aaa93cb32cd4ff55d82b04",
-        "signature_hash": "55ba10662968c57fc8fed2c82a99d6fd9516730c245f58e9e87bb9a35378014a",
+        "signature_hash": "1ad261b4c8f35b8861c4f3a78b240a85e44be6a8ac49acd1e50de4680adf7fac",
         "tx": {
             "version": 1,
             "unlock_time": 0,

networks/monero/src/transaction.rs

@@ -554,11 +554,11 @@ impl Transaction<NotPruned> {
   /// This returns None if the transaction is without signatures.
   pub fn signature_hash(&self) -> Option<[u8; 32]> {
     Some(match self {
-      Transaction::V1 { prefix, signatures } => {
+      Transaction::V1 { prefix, .. } => {
         if (prefix.inputs.len() == 1) && matches!(prefix.inputs[0], Input::Gen(_)) {
           None?;
         }
-        self.hash_with_prunable_hash(PrunableHash::V1(signatures))
+        self.hash_with_prunable_hash(PrunableHash::V1(&[]))
       }
       Transaction::V2 { proofs, .. } => self.hash_with_prunable_hash({
         let Some(proofs) = proofs else { None? };

substrate/abi/src/economic_security.rs

@@ -0,0 +1,8 @@
+use serai_primitives::NetworkId;
+
+#[derive(Clone, PartialEq, Eq, Debug, scale::Encode, scale::Decode, scale_info::TypeInfo)]
+#[cfg_attr(feature = "borsh", derive(borsh::BorshSerialize, borsh::BorshDeserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+pub enum Event {
+  EconomicSecurityReached { network: NetworkId },
+}

substrate/abi/src/lib.rs

@@ -20,6 +20,8 @@ pub mod validator_sets;
 pub mod genesis_liquidity;
 pub mod emissions;
 
+pub mod economic_security;
+
 pub mod in_instructions;
 
 pub mod signals;
@@ -60,6 +62,7 @@ pub enum Event {
   ValidatorSets(validator_sets::Event),
   GenesisLiquidity(genesis_liquidity::Event),
   Emissions,
+  EconomicSecurity(economic_security::Event),
   InInstructions(in_instructions::Event),
   Signals(signals::Event),
   Babe,

substrate/economic-security/pallet/Cargo.toml

@@ -0,0 +1,48 @@
+[package]
+name = "serai-economic-security-pallet"
+version = "0.1.0"
+description = "Economic Security pallet for Serai"
+license = "AGPL-3.0-only"
+repository = "https://github.com/serai-dex/serai/tree/develop/substrate/economic-security/pallet"
+authors = ["Akil Demir <akildemir72@gmail.com>"]
+edition = "2021"
+rust-version = "1.77"
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
+
+[package.metadata.cargo-machete]
+ignored = ["scale", "scale-info"]
+
+[lints]
+workspace = true
+
+[dependencies]
+scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
+scale-info = { version = "2", default-features = false, features = ["derive"] }
+
+frame-system = { git = "https://github.com/serai-dex/substrate", default-features = false }
+frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false }
+
+dex-pallet = { package = "serai-dex-pallet", path = "../../dex/pallet", default-features = false }
+coins-pallet = { package = "serai-coins-pallet", path = "../../coins/pallet", default-features = false }
+
+serai-primitives = { path = "../../primitives", default-features = false }
+
+[features]
+std = [
+  "scale/std",
+  "scale-info/std",
+
+  "frame-system/std",
+  "frame-support/std",
+
+  "dex-pallet/std",
+  "coins-pallet/std",
+
+  "serai-primitives/std",
+]
+try-runtime = [] # TODO
+
+default = ["std"]

substrate/economic-security/pallet/LICENSE

@@ -0,0 +1,15 @@
+AGPL-3.0-only license
+
+Copyright (c) 2024 Luke Parker
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License Version 3 as
+published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.

substrate/economic-security/pallet/src/lib.rs

@@ -0,0 +1,53 @@
+#![cfg_attr(not(feature = "std"), no_std)]
+
+#[allow(clippy::cast_possible_truncation, clippy::no_effect_underscore_binding, clippy::empty_docs)]
+#[frame_support::pallet]
+pub mod pallet {
+  use frame_system::pallet_prelude::*;
+  use frame_support::pallet_prelude::*;
+
+  use dex_pallet::{Config as DexConfig, Pallet as Dex};
+  use coins_pallet::{Config as CoinsConfig, AllowMint};
+
+  use serai_primitives::*;
+
+  #[pallet::config]
+  pub trait Config: frame_system::Config + CoinsConfig + DexConfig {
+    type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
+  }
+
+  #[pallet::event]
+  #[pallet::generate_deposit(fn deposit_event)]
+  pub enum Event<T: Config> {
+    EconomicSecurityReached { network: NetworkId },
+  }
+
+  #[pallet::pallet]
+  pub struct Pallet<T>(PhantomData<T>);
+
+  #[pallet::storage]
+  #[pallet::getter(fn economic_security_block)]
+  pub(crate) type EconomicSecurityBlock<T: Config> =
+    StorageMap<_, Identity, NetworkId, BlockNumberFor<T>, OptionQuery>;
+
+  #[pallet::hooks]
+  impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+    fn on_initialize(n: BlockNumberFor<T>) -> Weight {
+      // we accept we reached economic security once we can mint smallest amount of a network's coin
+      for coin in COINS {
+        let existing = EconomicSecurityBlock::<T>::get(coin.network());
+        if existing.is_none() &&
+          Dex::<T>::security_oracle_value(coin).is_some() &&
+          <T as CoinsConfig>::AllowMint::is_allowed(&Balance { coin, amount: Amount(1) })
+        {
+          EconomicSecurityBlock::<T>::set(coin.network(), Some(n));
+          Self::deposit_event(Event::EconomicSecurityReached { network: coin.network() });
+        }
+      }
+
+      Weight::zero() // TODO
+    }
+  }
+}
+
+pub use pallet::*;

substrate/emissions/pallet/Cargo.toml

@@ -33,6 +33,8 @@ validator-sets-pallet = { package = "serai-validator-sets-pallet", path = "../..
 dex-pallet = { package = "serai-dex-pallet", path = "../../dex/pallet", default-features = false }
 genesis-liquidity-pallet = { package = "serai-genesis-liquidity-pallet", path = "../../genesis-liquidity/pallet", default-features = false }
 
+economic-security-pallet = { package = "serai-economic-security-pallet", path = "../../economic-security/pallet", default-features = false }
+
 serai-primitives = { path = "../../primitives", default-features = false }
 validator-sets-primitives = { package = "serai-validator-sets-primitives", path = "../../validator-sets/primitives", default-features = false }
 emissions-primitives = { package = "serai-emissions-primitives", path = "../primitives", default-features = false }
@@ -69,6 +71,8 @@ std = [
   "validator-sets-pallet/std",
   "dex-pallet/std",
   "genesis-liquidity-pallet/std",
+  
+  "economic-security-pallet/std",
 
   "serai-primitives/std",
   "emissions-primitives/std",

substrate/emissions/pallet/src/lib.rs

@@ -16,12 +16,14 @@ pub mod pallet {
   use sp_std::{vec, vec::Vec, ops::Mul, collections::btree_map::BTreeMap};
   use sp_runtime;
 
-  use coins_pallet::{Config as CoinsConfig, Pallet as Coins, AllowMint};
+  use coins_pallet::{Config as CoinsConfig, Pallet as Coins};
   use dex_pallet::{Config as DexConfig, Pallet as Dex};
 
   use validator_sets_pallet::{Pallet as ValidatorSets, Config as ValidatorSetsConfig};
   use genesis_liquidity_pallet::{Pallet as GenesisLiquidity, Config as GenesisLiquidityConfig};
 
+  use economic_security_pallet::{Config as EconomicSecurityConfig, Pallet as EconomicSecurity};
+
   use serai_primitives::*;
   use validator_sets_primitives::{MAX_KEY_SHARES_PER_SET, Session};
   pub use emissions_primitives as primitives;
@@ -34,6 +36,7 @@ pub mod pallet {
     + CoinsConfig
     + DexConfig
     + GenesisLiquidityConfig
+    + EconomicSecurityConfig
   {
     type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
   }
@@ -82,12 +85,6 @@ pub mod pallet {
   #[pallet::getter(fn session)]
   pub type CurrentSession<T: Config> = StorageMap<_, Identity, NetworkId, u32, ValueQuery>;
 
-  // TODO: Find a better place for this
-  #[pallet::storage]
-  #[pallet::getter(fn economic_security_reached)]
-  pub(crate) type EconomicSecurityReached<T: Config> =
-    StorageMap<_, Identity, NetworkId, bool, ValueQuery>;
-
   #[pallet::storage]
   pub(crate) type LastSwapVolume<T: Config> = StorageMap<_, Identity, Coin, u64, OptionQuery>;
 
@@ -101,7 +98,6 @@ pub mod pallet {
         }
         Participants::<T>::set(id, Some(participants.try_into().unwrap()));
         CurrentSession::<T>::set(id, 0);
-        EconomicSecurityReached::<T>::set(id, false);
       }
     }
   }
@@ -109,25 +105,7 @@ pub mod pallet {
   #[pallet::hooks]
   impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
     fn on_initialize(n: BlockNumberFor<T>) -> Weight {
-      // we wait 1 extra block after genesis ended to see the changes. We only need this extra
-      // block in dev&test networks where we start the chain with accounts that already has some
-      // staked SRI. So when we check for ec-security pre-genesis we look like we are economically
-      // secure. The reason for this although we only check for it once the genesis is complete(so
-      // if the genesis complete we shouldn't be economically secure because the funds are not
-      // enough) is because ValidatorSets pallet runs before the genesis pallet in runtime.
-      //  So ValidatorSets pallet sees the old state until next block.
-      // TODO: revisit this when mainnet genesis validator stake code is done.
-      let gcb = GenesisLiquidity::<T>::genesis_complete_block();
-      let genesis_ended = gcb.is_some() && (n.saturated_into::<u64>() > gcb.unwrap());
-
-      // we accept we reached economic security once we can mint smallest amount of a network's coin
-      for coin in COINS {
-        let check = genesis_ended && !Self::economic_security_reached(coin.network());
-        if check && <T as CoinsConfig>::AllowMint::is_allowed(&Balance { coin, amount: Amount(1) })
-        {
-          EconomicSecurityReached::<T>::set(coin.network(), true);
-        }
-      }
+      let genesis_ended = GenesisLiquidity::<T>::genesis_complete_block().is_some();
 
       // check if we got a new session
       let mut session_changed = false;
@@ -337,7 +315,7 @@ pub mod pallet {
           continue;
         }
 
-        if !Self::economic_security_reached(n) {
+        if EconomicSecurity::<T>::economic_security_block(n).is_none() {
           return true;
         }
       }
@@ -379,7 +357,7 @@ pub mod pallet {
       balance: Balance,
     ) -> DispatchResult {
       // check the network didn't reach the economic security yet
-      if Self::economic_security_reached(network) {
+      if EconomicSecurity::<T>::economic_security_block(network).is_some() {
         Err(Error::<T>::NetworkHasEconomicSecurity)?;
       }
 

substrate/genesis-liquidity/pallet/Cargo.toml

@@ -33,6 +33,8 @@ dex-pallet = { package = "serai-dex-pallet", path = "../../dex/pallet", default-
 coins-pallet = { package = "serai-coins-pallet", path = "../../coins/pallet", default-features = false }
 validator-sets-pallet = { package = "serai-validator-sets-pallet", path = "../../validator-sets/pallet", default-features = false }
 
+economic-security-pallet = { package = "serai-economic-security-pallet", path = "../../economic-security/pallet", default-features = false }
+
 serai-primitives = { path = "../../primitives", default-features = false }
 genesis-liquidity-primitives = { package = "serai-genesis-liquidity-primitives", path = "../primitives", default-features = false }
 validator-sets-primitives = { package = "serai-validator-sets-primitives", path = "../../validator-sets/primitives", default-features = false }
@@ -53,6 +55,8 @@ std = [
   "dex-pallet/std",
   "validator-sets-pallet/std",
 
+  "economic-security-pallet/std",
+
   "serai-primitives/std",
   "genesis-liquidity-primitives/std",
   "validator-sets-primitives/std",

substrate/genesis-liquidity/pallet/src/lib.rs

@@ -12,9 +12,11 @@ pub mod pallet {
   use sp_application_crypto::RuntimePublic;
 
   use dex_pallet::{Pallet as Dex, Config as DexConfig};
-  use coins_pallet::{Config as CoinsConfig, Pallet as Coins, AllowMint};
+  use coins_pallet::{Config as CoinsConfig, Pallet as Coins};
   use validator_sets_pallet::{Config as VsConfig, Pallet as ValidatorSets};
 
+  use economic_security_pallet::{Config as EconomicSecurityConfig, Pallet as EconomicSecurity};
+
   use serai_primitives::*;
   use validator_sets_primitives::{ValidatorSet, musig_key};
   pub use genesis_liquidity_primitives as primitives;
@@ -29,6 +31,7 @@ pub mod pallet {
     frame_system::Config
     + VsConfig
     + DexConfig
+    + EconomicSecurityConfig
     + CoinsConfig
     + coins_pallet::Config<coins_pallet::Instance1>
   {
@@ -49,7 +52,6 @@ pub mod pallet {
     GenesisLiquidityAdded { by: SeraiAddress, balance: Balance },
     GenesisLiquidityRemoved { by: SeraiAddress, balance: Balance },
     GenesisLiquidityAddedToPool { coin1: Balance, sri: Amount },
-    EconomicSecurityReached { network: NetworkId },
   }
 
   #[pallet::pallet]
@@ -64,10 +66,6 @@ pub mod pallet {
   #[pallet::storage]
   pub(crate) type Supply<T: Config> = StorageMap<_, Identity, Coin, LiquidityAmount, OptionQuery>;
 
-  #[pallet::storage]
-  pub(crate) type EconomicSecurityReached<T: Config> =
-    StorageMap<_, Identity, NetworkId, BlockNumberFor<T>, OptionQuery>;
-
   #[pallet::storage]
   pub(crate) type Oracle<T: Config> = StorageMap<_, Identity, Coin, u64, OptionQuery>;
 
@@ -170,18 +168,6 @@ pub mod pallet {
         GenesisCompleteBlock::<T>::set(Some(n.saturated_into::<u64>()));
       }
 
-      // we accept we reached economic security once we can mint smallest amount of a network's coin
-      // TODO: move EconomicSecurity to a separate pallet
-      for coin in COINS {
-        let existing = EconomicSecurityReached::<T>::get(coin.network());
-        if existing.is_none() &&
-          <T as CoinsConfig>::AllowMint::is_allowed(&Balance { coin, amount: Amount(1) })
-        {
-          EconomicSecurityReached::<T>::set(coin.network(), Some(n));
-          Self::deposit_event(Event::EconomicSecurityReached { network: coin.network() });
-        }
-      }
-
       Weight::zero() // TODO
     }
   }
@@ -237,7 +223,8 @@ pub mod pallet {
     fn blocks_since_ec_security() -> Option<u64> {
       let mut min = u64::MAX;
       for n in NETWORKS {
-        let ec_security_block = EconomicSecurityReached::<T>::get(n)?.saturated_into::<u64>();
+        let ec_security_block =
+          EconomicSecurity::<T>::economic_security_block(n)?.saturated_into::<u64>();
         let current = <frame_system::Pallet<T>>::block_number().saturated_into::<u64>();
         let diff = current.saturating_sub(ec_security_block);
         min = diff.min(min);

substrate/runtime/Cargo.toml

@@ -63,6 +63,8 @@ validator-sets-pallet = { package = "serai-validator-sets-pallet", path = "../va
 genesis-liquidity-pallet = { package = "serai-genesis-liquidity-pallet", path = "../genesis-liquidity/pallet", default-features = false }
 emissions-pallet = { package = "serai-emissions-pallet", path = "../emissions/pallet", default-features = false }
 
+economic-security-pallet = { package = "serai-economic-security-pallet", path = "../economic-security/pallet", default-features = false }
+
 in-instructions-pallet = { package = "serai-in-instructions-pallet", path = "../in-instructions/pallet", default-features = false }
 
 signals-pallet = { package = "serai-signals-pallet", path = "../signals/pallet", default-features = false }
@@ -120,6 +122,8 @@ std = [
   "genesis-liquidity-pallet/std",
   "emissions-pallet/std",
 
+  "economic-security-pallet/std",
+
   "in-instructions-pallet/std",
 
   "signals-pallet/std",

substrate/runtime/src/lib.rs

@@ -34,6 +34,8 @@ pub use pallet_grandpa as grandpa;
 pub use genesis_liquidity_pallet as genesis_liquidity;
 pub use emissions_pallet as emissions;
 
+pub use economic_security_pallet as economic_security;
+
 // Actually used by the runtime
 use sp_core::OpaqueMetadata;
 use sp_std::prelude::*;
@@ -257,6 +259,10 @@ impl emissions::Config for Runtime {
   type RuntimeEvent = RuntimeEvent;
 }
 
+impl economic_security::Config for Runtime {
+  type RuntimeEvent = RuntimeEvent;
+}
+
 // for publishing equivocation evidences.
 impl<C> frame_system::offchain::SendTransactionTypes<C> for Runtime
 where
@@ -336,6 +342,8 @@ construct_runtime!(
     GenesisLiquidity: genesis_liquidity,
     Emissions: emissions,
 
+    EconomicSecurity: economic_security,
+
     InInstructions: in_instructions,
 
     Signals: signals,