Merge branch 'main' into keep-reconstructor-state

Author: teor2345

Cargo.lock

@@ -136,7 +136,7 @@ pub fn refund_storage_fee<T: Config>(
     Ok(())
 }
 
-/// Split the new deposit into 2 parts: the staking deposit and the the storage fee deposit,
+/// Split the new deposit into 2 parts: the staking deposit and the storage fee deposit,
 /// add the storage fee deposit to the bundle storage fund.
 pub fn deposit_reserve_for_storage_fund<T: Config>(
     operator_id: OperatorId,

crates/pallet-domains/src/bundle_storage_fund.rs

@@ -1,61 +1,3 @@
-//! Migration module for pallet-domains
-//!
-//! TODO: remove this module after it has been deployed to Taurus.
+mod v1_to_v5;
 
-use crate::{Config, Pallet};
-use frame_support::migrations::VersionedMigration;
-use frame_support::traits::UncheckedOnRuntimeUpgrade;
-use frame_support::weights::Weight;
-
-pub type VersionCheckedMigrateDomainsV4ToV5<T> = VersionedMigration<
-    4,
-    5,
-    VersionUncheckedMigrateV4ToV5<T>,
-    Pallet<T>,
-    <T as frame_system::Config>::DbWeight,
->;
-
-pub struct VersionUncheckedMigrateV4ToV5<T>(sp_std::marker::PhantomData<T>);
-impl<T: Config> UncheckedOnRuntimeUpgrade for VersionUncheckedMigrateV4ToV5<T> {
-    fn on_runtime_upgrade() -> Weight {
-        domain_genesis_receipt::set_domain_genesis_receipt::<T>()
-    }
-}
-
-mod domain_genesis_receipt {
-    use super::Config;
-    use crate::{DomainGenesisBlockExecutionReceipt, ExecutionReceiptOf};
-    use hexlit::hex;
-    use sp_core::{Get, H256};
-    use sp_domains::DomainId;
-    use sp_runtime::traits::{NumberFor, Zero};
-    use sp_runtime::Weight;
-
-    pub(super) fn set_domain_genesis_receipt<T: Config>() -> Weight {
-        let taurus_genesis_hash = T::Hash::from(H256::from(hex!(
-            "0x295aeafca762a304d92ee1505548695091f6082d3f0aa4d092ac3cd6397a6c5e"
-        )));
-        let genesis_hash = frame_system::Pallet::<T>::block_hash(NumberFor::<T::Block>::zero());
-        if genesis_hash != taurus_genesis_hash {
-            return Weight::zero();
-        }
-
-        let genesis_state_root = T::DomainHash::from(H256::from(hex!(
-            "0x530eae1878202aa0ab5997eadf2b7245ee78f44a35ab25ff84151fab489aa334"
-        )));
-
-        let genesis_block_hash = T::DomainHash::from(H256::from(hex!(
-            "0x5a367ed131b9d8807f0166651095a9ed51aefa9aaec3152d3eb5cee322220ce6"
-        )));
-
-        let domain_0_genesis_er = ExecutionReceiptOf::<T>::genesis(
-            genesis_state_root,
-            sp_domains::EMPTY_EXTRINSIC_ROOT.into(),
-            genesis_block_hash,
-        );
-
-        DomainGenesisBlockExecutionReceipt::<T>::insert(DomainId::new(0), domain_0_genesis_er);
-
-        T::DbWeight::get().reads_writes(0, 1)
-    }
-}
+pub use v1_to_v5::VersionCheckedMigrateDomainsV1ToV5;

crates/pallet-domains/src/migrations.rs

@@ -0,0 +1,22 @@
+//! Migration module for pallet-domains
+
+use crate::{Config, Pallet};
+use core::marker::PhantomData;
+use frame_support::migrations::VersionedMigration;
+use frame_support::traits::UncheckedOnRuntimeUpgrade;
+use frame_support::weights::Weight;
+
+pub type VersionCheckedMigrateDomainsV1ToV5<T> = VersionedMigration<
+    1,
+    5,
+    VersionUncheckedMigrateV1ToV5<T>,
+    Pallet<T>,
+    <T as frame_system::Config>::DbWeight,
+>;
+
+pub struct VersionUncheckedMigrateV1ToV5<T>(PhantomData<T>);
+impl<T: Config> UncheckedOnRuntimeUpgrade for VersionUncheckedMigrateV1ToV5<T> {
+    fn on_runtime_upgrade() -> Weight {
+        Weight::zero()
+    }
+}

crates/pallet-domains/src/migrations/v1_to_v5.rs

@@ -404,7 +404,7 @@ pub(crate) struct DepositInfo<Balance> {
     first_deposit_in_epoch: bool,
 }
 
-/// Calculates shares for any pending deposit for previous epoch using the the epoch share price and
+/// Calculates shares for any pending deposit for previous epoch using the epoch share price and
 /// then create a new pending deposit in the current epoch.
 /// If there is a pending deposit for the current epoch, then simply increment the amount.
 /// Returns updated deposit info

crates/pallet-domains/src/staking.rs

@@ -11,7 +11,6 @@ use sp_consensus_subspace::digests::{CompatibleDigestItem, PreDigest, PreDigestP
 use sp_consensus_subspace::{KzgExtension, PosExtension, PotExtension, SignedVote, Vote};
 use sp_io::TestExternalities;
 use sp_runtime::testing::{Digest, DigestItem, TestXt};
-use sp_runtime::traits::Block as BlockT;
 use sp_runtime::BuildStorage;
 use std::marker::PhantomData;
 use std::num::{NonZeroU32, NonZeroU64, NonZeroUsize};
@@ -38,7 +37,7 @@ use subspace_farmer_components::FarmerProtocolInfo;
 use subspace_kzg::Kzg;
 use subspace_proof_of_space::shim::ShimTable;
 use subspace_proof_of_space::{Table, TableGenerator};
-use subspace_runtime_primitives::ConsensusEventSegmentSize;
+use subspace_runtime_primitives::{BlockHashFor, ConsensusEventSegmentSize};
 use subspace_verification::is_within_solution_range;
 
 type PosTable = ShimTable;
@@ -287,15 +286,15 @@ pub fn create_archived_segment() -> &'static NewArchivedSegment {
 pub fn create_signed_vote(
     keypair: &Keypair,
     height: u64,
-    parent_hash: <Block as BlockT>::Hash,
+    parent_hash: BlockHashFor<Block>,
     slot: Slot,
     proof_of_time: PotOutput,
     future_proof_of_time: PotOutput,
     archived_history_segment: &NewArchivedSegment,
     reward_address: <Test as frame_system::Config>::AccountId,
     solution_range: SolutionRange,
     vote_solution_range: SolutionRange,
-) -> SignedVote<u64, <Block as BlockT>::Hash, <Test as frame_system::Config>::AccountId> {
+) -> SignedVote<u64, BlockHashFor<Block>, <Test as frame_system::Config>::AccountId> {
     let kzg = kzg_instance();
     let erasure_coding = erasure_coding_instance();
     let reward_signing_context = schnorrkel::signing_context(REWARD_SIGNING_CONTEXT);
@@ -391,7 +390,7 @@ pub fn create_signed_vote(
             continue;
         }
 
-        let vote = Vote::<u64, <Block as BlockT>::Hash, _>::V0 {
+        let vote = Vote::<u64, BlockHashFor<Block>, _>::V0 {
             height,
             parent_hash,
             slot,

crates/pallet-subspace/src/mock.rs

@@ -297,7 +297,7 @@ where
     Client::Api: BlockBuilderApi<Block> + SubspaceApi<Block, PublicKey> + ApiExt<Block>,
     CIDP: CreateInherentDataProviders<Block, ()> + Send + Sync + 'static,
     AS: AuxStore + Send + Sync + 'static,
-    BlockNumber: From<<Block::Header as HeaderT>::Number>,
+    BlockNumber: From<NumberFor<Block>>,
 {
     /// Produce a Subspace block-import object to be used later on in the construction of an import-queue.
     pub fn new(
@@ -552,7 +552,7 @@ where
     Client::Api: BlockBuilderApi<Block> + SubspaceApi<Block, PublicKey> + ApiExt<Block>,
     CIDP: CreateInherentDataProviders<Block, ()> + Send + Sync + 'static,
     AS: AuxStore + Send + Sync + 'static,
-    BlockNumber: From<<Block::Header as HeaderT>::Number>,
+    BlockNumber: From<NumberFor<Block>>,
 {
     type Error = Error<Block::Header>;
 

crates/sc-consensus-subspace/src/block_import.rs

@@ -313,7 +313,7 @@ where
     BS: BackoffAuthoringBlocksStrategy<NumberFor<Block>> + Send + Sync,
     Error: std::error::Error + Send + From<ConsensusError> + 'static,
     AS: AuxStore + Send + Sync + 'static,
-    BlockNumber: From<<Block::Header as Header>::Number>,
+    BlockNumber: From<NumberFor<Block>>,
 {
     type BlockImport = BoxBlockImport<Block>;
     type SyncOracle = SubspaceSyncOracle<SO>;
@@ -757,7 +757,7 @@ where
     BS: BackoffAuthoringBlocksStrategy<NumberFor<Block>> + Send + Sync,
     Error: std::error::Error + Send + From<ConsensusError> + 'static,
     AS: AuxStore + Send + Sync + 'static,
-    BlockNumber: From<<Block::Header as Header>::Number>,
+    BlockNumber: From<NumberFor<Block>>,
 {
     /// Create new Subspace slot worker
     pub fn new(

crates/sc-consensus-subspace/src/slot_worker.rs

@@ -22,8 +22,8 @@ use std::time::Duration;
 use tokio::time::sleep;
 use tracing::{debug, error, trace};
 
-const REQUEST_PAUSE: Duration = Duration::from_secs(5);
-const ATTEMPTS_NUMBER: u32 = 10;
+const REQUEST_PAUSE: Duration = Duration::from_secs(15);
+const ATTEMPTS_NUMBER: u32 = 20;
 const PEERS_THRESHOLD: usize = 20;
 
 /// Last confirmed domain block info error.

crates/sc-domains/src/domain_block_er/receipt_receiver.rs

@@ -27,6 +27,7 @@ sc-transaction-pool-api.workspace = true
 sp-runtime = { workspace = true, features = ["std"] }
 strum_macros.workspace = true
 subspace-core-primitives = { workspace = true, features = ["std"] }
+subspace-runtime-primitives = { workspace = true, features = ["std"] }
 substrate-prometheus-endpoint.workspace = true
 thiserror.workspace = true
 tracing = { workspace = true, features = ["std"] }

crates/sc-subspace-block-relay/Cargo.toml

@@ -1,9 +1,9 @@
 //! Consensus block relay implementation.
 
 use crate::consensus::types::{
-    BlockHash, ConsensusClientMetrics, ConsensusRequest, ConsensusServerMetrics, Extrinsic,
-    FullDownloadRequest, FullDownloadResponse, InitialRequest, InitialResponse, PartialBlock,
-    ProtocolInitialRequest, ProtocolInitialResponse, ProtocolMessage,
+    ConsensusClientMetrics, ConsensusRequest, ConsensusServerMetrics, FullDownloadRequest,
+    FullDownloadResponse, InitialRequest, InitialResponse, PartialBlock, ProtocolInitialRequest,
+    ProtocolInitialResponse, ProtocolMessage,
 };
 use crate::protocol::compact_block::{
     CompactBlockClient, CompactBlockHandshake, CompactBlockServer,
@@ -36,6 +36,7 @@ use std::num::{NonZeroU32, NonZeroUsize};
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 use subspace_core_primitives::PublicKey;
+use subspace_runtime_primitives::{BlockHashFor, ExtrinsicFor};
 use substrate_prometheus_endpoint::{PrometheusError, Registry};
 use tracing::{debug, info, trace, warn};
 
@@ -62,7 +63,7 @@ where
 {
     network: Arc<NetworkWrapper>,
     protocol_name: ProtocolName,
-    compact_block: CompactBlockClient<BlockHash<Block>, TxHash<Pool>, Extrinsic<Block>>,
+    compact_block: CompactBlockClient<BlockHashFor<Block>, TxHash<Pool>, ExtrinsicFor<Block>>,
     backend: Arc<ConsensusClientBackend<Pool>>,
     metrics: ConsensusClientMetrics,
     _phantom_data: std::marker::PhantomData<(Block, Pool)>,
@@ -90,7 +91,7 @@ where
     fn new(
         network: Arc<NetworkWrapper>,
         protocol_name: ProtocolName,
-        compact_block: CompactBlockClient<BlockHash<Block>, TxHash<Pool>, Extrinsic<Block>>,
+        compact_block: CompactBlockClient<BlockHashFor<Block>, TxHash<Pool>, ExtrinsicFor<Block>>,
         backend: Arc<ConsensusClientBackend<Pool>>,
         metrics: ConsensusClientMetrics,
     ) -> Self {
@@ -195,9 +196,10 @@ where
         &self,
         protocol_response: ProtocolInitialResponse<Block, TxHash<Pool>>,
         network_peer_handle: &NetworkPeerHandle,
-    ) -> Result<(Vec<Extrinsic<Block>>, usize), RelayError>
+    ) -> Result<(Vec<ExtrinsicFor<Block>>, usize), RelayError>
     where
-        Request: From<CompactBlockHandshake<BlockHash<Block>, TxHash<Pool>>> + Encode + Send + Sync,
+        Request:
+            From<CompactBlockHandshake<BlockHashFor<Block>, TxHash<Pool>>> + Encode + Send + Sync,
     {
         let ProtocolInitialResponse::CompactBlock(compact_response) = protocol_response;
         let (block_hash, resolved) = self
@@ -303,7 +305,7 @@ where
 /// The server side of the consensus block relay
 struct ConsensusRelayServer<Block: BlockT, Client, Pool: TransactionPool> {
     client: Arc<Client>,
-    compact_block: CompactBlockServer<BlockHash<Block>, TxHash<Pool>, Extrinsic<Block>>,
+    compact_block: CompactBlockServer<BlockHashFor<Block>, TxHash<Pool>, ExtrinsicFor<Block>>,
     request_receiver: async_channel::Receiver<IncomingRequest>,
     backend: Arc<ConsensusServerBackend<Client, Pool>>,
     metrics: ConsensusServerMetrics,
@@ -320,7 +322,7 @@ where
     /// Creates the consensus relay server.
     fn new(
         client: Arc<Client>,
-        compact_block: CompactBlockServer<BlockHash<Block>, TxHash<Pool>, Extrinsic<Block>>,
+        compact_block: CompactBlockServer<BlockHashFor<Block>, TxHash<Pool>, ExtrinsicFor<Block>>,
         request_receiver: async_channel::Receiver<IncomingRequest>,
         backend: Arc<ConsensusServerBackend<Client, Pool>>,
         metrics: ConsensusServerMetrics,
@@ -488,7 +490,7 @@ where
     /// Builds the partial block response
     fn get_partial_block(
         &self,
-        block_hash: &BlockHash<Block>,
+        block_hash: &BlockHashFor<Block>,
         block_attributes: BlockAttributes,
     ) -> Result<PartialBlock<Block>, RelayError> {
         let block_header = match self.client.header(*block_hash) {
@@ -537,7 +539,7 @@ where
     }
 
     /// Converts the BlockId to block hash
-    fn block_hash(&self, block_id: &BlockId<Block>) -> Result<BlockHash<Block>, RelayError> {
+    fn block_hash(&self, block_id: &BlockId<Block>) -> Result<BlockHashFor<Block>, RelayError> {
         match self.client.block_hash_from_id(block_id) {
             Ok(Some(hash)) => Ok(hash),
             Ok(None) => Err(RelayError::BlockHash(format!("Missing: {block_id:?}"))),
@@ -591,12 +593,12 @@ struct ConsensusClientBackend<Pool> {
     transaction_pool: Arc<Pool>,
 }
 
-impl<Block, Pool> ClientBackend<TxHash<Pool>, Extrinsic<Block>> for ConsensusClientBackend<Pool>
+impl<Block, Pool> ClientBackend<TxHash<Pool>, ExtrinsicFor<Block>> for ConsensusClientBackend<Pool>
 where
     Block: BlockT,
     Pool: TransactionPool<Block = Block> + 'static,
 {
-    fn protocol_unit(&self, tx_hash: &TxHash<Pool>) -> Option<Extrinsic<Block>> {
+    fn protocol_unit(&self, tx_hash: &TxHash<Pool>) -> Option<ExtrinsicFor<Block>> {
         // Look up the transaction pool.
         self.transaction_pool
             .ready_transaction(tx_hash)
@@ -610,7 +612,7 @@ struct ConsensusServerBackend<Client, Pool> {
     transaction_pool: Arc<Pool>,
 }
 
-impl<Block, Client, Pool> ServerBackend<BlockHash<Block>, TxHash<Pool>, Extrinsic<Block>>
+impl<Block, Client, Pool> ServerBackend<BlockHashFor<Block>, TxHash<Pool>, ExtrinsicFor<Block>>
     for ConsensusServerBackend<Client, Pool>
 where
     Block: BlockT,
@@ -620,8 +622,8 @@ where
 {
     fn download_unit_members(
         &self,
-        block_hash: &BlockHash<Block>,
-    ) -> Result<Vec<ProtocolUnitInfo<TxHash<Pool>, Extrinsic<Block>>>, RelayError> {
+        block_hash: &BlockHashFor<Block>,
+    ) -> Result<Vec<ProtocolUnitInfo<TxHash<Pool>, ExtrinsicFor<Block>>>, RelayError> {
         let txns = block_transactions(block_hash, self.client.as_ref())?;
         Ok(txns
             .into_iter()
@@ -642,9 +644,9 @@ where
 
     fn protocol_unit(
         &self,
-        block_hash: &BlockHash<Block>,
+        block_hash: &BlockHashFor<Block>,
         tx_hash: &TxHash<Pool>,
-    ) -> Option<Extrinsic<Block>> {
+    ) -> Option<ExtrinsicFor<Block>> {
         // Look up the block extrinsics.
         match block_transactions(block_hash, self.client.as_ref()) {
             Ok(extrinsics) => {
@@ -674,9 +676,9 @@ where
 
 /// Retrieves the block transactions/tx hash from the backend.
 fn block_transactions<Block, Client>(
-    block_hash: &BlockHash<Block>,
+    block_hash: &BlockHashFor<Block>,
     client: &Client,
-) -> Result<Vec<Extrinsic<Block>>, RelayError>
+) -> Result<Vec<ExtrinsicFor<Block>>, RelayError>
 where
     Block: BlockT,
     Client: HeaderBackend<Block> + BlockBackend<Block>,
@@ -702,7 +704,7 @@ pub fn build_consensus_relay<Block, Client, Pool>(
     pool: Arc<Pool>,
     registry: Option<&Registry>,
 ) -> Result<
-    BlockRelayParams<Block, NetworkWorker<Block, <Block as BlockT>::Hash>>,
+    BlockRelayParams<Block, NetworkWorker<Block, BlockHashFor<Block>>>,
     BlockRelayConfigurationError,
 >
 where