chore: final migrations tweaks (#118)

We are getting ready for the mainnet release on July 7th. This change
finishes the name porting logic converting agent names to complying
namespace names, by lowering and removing whitespace from the names.

Author: saiintbrisson

pallets/governance/src/migrations.rs

@@ -5,7 +5,7 @@ use polkadot_sdk::frame_support::{
 
 use crate::{Config, Pallet};
 
-pub mod v3 {
+pub mod v5 {
     use pallet_permission0_api::{CuratorPermissions, Permission0CuratorApi, PermissionDuration};
     use polkadot_sdk::{
         frame_system::RawOrigin,
@@ -159,175 +159,3 @@ pub mod v3 {
         }
     }
 }
-
-pub mod v4 {
-    use pallet_permission0_api::{CuratorPermissions, Permission0CuratorApi, PermissionDuration};
-    use polkadot_sdk::{
-        frame_system::RawOrigin,
-        sp_tracing::{info, warn},
-    };
-
-    use super::*;
-
-    pub type Migration<T, W> = VersionedMigration<3, 4, MigrateToV4<T>, Pallet<T>, W>;
-    pub struct MigrateToV4<T>(core::marker::PhantomData<T>);
-
-    mod old_storage {
-        use polkadot_sdk::frame_support::{storage_alias, Identity};
-
-        use crate::AccountIdOf;
-
-        #[storage_alias]
-        pub type Curators<T: crate::Config> =
-            StorageMap<crate::Pallet<T>, Identity, AccountIdOf<T>, ()>;
-    }
-
-    impl<T: Config> UncheckedOnRuntimeUpgrade for MigrateToV4<T> {
-        fn on_runtime_upgrade() -> Weight {
-            for (curator, _) in old_storage::Curators::<T>::iter() {
-                let res = <<T as Config>::Permission0>::grant_curator_permission(
-                    RawOrigin::Root.into(),
-                    curator.clone(),
-                    CuratorPermissions::all(),
-                    None,
-                    PermissionDuration::Indefinite,
-                    pallet_permission0_api::RevocationTerms::RevocableByGrantor,
-                );
-
-                match res {
-                    Ok(perm_id) => info!("migrated curator {curator:?} to permission0: {perm_id}"),
-                    Err(err) => {
-                        warn!("Could not migrate curator {curator:?} to permission0: {err:?}");
-                    }
-                }
-            }
-
-            Weight::zero()
-        }
-    }
-}
-
-pub mod v5 {
-    use crate::proposal::{GlobalParamsData, ProposalData};
-
-    use super::*;
-
-    pub type Migration<T, W> = VersionedMigration<4, 5, MigrateToV5<T>, Pallet<T>, W>;
-    pub struct MigrateToV5<T>(core::marker::PhantomData<T>);
-
-    mod old_storage {
-        use codec::{Decode, Encode, MaxEncodedLen};
-        use polkadot_sdk::{
-            frame_support::{storage_alias, DebugNoBound, Identity},
-            polkadot_sdk_frame::prelude::BlockNumberFor,
-            sp_core::ConstU32,
-            sp_runtime::{BoundedVec, Percent},
-        };
-        use scale_info::TypeInfo;
-
-        use crate::{
-            proposal::{ProposalId, ProposalStatus},
-            AccountIdOf, BalanceOf,
-        };
-
-        #[derive(Clone, DebugNoBound, TypeInfo, Decode, Encode, MaxEncodedLen)]
-        #[scale_info(skip_type_params(T))]
-        pub struct Proposal<T: crate::Config> {
-            pub id: ProposalId,
-            pub proposer: AccountIdOf<T>,
-            pub expiration_block: BlockNumberFor<T>,
-            pub data: ProposalData<T>,
-            pub status: ProposalStatus<T>,
-            pub metadata: BoundedVec<u8, ConstU32<256>>,
-            pub proposal_cost: BalanceOf<T>,
-            pub creation_block: BlockNumberFor<T>,
-        }
-
-        #[derive(Clone, DebugNoBound, TypeInfo, Decode, Encode, MaxEncodedLen, PartialEq, Eq)]
-        #[scale_info(skip_type_params(T))]
-        pub enum ProposalData<T: crate::Config> {
-            GlobalParams(GlobalParamsData<T>),
-            GlobalCustom,
-            Emission {
-                recycling_percentage: Percent,
-                treasury_percentage: Percent,
-                incentives_ratio: Percent,
-            },
-            TransferDaoTreasury {
-                account: AccountIdOf<T>,
-                amount: BalanceOf<T>,
-            },
-        }
-
-        #[derive(Clone, DebugNoBound, TypeInfo, Decode, Encode, MaxEncodedLen, PartialEq, Eq)]
-        #[scale_info(skip_type_params(T))]
-        pub struct GlobalParamsData<T: crate::Config> {
-            pub min_name_length: u16,
-            pub max_name_length: u16,
-            pub max_allowed_agents: u16,
-            pub min_weight_control_fee: u8,
-            pub min_staking_fee: u8,
-            pub dividends_participation_weight: Percent,
-            pub proposal_cost: BalanceOf<T>,
-        }
-
-        #[storage_alias]
-        pub type Proposals<T: crate::Config> =
-            StorageMap<crate::Pallet<T>, Identity, ProposalId, Proposal<T>>;
-    }
-
-    impl<T: Config> UncheckedOnRuntimeUpgrade for MigrateToV5<T> {
-        fn on_runtime_upgrade() -> Weight {
-            for (id, proposal) in old_storage::Proposals::iter() {
-                let new_data = match proposal.data {
-                    old_storage::ProposalData::GlobalParams(old_storage::GlobalParamsData {
-                        min_name_length,
-                        max_name_length,
-                        min_weight_control_fee,
-                        min_staking_fee,
-                        dividends_participation_weight,
-                        proposal_cost,
-                        ..
-                    }) => ProposalData::GlobalParams(GlobalParamsData {
-                        min_name_length,
-                        max_name_length,
-                        min_weight_control_fee,
-                        min_staking_fee,
-                        dividends_participation_weight,
-                        namespace_pricing_config:
-                            <T as pallet_torus0::Config>::DefaultNamespacePricingConfig::get(),
-                        proposal_cost,
-                    }),
-                    old_storage::ProposalData::GlobalCustom => ProposalData::GlobalCustom,
-                    old_storage::ProposalData::Emission {
-                        recycling_percentage,
-                        treasury_percentage,
-                        incentives_ratio,
-                    } => ProposalData::Emission {
-                        recycling_percentage,
-                        treasury_percentage,
-                        incentives_ratio,
-                    },
-                    old_storage::ProposalData::TransferDaoTreasury { account, amount } => {
-                        ProposalData::TransferDaoTreasury { account, amount }
-                    }
-                };
-
-                let new_proposal = crate::proposal::Proposal {
-                    id: proposal.id,
-                    proposer: proposal.proposer,
-                    expiration_block: proposal.expiration_block,
-                    data: new_data,
-                    status: proposal.status,
-                    metadata: proposal.metadata,
-                    proposal_cost: proposal.proposal_cost,
-                    creation_block: proposal.creation_block,
-                };
-
-                crate::Proposals::<T>::set(id, Some(new_proposal));
-            }
-
-            Weight::zero()
-        }
-    }
-}

pallets/governance/src/proposal.rs

@@ -548,16 +548,12 @@ fn create_unrewarded_proposal<T: crate::Config>(
 ) {
     let mut reward_votes_for = BoundedBTreeMap::new();
     for (key, value) in votes_for {
-        reward_votes_for
-            .try_insert(key, value)
-            .expect("this wont exceed u32::MAX");
+        let _ = reward_votes_for.try_insert(key, value);
     }
 
     let mut reward_votes_against: AccountStakes<T> = BoundedBTreeMap::new();
     for (key, value) in votes_against {
-        reward_votes_against
-            .try_insert(key, value)
-            .expect("this probably wont exceed u32::MAX");
+        let _ = reward_votes_against.try_insert(key, value);
     }
 
     UnrewardedProposals::<T>::insert(
@@ -634,9 +630,7 @@ pub fn tick_proposal_rewards<T: crate::Config>(block_number: BlockNumberFor<T>)
             .chain(unrewarded_proposal.votes_against.into_iter())
         {
             let curr_stake = *account_stakes.get(&acc_id).unwrap_or(&0u128);
-            account_stakes
-                .try_insert(acc_id, curr_stake.saturating_add(stake))
-                .expect("infallible");
+            let _ = account_stakes.try_insert(acc_id, curr_stake.saturating_add(stake));
         }
 
         match get_reward_allocation::<T>(&governance_config, n) {

pallets/permission0/src/migrations.rs

@@ -1,35 +1 @@
-pub mod v2 {
-    use polkadot_sdk::{
-        frame_support::{migrations::VersionedMigration, traits::UncheckedOnRuntimeUpgrade},
-        sp_weights::Weight,
-    };
 
-    use crate::{Config, Pallet};
-
-    pub type Migration<T, W> = VersionedMigration<1, 2, MigrateToV2<T>, Pallet<T>, W>;
-    pub struct MigrateToV2<T>(core::marker::PhantomData<T>);
-
-    impl<T: Config> UncheckedOnRuntimeUpgrade for MigrateToV2<T> {
-        fn on_runtime_upgrade() -> Weight {
-            Weight::zero()
-        }
-    }
-}
-
-pub mod v3 {
-    use polkadot_sdk::{
-        frame_support::{migrations::VersionedMigration, traits::UncheckedOnRuntimeUpgrade},
-        sp_weights::Weight,
-    };
-
-    use crate::{Config, Pallet};
-
-    pub type Migration<T, W> = VersionedMigration<2, 3, MigrateToV3<T>, Pallet<T>, W>;
-    pub struct MigrateToV3<T>(core::marker::PhantomData<T>);
-
-    impl<T: Config> UncheckedOnRuntimeUpgrade for MigrateToV3<T> {
-        fn on_runtime_upgrade() -> Weight {
-            Weight::zero()
-        }
-    }
-}

pallets/torus0/api/src/lib.rs

@@ -79,7 +79,7 @@ pub struct NamespacePath(NamespacePathInner);
 impl NamespacePath {
     /// The root agent namespace entry.
     pub fn agent_root() -> NamespacePath {
-        NamespacePath(b"agent".to_vec().try_into().unwrap())
+        NamespacePath(NamespacePathInner::truncate_from(b"agent".to_vec()))
     }
 
     /// Create a new root agent namespace path from the agent name

pallets/torus0/src/migrations.rs

@@ -111,8 +111,9 @@ pub mod v5 {
             let _ = storage::NamespaceCount::<T>::clear(u32::MAX, None);
 
             let path = NamespacePath::agent_root();
+            #[allow(deprecated)]
             if let Err(err) =
-                crate::namespace::create_namespace::<T>(NamespaceOwnership::System, path)
+                crate::namespace::create_namespace0::<T>(NamespaceOwnership::System, path, false)
             {
                 error!("failed to create root agent namespace: {err:?}");
                 return Weight::default();
@@ -127,11 +128,7 @@ pub mod v5 {
                     continue;
                 };
 
-                let agent_name = if cfg!(feature = "testnet") {
-                    agent_name.to_ascii_lowercase().replace(' ', "-")
-                } else {
-                    agent_name.into()
-                };
+                let agent_name = agent_name.trim().to_ascii_lowercase().replace(' ', "-");
 
                 let Ok(bounded_name) = agent_name.as_bytes().to_vec().try_into() else {
                     error!("cannot lower case agent {agent_name:?}");

runtime/src/lib.rs

@@ -84,11 +84,7 @@ pub type SignedPayload = sp_runtime::generic::SignedPayload<RuntimeCall, SignedE
 ///
 /// This can be a tuple of types, each implementing `OnRuntimeUpgrade`.
 type Migrations = (
-    pallet_governance::migrations::v3::Migration<Runtime, RocksDbWeight>,
-    pallet_governance::migrations::v4::Migration<Runtime, RocksDbWeight>,
     pallet_governance::migrations::v5::Migration<Runtime, RocksDbWeight>,
-    pallet_permission0::migrations::v2::Migration<Runtime, RocksDbWeight>,
-    pallet_permission0::migrations::v3::Migration<Runtime, RocksDbWeight>,
     pallet_emission0::migrations::v2::Migration<Runtime, RocksDbWeight>,
     pallet_torus0::migrations::v4::Migration<Runtime, RocksDbWeight>,
     pallet_torus0::migrations::v5::Migration<Runtime, RocksDbWeight>,

xtask/src/run.rs

@@ -78,8 +78,6 @@ pub(super) fn run(mut r: flags::Run) {
     ops::key_insert_cmd(&path, &chain_spec, &account.suri, "aura");
     ops::key_insert_cmd(&path, &chain_spec, &account.suri, "gran");
 
-    dbg!(&chain_spec);
-
     let _run = ops::run_node(&path, &chain_spec, &node, &r.bootnodes, r.isolated)
         .spawn()
         .unwrap()