Merge pull request #99 from renlabs-dev/main

functor-flow · web-flow · commit 8dc526c111aa · 2025-01-17T17:54:39.000+01:00
feat: adjusting tokenomics
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,29 @@
 # Changelog
 
+spec version `132`
+
+adding a storage migration to remove authorities
+
+spec version `131`
+
+Flagging metadata hash
+
+spec version `130`
+
+Adding metadata hash
+
+spec version `129`
+
+Tweaked bridge closing
+
+spec version `128`
+
+Tweaked bridge parameters
+
+spec version `127`
+
+Added bridge
+
 spec version `126`
 
 **Breaking Changes**
@@ -9,7 +33,7 @@ Moved:
 - `delegate_rootnet_control` extrinsic has been moved to `SubnetEmissionModule` from `SubspaceModule`.
 - Some storages have been moved to `SubnetEmissionModule` from `SubspaceModule`:
   - WeightEncryptionMap
-  - 
+  -
 Deleted:
 - `TrustRatio`
 
@@ -68,7 +92,7 @@ Subnet Emission Module:
 
 - `DecryptionNodeBanQueue`:
   - Description: Queue of decryption nodes that will be banned next epoch.
-  - Type: StorageDoubleMap<u16, T::AccountId, u64> 
+  - Type: StorageDoubleMap<u16, T::AccountId, u64>
   - Default: None (empty double map)
 
 Subspace Module:
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -115,6 +115,7 @@ frame-system = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polk
 frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
 frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
 frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
+frame-metadata-hash-extension = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
 pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
 pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
 pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409", default-features = false }
diff --git a/node/src/service.rs b/node/src/service.rs
@@ -15,16 +15,15 @@ use sp_consensus_aura::sr25519::AuthorityPair as AuraPair;
 use sp_runtime::traits::Block as BlockT;
 use std::{path::PathBuf, sync::Arc, time::Duration};
 
-#[cfg(feature = "testnet")]
-use std::path::Path;
-
-#[cfg(feature = "testnet")]
-use sp_core::H256;
-
 use crate::{
     cli::Sealing,
     client::{Client, FullBackend},
 };
+#[cfg(feature = "testnet")]
+use std::path::Path;
+
+#[cfg(feature = "testnet")]
+use sp_core::{H256, U256};
 
 #[cfg(feature = "testnet")]
 pub use crate::eth::{
diff --git a/pallets/offworker/src/lib.rs b/pallets/offworker/src/lib.rs
@@ -48,6 +48,7 @@ use types::{
 use util::process_consensus_params;
 
 mod dispatches;
+pub mod migrations;
 mod process;
 mod profitability;
 pub mod types;
@@ -134,7 +135,14 @@ pub mod pallet {
         }
     }
 
+    #[cfg(feature = "testnet")]
+    const STORAGE_VERSION: StorageVersion = StorageVersion::new(16);
+
+    #[cfg(not(feature = "testnet"))]
+    const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);
+
     #[pallet::pallet]
+    #[pallet::storage_version(STORAGE_VERSION)]
     pub struct Pallet<T>(_);
 
     #[pallet::hooks]
diff --git a/pallets/offworker/src/migrations.rs b/pallets/offworker/src/migrations.rs
@@ -0,0 +1,29 @@
+use crate::*;
+use frame_support::{
+    pallet_prelude::Weight,
+    traits::{OnRuntimeUpgrade, StorageVersion},
+};
+
+pub mod v1 {
+    use super::*;
+
+    pub struct MigrateToV1<T>(sp_std::marker::PhantomData<T>);
+
+    impl<T: Config> OnRuntimeUpgrade for MigrateToV1<T> {
+        fn on_runtime_upgrade() -> frame_support::weights::Weight {
+            let on_chain_version = StorageVersion::get::<Pallet<T>>();
+            if on_chain_version != 0 {
+                log::info!("Storage v1 already updated");
+                return Weight::zero();
+            }
+
+            StorageVersion::new(1).put::<Pallet<T>>();
+
+            Authorities::<T>::kill();
+
+            log::info!("Migrated to v1");
+
+            Weight::zero()
+        }
+    }
+}
diff --git a/pallets/subnet_emission/src/lib.rs b/pallets/subnet_emission/src/lib.rs
@@ -48,7 +48,7 @@ pub mod pallet {
     const STORAGE_VERSION: StorageVersion = StorageVersion::new(16);
 
     #[cfg(not(feature = "testnet"))]
-    const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);
+    const STORAGE_VERSION: StorageVersion = StorageVersion::new(2);
 
     #[pallet::pallet]
     #[pallet::storage_version(STORAGE_VERSION)]
diff --git a/pallets/subnet_emission/src/migrations.rs b/pallets/subnet_emission/src/migrations.rs
@@ -4,47 +4,22 @@ use frame_support::{
     traits::{OnRuntimeUpgrade, StorageVersion},
 };
 
-pub mod v1 {
+pub mod v2 {
     use super::*;
 
-    pub struct MigrateToV1<T>(sp_std::marker::PhantomData<T>);
+    pub struct MigrateToV2<T>(sp_std::marker::PhantomData<T>);
 
-    impl<T: Config> OnRuntimeUpgrade for MigrateToV1<T> {
+    impl<T: Config> OnRuntimeUpgrade for MigrateToV2<T> {
         fn on_runtime_upgrade() -> frame_support::weights::Weight {
             let on_chain_version = StorageVersion::get::<Pallet<T>>();
-            if on_chain_version != 0 {
-                log::info!("Storage v1 already updated");
+            if on_chain_version != 1 {
+                log::info!("Storage v2 already updated");
                 return Weight::zero();
             }
-
-            StorageVersion::new(1).put::<Pallet<T>>();
-
-            pallet_subspace::migrations::v15::old_storage::Weights::<T>::iter().for_each(
-                |(netuid, uid, values)| {
-                    log::info!("migrating weights for netuid: {}, uid: {}", netuid, uid);
-                    Weights::<T>::insert(netuid, uid, values);
-                },
-            );
-
-            // Just for clarity, (although not explicitly needed)
-            let _ =
-                pallet_subspace::migrations::v15::old_storage::Weights::<T>::clear(u32::MAX, None);
-
-            log::info!("Migrated to v1");
-
+            crate::UnitEmission::<T>::put(6427777777);
+            StorageVersion::new(2).put::<Pallet<T>>();
+            log::info!("Migrated to v2");
             Weight::zero()
         }
     }
 }
-
-// // Kill all weight DEW related data
-// let _ = ConsensusParameters::<T>::clear(u32::MAX, None);
-// let _ = SubnetDecryptionData::<T>::clear(u32::MAX, None);
-// let _ = ConsensusParameters::<T>::clear(u32::MAX, None);
-// let _ = WeightEncryptionData::<T>::clear(u32::MAX, None);
-// let _ = DecryptedWeights::<T>::clear(u32::MAX, None);
-// let _ = BannedDecryptionNodes::<T>::clear(u32::MAX, None);
-// let _ = DecryptionNodes::<T>::kill();
-
-// let _ = WeightSettingDelegation::<T>::clear(u32::MAX, None);
-// let _ = Weights::<T>::clear_prefix(5, u32::MAX, None);
diff --git a/pallets/subspace/src/lib.rs b/pallets/subspace/src/lib.rs
@@ -469,6 +469,8 @@ pub mod pallet {
     pub type WeightSettingDelegation<T: Config> =
         StorageDoubleMap<_, Identity, u16, Identity, T::AccountId, T::AccountId>;
 
+    #[pallet::storage]
+    pub type Bridged<T: Config> = StorageMap<_, Identity, T::AccountId, u64, ValueQuery>;
     // --- Module Fees ---
 
     /// Default values for fees used throughout the module
diff --git a/pallets/subspace/src/selections/errors.rs b/pallets/subspace/src/selections/errors.rs
@@ -209,5 +209,11 @@ pub mod errors {
         /// Cannot decrease fees below their current values.
         /// Fees can only be increased to prevent economic attacks.
         CannotDecreaseFee,
+        /// General error for not having enough balance
+        NotEnoughBalance,
+        /// Not having enough tokens to bridge back
+        NotEnoughBridgedTokens,
+        /// User is trying to bridge tokens in closed period
+        OutsideValidBlockRange,
     }
 }
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -32,6 +32,7 @@ frame-executive.workspace = true
 frame-support.workspace = true
 frame-system.workspace = true
 frame-try-runtime = { workspace = true, optional = true }
+frame-metadata-hash-extension.workspace = true
 pallet-aura.workspace = true
 pallet-balances.workspace = true
 pallet-grandpa.workspace = true
@@ -187,3 +188,4 @@ try-runtime = [
     "pallet-evm-chain-id/try-runtime",
     "fp-self-contained/try-runtime",
 ]
+metadata-hash = ["substrate-wasm-builder/metadata-hash"]
diff --git a/runtime/build.rs b/runtime/build.rs
@@ -1,10 +1,19 @@
 fn main() {
-    #[cfg(feature = "std")]
+    #[cfg(all(feature = "std", not(feature = "metadata-hash")))]
     {
         substrate_wasm_builder::WasmBuilder::new()
             .with_current_project()
             .export_heap_base()
             .import_memory()
             .build();
     }
+    #[cfg(all(feature = "std", feature = "metadata-hash"))]
+    {
+        substrate_wasm_builder::WasmBuilder::new()
+            .with_current_project()
+            .export_heap_base()
+            .import_memory()
+            .enable_metadata_hash("COMAI", 9)
+            .build();
+    }
 }
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -209,5 +209,11 @@ pub mod errors {`
`209`	`209`	`/// Cannot decrease fees below their current values.`
`210`	`210`	`/// Fees can only be increased to prevent economic attacks.`
`211`	`211`	`CannotDecreaseFee,`
	`212`	`+ /// General error for not having enough balance`
	`213`	`+ NotEnoughBalance,`
	`214`	`+ /// Not having enough tokens to bridge back`
	`215`	`+ NotEnoughBridgedTokens,`
	`216`	`+ /// User is trying to bridge tokens in closed period`
	`217`	`+ OutsideValidBlockRange,`
`212`	`218`	`}`
`213`	`219`	`}`