Starlight: Wire ContainerRegistrar and Registrar pallets

pallets/registrar/src/lib.rs

@@ -64,8 +64,8 @@ use {
     sp_std::{collections::btree_set::BTreeSet, prelude::*},
     tp_traits::{
         GetCurrentContainerChains, GetSessionContainerChains, GetSessionIndex, ParaId,
-        ParathreadParams as ParathreadParamsTy, RelayStorageRootProvider, SessionContainerChains,
-        SlotFrequency,
+        ParathreadParams as ParathreadParamsTy, RegistrarHandler, RelayStorageRootProvider,
+        SessionContainerChains, SlotFrequency,
     },
 };
 
@@ -176,6 +176,8 @@ pub mod pallet {
 
         type RegistrarHooks: RegistrarHooks;
 
+        type InnerRegistrar: RegistrarHandler<Self::AccountId>;
+
         type WeightInfo: WeightInfo;
     }
 
@@ -798,6 +800,8 @@ pub mod pallet {
             // Hold the deposit, we verified we can do this
             T::Currency::hold(&HoldReason::RegistrarDeposit.into(), &account, deposit)?;
 
+            T::InnerRegistrar::register(account.clone(), para_id, genesis_data.clone().storage)?;
+
             // Update DepositInfo
             RegistrarDeposit::<T>::insert(
                 para_id,
@@ -846,6 +850,7 @@ pub mod pallet {
                 })?;
                 // Mark this para id for cleanup later
                 Self::schedule_parachain_cleanup(para_id)?;
+                T::InnerRegistrar::schedule_para_downgrade(para_id)?;
                 Self::deposit_event(Event::ParaIdDeregistered { para_id });
             }
 
@@ -882,6 +887,8 @@ pub mod pallet {
 
             T::RegistrarHooks::para_marked_valid_for_collating(para_id);
 
+            T::InnerRegistrar::schedule_para_upgrade(para_id)?;
+
             Ok(())
         }
 
@@ -1203,6 +1210,7 @@ pub mod pallet {
             ParaManager::<T>::remove(para_id);
 
             T::RegistrarHooks::para_deregistered(para_id);
+            T::InnerRegistrar::deregister(para_id);
         }
 
         fn schedule_parachain_cleanup(para_id: ParaId) -> DispatchResult {

pallets/registrar/src/mock.rs

@@ -148,6 +148,7 @@ impl pallet_registrar::Config for Test {
     type DepositAmount = DepositAmount;
     type RuntimeHoldReason = RuntimeHoldReason;
     type RegistrarHooks = Mock;
+    type InnerRegistrar = ();
     type WeightInfo = ();
 }
 

primitives/traits/Cargo.toml

@@ -11,6 +11,7 @@ workspace = true
 
 [dependencies]
 dp-chain-state-snapshot = { workspace = true }
+dp-container-chain-genesis-data = { workspace = true }
 frame-support = { workspace = true }
 impl-trait-for-tuples = { workspace = true }
 macro_rules_attribute = { workspace = true }
@@ -29,6 +30,7 @@ default = [ "std" ]
 std = [
 	"cumulus-primitives-core/std",
 	"dp-chain-state-snapshot/std",
+	"dp-container-chain-genesis-data/std",
 	"frame-support/std",
 	"parity-scale-codec/std",
 	"scale-info/std",

primitives/traits/src/lib.rs

@@ -24,16 +24,19 @@ pub mod alias;
 pub use {
     alias::*,
     cumulus_primitives_core::{
-        relay_chain::{BlockNumber, Slot},
+        relay_chain::{BlockNumber, HeadData, Slot, ValidationCode},
         ParaId,
     },
     dp_chain_state_snapshot::{GenericStateProof, ReadEntryErr},
+    dp_container_chain_genesis_data::ContainerChainGenesisDataItem,
 };
 use {
     core::marker::PhantomData,
     frame_support::{
         dispatch::DispatchErrorWithPostInfo,
-        pallet_prelude::{Decode, DispatchResultWithPostInfo, Encode, Get, MaxEncodedLen, Weight},
+        pallet_prelude::{
+            Decode, DispatchResult, DispatchResultWithPostInfo, Encode, Get, MaxEncodedLen, Weight,
+        },
         BoundedVec,
     },
     serde::{Deserialize, Serialize},
@@ -366,3 +369,37 @@ impl GenericStorageReader for NativeStorageReader {
         }
     }
 }
+
+pub trait RegistrarHandler<AccountId> {
+    fn register(
+        who: AccountId,
+        id: ParaId,
+        genesis_storage: Vec<ContainerChainGenesisDataItem>,
+    ) -> DispatchResult;
+
+    fn schedule_para_upgrade(id: ParaId) -> DispatchResult;
+    fn schedule_para_downgrade(id: ParaId) -> DispatchResult;
+    fn deregister(id: ParaId) -> Weight;
+}
+
+impl<AccountId> RegistrarHandler<AccountId> for () {
+    fn register(
+        _who: AccountId,
+        _id: ParaId,
+        _genesis_storage: Vec<ContainerChainGenesisDataItem>,
+    ) -> DispatchResult {
+        Ok(())
+    }
+
+    fn schedule_para_upgrade(_id: ParaId) -> DispatchResult {
+        Ok(())
+    }
+
+    fn schedule_para_downgrade(_id: ParaId) -> DispatchResult {
+        Ok(())
+    }
+
+    fn deregister(_id: ParaId) -> Weight {
+        Weight::default()
+    }
+}

runtime/dancebox/src/lib.rs

@@ -1261,6 +1261,7 @@ impl pallet_registrar::Config for Runtime {
     type DepositAmount = DepositAmount;
     type RegistrarHooks = DanceboxRegistrarHooks;
     type RuntimeHoldReason = RuntimeHoldReason;
+    type InnerRegistrar = ();
     type WeightInfo = weights::pallet_registrar::SubstrateWeight<Runtime>;
 }
 

runtime/flashbox/src/lib.rs

@@ -1103,6 +1103,7 @@ impl pallet_registrar::Config for Runtime {
     type DepositAmount = DepositAmount;
     type RegistrarHooks = FlashboxRegistrarHooks;
     type RuntimeHoldReason = RuntimeHoldReason;
+    type InnerRegistrar = ();
     type WeightInfo = weights::pallet_registrar::SubstrateWeight<Runtime>;
 }
 

solo-chains/runtime/starlight/src/lib.rs

@@ -29,6 +29,8 @@ use {
         ecdsa_crypto::{AuthorityId as BeefyId, Signature as BeefySignature},
         mmr::{BeefyDataProvider, MmrLeafVersion},
     },
+    cumulus_primitives_core::relay_chain::{HeadData, ValidationCode},
+    dp_container_chain_genesis_data::ContainerChainGenesisDataItem,
     frame_support::{
         dispatch::DispatchResult,
         dynamic_params::{dynamic_pallet_params, dynamic_params},
@@ -47,7 +49,7 @@ use {
         CommittedCandidateReceipt, CoreIndex, CoreState, DisputeState, ExecutorParams,
         GroupRotationInfo, Hash, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage, Moment,
         NodeFeatures, Nonce, OccupiedCoreAssumption, PersistedValidationData, ScrapedOnChainVotes,
-        SessionInfo, Signature, ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex,
+        SessionInfo, Signature, ValidationCodeHash, ValidatorId, ValidatorIndex,
         PARACHAIN_KEY_TYPE_ID,
     },
     runtime_common::{
@@ -56,7 +58,9 @@ use {
             ContainsParts, LocatableAssetConverter, ToAuthor, VersionedLocatableAsset,
             VersionedLocationConverter,
         },
-        paras_registrar, paras_sudo_wrapper, BlockHashCount, BlockLength, SlowAdjustingFeeUpdate,
+        paras_registrar, paras_sudo_wrapper,
+        traits::Registrar as RegistrarInterface,
+        BlockHashCount, BlockLength, SlowAdjustingFeeUpdate,
     },
     runtime_parachains::{
         assigner_on_demand as parachains_assigner_on_demand,
@@ -73,15 +77,19 @@ use {
         shared as parachains_shared,
     },
     scale_info::TypeInfo,
+    sp_core::storage::well_known_keys as StorageWellKnownKeys,
     sp_genesis_builder::PresetId,
-    sp_runtime::traits::BlockNumberProvider,
+    sp_runtime::{traits::BlockNumberProvider, DispatchError},
     sp_std::{
         cmp::Ordering,
         collections::{btree_map::BTreeMap, btree_set::BTreeSet, vec_deque::VecDeque},
         marker::PhantomData,
         prelude::*,
     },
-    tp_traits::{GetSessionContainerChains, RemoveParaIdsWithNoCredits, Slot, SlotFrequency},
+    tp_traits::{
+        GetSessionContainerChains, RegistrarHandler, RemoveParaIdsWithNoCredits, Slot,
+        SlotFrequency,
+    },
 };
 
 #[cfg(any(feature = "std", test))]
@@ -1484,6 +1492,60 @@ parameter_types! {
     pub const MaxLengthParaIds: u32 = 100u32;
     pub const MaxEncodedGenesisDataSize: u32 = 5_000_000u32; // 5MB
 }
+
+pub struct InnerStarlightRegistrar<AccountId, RegistrarManager>(
+    PhantomData<(AccountId, RegistrarManager)>,
+);
+impl<AccountId, RegistrarManager> RegistrarHandler<AccountId>
+    for InnerStarlightRegistrar<AccountId, RegistrarManager>
+where
+    RegistrarManager: RegistrarInterface<AccountId = AccountId>,
+{
+    fn register(
+        who: AccountId,
+        id: ParaId,
+        genesis_storage: Vec<ContainerChainGenesisDataItem>,
+    ) -> DispatchResult {
+        // Build HeadData
+        let key_values: Vec<(Vec<u8>, Vec<u8>)> =
+            genesis_storage.into_iter().map(|x| x.into()).collect();
+        let genesis_head = HeadData(key_values.clone().encode());
+
+        // Check if the wasm code is present in storage
+        let kv_code = key_values
+            .into_iter()
+            .find(|kv| kv.0 == StorageWellKnownKeys::CODE.to_vec());
+
+        if let None = kv_code {
+            return Err(DispatchError::Other("Code not found"));
+        }
+
+        // Build ValidationCode
+        let validation_code = ValidationCode(kv_code.unwrap().1);
+        RegistrarManager::register(who, id, genesis_head, validation_code)
+    }
+
+    fn schedule_para_upgrade(id: ParaId) -> DispatchResult {
+        RegistrarManager::make_parachain(id)
+    }
+
+    fn schedule_para_downgrade(id: ParaId) -> DispatchResult {
+        RegistrarManager::make_parathread(id)
+    }
+
+    fn deregister(id: ParaId) -> Weight {
+        if let Err(e) = RegistrarManager::deregister(id) {
+            log::warn!(
+                "Failed to deregister para id {} in relay chain: {:?}",
+                u32::from(id),
+                e,
+            );
+        }
+
+        Weight::default()
+    }
+}
+
 impl pallet_registrar::Config for Runtime {
     type RuntimeEvent = RuntimeEvent;
     type RegistrarOrigin = EnsureRoot<AccountId>;
@@ -1499,6 +1561,7 @@ impl pallet_registrar::Config for Runtime {
     type DepositAmount = DepositAmount;
     type RegistrarHooks = StarlightRegistrarHooks;
     type RuntimeHoldReason = RuntimeHoldReason;
+    type InnerRegistrar = InnerStarlightRegistrar<AccountId, Registrar>;
     type WeightInfo = pallet_registrar::weights::SubstrateWeight<Runtime>;
 }
 

solo-chains/runtime/starlight/src/tests/common/mod.rs

@@ -238,6 +238,18 @@ pub struct ParaRegistrationParams {
     pub parathread_params: Option<tp_traits::ParathreadParams>,
 }
 
+impl From<(u32, ContainerChainGenesisData, u32, u32)> for ParaRegistrationParams {
+    fn from(value: (u32, ContainerChainGenesisData, u32, u32)) -> Self {
+        Self {
+            para_id: value.0,
+            genesis_data: value.1,
+            block_production_credits: value.2,
+            collator_assignment_credits: value.3,
+            parathread_params: None,
+        }
+    }
+}
+
 pub fn default_config() -> pallet_configuration::HostConfiguration {
     pallet_configuration::HostConfiguration {
         max_collators: 100,