Merge pull request #3087 from autonomys/subspace-core-primitives-refa…

…ctoring

`subspace-core-primitives` refactoring

crates/pallet-domains/src/lib.rs

@@ -84,7 +84,8 @@ use sp_runtime::transaction_validity::TransactionPriority;
 use sp_runtime::{RuntimeAppPublic, SaturatedConversion, Saturating};
 use sp_subspace_mmr::{ConsensusChainMmrLeafProof, MmrProofVerifier};
 pub use staking::OperatorConfig;
-use subspace_core_primitives::{BlockHash, PotOutput, SlotNumber, U256};
+use subspace_core_primitives::pot::PotOutput;
+use subspace_core_primitives::{BlockHash, SlotNumber, U256};
 
 /// Maximum number of nominators to slash within a give operator at a time.
 pub const MAX_NOMINATORS_TO_SLASH: u32 = 10;

crates/pallet-subspace/src/benchmarking.rs

@@ -21,9 +21,12 @@ mod benchmarks {
     use sp_consensus_subspace::{SignedVote, Vote};
     use sp_std::boxed::Box;
     use sp_std::num::NonZeroU32;
+    use subspace_core_primitives::pot::{PotCheckpoints, PotOutput};
+    use subspace_core_primitives::segments::{
+        ArchivedBlockProgress, LastArchivedBlock, SegmentHeader, SegmentIndex,
+    };
     use subspace_core_primitives::{
-        ArchivedBlockProgress, Blake3Hash, LastArchivedBlock, PotCheckpoints, PotOutput, PublicKey,
-        RewardSignature, SegmentHeader, SegmentIndex, Solution, SolutionRange,
+        Blake3Hash, PublicKey, RewardSignature, Solution, SolutionRange,
     };
 
     const SEED: u32 = 0;
@@ -153,7 +156,7 @@ mod benchmarks {
     fn create_segment_header(segment_index: SegmentIndex) -> SegmentHeader {
         SegmentHeader::V0 {
             segment_index,
-            segment_commitment: subspace_core_primitives::SegmentCommitment::default(),
+            segment_commitment: subspace_core_primitives::segments::SegmentCommitment::default(),
             prev_segment_header_hash: Blake3Hash::default(),
             last_archived_block: LastArchivedBlock {
                 number: 0,

crates/pallet-subspace/src/lib.rs

@@ -58,10 +58,13 @@ use sp_runtime::transaction_validity::{
 use sp_std::collections::btree_map::BTreeMap;
 use sp_std::prelude::*;
 use subspace_core_primitives::crypto::Scalar;
+use subspace_core_primitives::pieces::PieceOffset;
+use subspace_core_primitives::sectors::{SectorId, SectorIndex};
+use subspace_core_primitives::segments::{
+    ArchivedHistorySegment, HistorySize, SegmentHeader, SegmentIndex,
+};
 use subspace_core_primitives::{
-    ArchivedHistorySegment, BlockHash, HistorySize, PieceOffset, PublicKey, RewardSignature,
-    SectorId, SectorIndex, SegmentHeader, SegmentIndex, SlotNumber, SolutionRange,
-    REWARD_SIGNING_CONTEXT,
+    BlockHash, PublicKey, RewardSignature, SlotNumber, SolutionRange, REWARD_SIGNING_CONTEXT,
 };
 use subspace_verification::{
     check_reward_signature, derive_next_solution_range, derive_pot_entropy, PieceCheckParams,
@@ -110,9 +113,12 @@ pub mod pallet {
     use sp_std::num::NonZeroU32;
     use sp_std::prelude::*;
     use subspace_core_primitives::crypto::Scalar;
+    use subspace_core_primitives::pieces::PieceOffset;
+    use subspace_core_primitives::pot::PotCheckpoints;
+    use subspace_core_primitives::sectors::SectorIndex;
+    use subspace_core_primitives::segments::{HistorySize, SegmentHeader, SegmentIndex};
     use subspace_core_primitives::{
-        Blake3Hash, HistorySize, PieceOffset, PotCheckpoints, PublicKey, Randomness,
-        RewardSignature, SectorIndex, SegmentHeader, SegmentIndex, SolutionRange,
+        Blake3Hash, PublicKey, Randomness, RewardSignature, SolutionRange,
     };
 
     pub(super) struct InitialSolutionRanges<T: Config> {
@@ -414,7 +420,7 @@ pub mod pallet {
         _,
         Twox64Concat,
         SegmentIndex,
-        subspace_core_primitives::SegmentCommitment,
+        subspace_core_primitives::segments::SegmentCommitment,
     >;
 
     /// Whether the segment headers inherent has been processed in this block (temporary value).

crates/pallet-subspace/src/mock.rs

@@ -36,11 +36,17 @@ use std::sync::{Once, OnceLock};
 use std::{iter, slice};
 use subspace_archiving::archiver::{Archiver, NewArchivedSegment};
 use subspace_core_primitives::crypto::kzg::{embedded_kzg_settings, Kzg};
+use subspace_core_primitives::pieces::{Piece, PieceOffset, Record};
+use subspace_core_primitives::pos::PosSeed;
+use subspace_core_primitives::pot::PotOutput;
+use subspace_core_primitives::sectors::SectorId;
+use subspace_core_primitives::segments::{
+    ArchivedBlockProgress, ArchivedHistorySegment, HistorySize, LastArchivedBlock,
+    RecordedHistorySegment, SegmentCommitment, SegmentHeader, SegmentIndex,
+};
 use subspace_core_primitives::{
-    ArchivedBlockProgress, ArchivedHistorySegment, Blake3Hash, BlockNumber, HistorySize,
-    LastArchivedBlock, Piece, PieceOffset, PosSeed, PotOutput, PublicKey, Record,
-    RecordedHistorySegment, RewardSignature, SectorId, SegmentCommitment, SegmentHeader,
-    SegmentIndex, SlotNumber, Solution, SolutionRange, REWARD_SIGNING_CONTEXT,
+    Blake3Hash, BlockNumber, PublicKey, RewardSignature, SlotNumber, Solution, SolutionRange,
+    REWARD_SIGNING_CONTEXT,
 };
 use subspace_erasure_coding::ErasureCoding;
 use subspace_farmer_components::auditing::audit_sector_sync;

crates/pallet-subspace/src/tests.rs

@@ -42,9 +42,10 @@ use std::collections::BTreeMap;
 use std::num::NonZeroU32;
 use std::sync::{Arc, Mutex};
 use subspace_core_primitives::crypto::Scalar;
-use subspace_core_primitives::{
-    PieceOffset, PotOutput, PublicKey, RewardSignature, SegmentIndex, SolutionRange,
-};
+use subspace_core_primitives::pieces::PieceOffset;
+use subspace_core_primitives::pot::PotOutput;
+use subspace_core_primitives::segments::SegmentIndex;
+use subspace_core_primitives::{PublicKey, RewardSignature, SolutionRange};
 use subspace_runtime_primitives::{FindBlockRewardAddress, FindVotingRewardAddresses};
 
 #[test]

crates/sc-consensus-subspace-rpc/src/lib.rs

@@ -55,10 +55,9 @@ use std::time::Duration;
 use subspace_archiving::archiver::NewArchivedSegment;
 use subspace_core_primitives::crypto::kzg::Kzg;
 use subspace_core_primitives::objects::GlobalObjectMapping;
-use subspace_core_primitives::{
-    Blake3Hash, BlockHash, HistorySize, Piece, PieceIndex, PublicKey, SegmentHeader, SegmentIndex,
-    SlotNumber, Solution,
-};
+use subspace_core_primitives::pieces::{Piece, PieceIndex};
+use subspace_core_primitives::segments::{HistorySize, SegmentHeader, SegmentIndex};
+use subspace_core_primitives::{Blake3Hash, BlockHash, PublicKey, SlotNumber, Solution};
 use subspace_erasure_coding::ErasureCoding;
 use subspace_farmer_components::FarmerProtocolInfo;
 use subspace_networking::libp2p::Multiaddr;

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

@@ -78,9 +78,8 @@ use std::time::Duration;
 use subspace_archiving::archiver::{Archiver, NewArchivedSegment};
 use subspace_core_primitives::crypto::kzg::Kzg;
 use subspace_core_primitives::objects::BlockObjectMapping;
-use subspace_core_primitives::{
-    BlockNumber, PublicKey, RecordedHistorySegment, SegmentHeader, SegmentIndex,
-};
+use subspace_core_primitives::segments::{RecordedHistorySegment, SegmentHeader, SegmentIndex};
+use subspace_core_primitives::{BlockNumber, PublicKey};
 use subspace_erasure_coding::ErasureCoding;
 use tracing::{debug, info, trace, warn};
 

crates/sc-consensus-subspace/src/archiver/tests.rs

@@ -3,7 +3,7 @@ use parking_lot::RwLock;
 use sc_client_api::AuxStore;
 use std::collections::HashMap;
 use std::sync::Arc;
-use subspace_core_primitives::{
+use subspace_core_primitives::segments::{
     ArchivedBlockProgress, LastArchivedBlock, SegmentHeader, SegmentIndex,
 };
 

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

@@ -52,9 +52,9 @@ use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor, One};
 use sp_runtime::Justifications;
 use std::marker::PhantomData;
 use std::sync::Arc;
-use subspace_core_primitives::{
-    BlockNumber, HistorySize, PublicKey, SectorId, SegmentHeader, SegmentIndex, SolutionRange,
-};
+use subspace_core_primitives::sectors::SectorId;
+use subspace_core_primitives::segments::{HistorySize, SegmentHeader, SegmentIndex};
+use subspace_core_primitives::{BlockNumber, PublicKey, SolutionRange};
 use subspace_proof_of_space::Table;
 use subspace_verification::{calculate_block_weight, PieceCheckParams, VerifySolutionParams};
 use tracing::warn;

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

@@ -66,9 +66,10 @@ use std::marker::PhantomData;
 use std::pin::Pin;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
+use subspace_core_primitives::pot::{PotCheckpoints, PotOutput};
+use subspace_core_primitives::sectors::SectorId;
 use subspace_core_primitives::{
-    BlockNumber, PotCheckpoints, PotOutput, PublicKey, RewardSignature, SectorId, Solution,
-    SolutionRange, REWARD_SIGNING_CONTEXT,
+    BlockNumber, PublicKey, RewardSignature, Solution, SolutionRange, REWARD_SIGNING_CONTEXT,
 };
 use subspace_proof_of_space::Table;
 use subspace_verification::{

crates/sc-proof-of-time/src/lib.rs

@@ -17,7 +17,8 @@ use sp_consensus_subspace::SubspaceApi;
 use sp_inherents::CreateInherentDataProviders;
 use sp_runtime::traits::Block as BlockT;
 use std::sync::Arc;
-use subspace_core_primitives::{PotCheckpoints, PublicKey};
+use subspace_core_primitives::pot::PotCheckpoints;
+use subspace_core_primitives::PublicKey;
 use tokio::sync::broadcast::error::RecvError;
 use tracing::{debug, error, info, trace};
 

crates/sc-proof-of-time/src/source.rs

@@ -24,7 +24,8 @@ use std::collections::HashSet;
 use std::marker::PhantomData;
 use std::sync::Arc;
 use std::thread;
-use subspace_core_primitives::{PotCheckpoints, PublicKey};
+use subspace_core_primitives::pot::PotCheckpoints;
+use subspace_core_primitives::PublicKey;
 use thread_priority::{set_current_thread_priority, ThreadPriority};
 use tokio::sync::broadcast;
 use tracing::{debug, error, trace, warn};

crates/sc-proof-of-time/src/source/gossip.rs

@@ -23,7 +23,7 @@ use std::future::poll_fn;
 use std::num::NonZeroU32;
 use std::pin::pin;
 use std::sync::Arc;
-use subspace_core_primitives::{PotCheckpoints, PotSeed};
+use subspace_core_primitives::pot::{PotCheckpoints, PotSeed};
 use tracing::{debug, error, trace, warn};
 
 /// How many slots can proof be before it is too far

crates/sc-proof-of-time/src/source/state.rs

@@ -2,7 +2,7 @@ use crate::verifier::PotVerifier;
 use parking_lot::Mutex;
 use sp_consensus_slots::Slot;
 use sp_consensus_subspace::{PotNextSlotInput, PotParametersChange};
-use subspace_core_primitives::PotOutput;
+use subspace_core_primitives::pot::PotOutput;
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]
 struct InnerState {

crates/sc-proof-of-time/src/source/timekeeper.rs

@@ -6,7 +6,7 @@ use futures::SinkExt;
 use sp_consensus_slots::Slot;
 use std::num::NonZeroU32;
 use std::sync::Arc;
-use subspace_core_primitives::{PotCheckpoints, PotSeed};
+use subspace_core_primitives::pot::{PotCheckpoints, PotSeed};
 use subspace_proof_of_time::PotError;
 use tracing::{debug, trace};
 

crates/sc-proof-of-time/src/verifier.rs

@@ -9,7 +9,7 @@ use sp_consensus_slots::Slot;
 use sp_consensus_subspace::{PotNextSlotInput, PotParametersChange};
 use std::num::NonZeroU32;
 use std::sync::Arc;
-use subspace_core_primitives::{PotCheckpoints, PotOutput, PotSeed};
+use subspace_core_primitives::pot::{PotCheckpoints, PotOutput, PotSeed};
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
 struct CacheKey {

crates/sc-proof-of-time/src/verifier/tests.rs

@@ -2,7 +2,8 @@ use crate::verifier::PotVerifier;
 use sp_consensus_slots::Slot;
 use sp_consensus_subspace::{PotNextSlotInput, PotParametersChange};
 use std::num::NonZeroU32;
-use subspace_core_primitives::{Blake3Hash, PotSeed};
+use subspace_core_primitives::pot::PotSeed;
+use subspace_core_primitives::Blake3Hash;
 
 const SEED: [u8; 16] = [
     0xd6, 0x66, 0xcc, 0xd8, 0xd5, 0x93, 0xc2, 0x3d, 0xa8, 0xdb, 0x6b, 0x5b, 0x14, 0x13, 0xb1, 0x3a,

crates/sp-consensus-subspace/src/digests.rs

@@ -25,9 +25,9 @@ use sp_runtime::DigestItem;
 use sp_std::collections::btree_map::{BTreeMap, Entry};
 use sp_std::fmt;
 use sp_std::num::NonZeroU32;
-use subspace_core_primitives::{
-    PotOutput, PublicKey, RewardSignature, SegmentCommitment, SegmentIndex, Solution, SolutionRange,
-};
+use subspace_core_primitives::pot::PotOutput;
+use subspace_core_primitives::segments::{SegmentCommitment, SegmentIndex};
+use subspace_core_primitives::{PublicKey, RewardSignature, Solution, SolutionRange};
 
 /// A Subspace pre-runtime digest. This contains all data required to validate a block and for the
 /// Subspace runtime module.

crates/sp-consensus-subspace/src/inherents.rs

@@ -23,7 +23,7 @@ extern crate alloc;
 use alloc::vec::Vec;
 use codec::{Decode, Encode};
 use sp_inherents::{Error, InherentData, InherentIdentifier, IsFatalError};
-use subspace_core_primitives::SegmentHeader;
+use subspace_core_primitives::segments::SegmentHeader;
 
 /// The Subspace inherent identifier.
 pub const INHERENT_IDENTIFIER: InherentIdentifier = *b"subspace";

crates/sp-consensus-subspace/src/lib.rs

@@ -42,9 +42,12 @@ use sp_runtime_interface::{pass_by, runtime_interface};
 use sp_std::num::NonZeroU32;
 #[cfg(feature = "std")]
 use subspace_core_primitives::crypto::kzg::Kzg;
+use subspace_core_primitives::pot::{PotCheckpoints, PotOutput, PotSeed};
+use subspace_core_primitives::segments::{
+    HistorySize, SegmentCommitment, SegmentHeader, SegmentIndex,
+};
 use subspace_core_primitives::{
-    Blake3Hash, BlockHash, BlockNumber, HistorySize, PotCheckpoints, PotOutput, PotSeed, PublicKey,
-    RewardSignature, SegmentCommitment, SegmentHeader, SegmentIndex, SlotNumber, Solution,
+    Blake3Hash, BlockHash, BlockNumber, PublicKey, RewardSignature, SlotNumber, Solution,
     SolutionRange,
 };
 #[cfg(feature = "std")]

crates/sp-domains/src/lib.rs

@@ -68,7 +68,8 @@ use sp_weights::Weight;
 #[cfg(feature = "std")]
 use std::collections::BTreeSet;
 use subspace_core_primitives::crypto::blake3_hash;
-use subspace_core_primitives::{bidirectional_distance, Blake3Hash, PotOutput, Randomness, U256};
+use subspace_core_primitives::pot::PotOutput;
+use subspace_core_primitives::{bidirectional_distance, Blake3Hash, Randomness, U256};
 use subspace_runtime_primitives::{Balance, Moment};
 
 /// Key type for Operator.

crates/subspace-archiving/benches/archiving.rs

@@ -4,7 +4,7 @@ use std::num::NonZeroUsize;
 use subspace_archiving::archiver::Archiver;
 use subspace_core_primitives::crypto::kzg;
 use subspace_core_primitives::crypto::kzg::Kzg;
-use subspace_core_primitives::Record;
+use subspace_core_primitives::pieces::Record;
 use subspace_erasure_coding::ErasureCoding;
 
 const AMOUNT_OF_DATA: usize = 5 * 1024 * 1024;

crates/subspace-archiving/src/archiver.rs

@@ -34,11 +34,12 @@ use subspace_core_primitives::crypto::{blake3_254_hash_to_scalar, Scalar};
 use subspace_core_primitives::objects::{
     BlockObject, BlockObjectMapping, GlobalObject, PieceObject, PieceObjectMapping,
 };
-use subspace_core_primitives::{
-    ArchivedBlockProgress, ArchivedHistorySegment, Blake3Hash, BlockNumber, LastArchivedBlock,
-    PieceArray, RawRecord, RecordWitness, RecordedHistorySegment, SegmentCommitment, SegmentHeader,
-    SegmentIndex,
+use subspace_core_primitives::pieces::{PieceArray, RawRecord, RecordWitness};
+use subspace_core_primitives::segments::{
+    ArchivedBlockProgress, ArchivedHistorySegment, LastArchivedBlock, RecordedHistorySegment,
+    SegmentCommitment, SegmentHeader, SegmentIndex,
 };
+use subspace_core_primitives::{Blake3Hash, BlockNumber};
 use subspace_erasure_coding::ErasureCoding;
 
 const INITIAL_LAST_ARCHIVED_BLOCK: LastArchivedBlock = LastArchivedBlock {

crates/subspace-archiving/src/archiver/incremental_record_commitments.rs

@@ -10,7 +10,7 @@ use parity_scale_codec::{Encode, Output};
 use rayon::prelude::*;
 use subspace_core_primitives::crypto::kzg::{Commitment, Kzg};
 use subspace_core_primitives::crypto::Scalar;
-use subspace_core_primitives::RawRecord;
+use subspace_core_primitives::pieces::RawRecord;
 
 /// State of incremental record commitments, encapsulated to hide implementation details and
 /// encapsulate tricky logic

crates/subspace-archiving/src/piece_reconstructor.rs

@@ -9,7 +9,8 @@ use alloc::vec::Vec;
 use rayon::prelude::*;
 use subspace_core_primitives::crypto::kzg::{Commitment, Kzg, Polynomial};
 use subspace_core_primitives::crypto::{blake3_254_hash_to_scalar, Scalar};
-use subspace_core_primitives::{ArchivedHistorySegment, Piece, RawRecord};
+use subspace_core_primitives::pieces::{Piece, RawRecord};
+use subspace_core_primitives::segments::ArchivedHistorySegment;
 use subspace_erasure_coding::ErasureCoding;
 
 /// Reconstructor-related instantiation error

crates/subspace-archiving/src/reconstructor.rs

@@ -9,10 +9,12 @@ use alloc::vec::Vec;
 use core::mem;
 use parity_scale_codec::Decode;
 use subspace_core_primitives::crypto::Scalar;
-use subspace_core_primitives::{
-    ArchivedBlockProgress, ArchivedHistorySegment, BlockNumber, LastArchivedBlock, Piece,
-    RawRecord, RecordedHistorySegment, SegmentHeader, SegmentIndex,
+use subspace_core_primitives::pieces::{Piece, RawRecord};
+use subspace_core_primitives::segments::{
+    ArchivedBlockProgress, ArchivedHistorySegment, LastArchivedBlock, RecordedHistorySegment,
+    SegmentHeader, SegmentIndex,
 };
+use subspace_core_primitives::BlockNumber;
 use subspace_erasure_coding::ErasureCoding;
 
 /// Reconstructor-related instantiation error

crates/subspace-archiving/tests/integration/archiver.rs

@@ -10,10 +10,12 @@ use subspace_archiving::archiver;
 use subspace_archiving::archiver::{Archiver, ArchiverInstantiationError, SegmentItem};
 use subspace_core_primitives::crypto::kzg::{embedded_kzg_settings, Kzg};
 use subspace_core_primitives::objects::{BlockObject, BlockObjectMapping, PieceObject};
-use subspace_core_primitives::{
-    ArchivedBlockProgress, ArchivedHistorySegment, Blake3Hash, LastArchivedBlock, Piece, Record,
-    RecordedHistorySegment, SegmentCommitment, SegmentHeader, SegmentIndex,
+use subspace_core_primitives::pieces::{Piece, Record};
+use subspace_core_primitives::segments::{
+    ArchivedBlockProgress, ArchivedHistorySegment, LastArchivedBlock, RecordedHistorySegment,
+    SegmentCommitment, SegmentHeader, SegmentIndex,
 };
+use subspace_core_primitives::Blake3Hash;
 use subspace_erasure_coding::ErasureCoding;
 
 fn extract_data<O: Into<u64>>(data: &[u8], offset: O) -> &[u8] {

crates/subspace-archiving/tests/integration/piece_reconstruction.rs

@@ -6,9 +6,8 @@ use subspace_archiving::archiver::Archiver;
 use subspace_archiving::piece_reconstructor::{PiecesReconstructor, ReconstructorError};
 use subspace_core_primitives::crypto::kzg::{embedded_kzg_settings, Kzg};
 use subspace_core_primitives::objects::BlockObjectMapping;
-use subspace_core_primitives::{
-    ArchivedHistorySegment, FlatPieces, Piece, Record, RecordedHistorySegment,
-};
+use subspace_core_primitives::pieces::{FlatPieces, Piece, Record};
+use subspace_core_primitives::segments::{ArchivedHistorySegment, RecordedHistorySegment};
 use subspace_erasure_coding::ErasureCoding;
 
 fn pieces_to_option_of_pieces(pieces: &FlatPieces) -> Vec<Option<Piece>> {

crates/subspace-archiving/tests/integration/reconstructor.rs

@@ -6,9 +6,10 @@ use subspace_archiving::archiver::Archiver;
 use subspace_archiving::reconstructor::{Reconstructor, ReconstructorError};
 use subspace_core_primitives::crypto::kzg::{embedded_kzg_settings, Kzg};
 use subspace_core_primitives::objects::BlockObjectMapping;
-use subspace_core_primitives::{
-    ArchivedBlockProgress, ArchivedHistorySegment, FlatPieces, LastArchivedBlock, Piece, Record,
-    RecordedHistorySegment, SegmentIndex,
+use subspace_core_primitives::pieces::{FlatPieces, Piece, Record};
+use subspace_core_primitives::segments::{
+    ArchivedBlockProgress, ArchivedHistorySegment, LastArchivedBlock, RecordedHistorySegment,
+    SegmentIndex,
 };
 use subspace_erasure_coding::ErasureCoding;
 

crates/subspace-core-primitives/benches/kzg.rs

@@ -1,7 +1,7 @@
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use subspace_core_primitives::crypto::kzg::{embedded_kzg_settings, Kzg};
 use subspace_core_primitives::crypto::Scalar;
-use subspace_core_primitives::RawRecord;
+use subspace_core_primitives::pieces::RawRecord;
 
 fn criterion_benchmark(c: &mut Criterion) {
     let values = (0..RawRecord::NUM_CHUNKS)