chore: combine primitives (#616)

Cargo.toml

@@ -7,9 +7,6 @@ repository = "https://github.com/eigerco/polka-storage"
 
 [workspace]
 members = [
-  "cli/polka-storage-provider/client",
-  "cli/polka-storage-provider/common",
-  "cli/polka-storage-provider/server",
   "lib/polka-storage-proofs",
   "maat",
   "mater/cli",
@@ -20,9 +17,11 @@ members = [
   "pallets/proofs",
   "pallets/randomness",
   "pallets/storage-provider",
-  "primitives/commitment",
-  "primitives/proofs",
+  "primitives",
   "runtime",
+  "storage-provider/client",
+  "storage-provider/common",
+  "storage-provider/server",
   "storage/polka-index",
   "storagext/cli",
   "storagext/lib",
@@ -93,7 +92,7 @@ rand_chacha = { version = "0.3.1", default-features = false }
 rand_xorshift = "0.3"
 rocksdb = { version = "0.21" }
 scale-info = { version = "2.11.1", default-features = false }
-sealed = "0.6.0"
+sealed = { version = "0.6.0", default-features = false }
 serde = { version = "1.0.197", default-features = false }
 serde-big-array = { version = "0.3.2" }
 serde_derive = { version = "1.0.117" }
@@ -137,10 +136,9 @@ pallet-proofs = { path = "pallets/proofs", default-features = false }
 pallet-randomness = { path = "pallets/randomness", default-features = false }
 pallet-storage-provider = { path = "pallets/storage-provider", default-features = false }
 polka-storage-proofs = { path = "lib/polka-storage-proofs", default-features = false }
-polka-storage-provider-common = { path = "cli/polka-storage-provider/common" }
+polka-storage-provider-common = { path = "storage-provider/common" }
 polka-storage-runtime = { path = "runtime" }
-primitives-commitment = { path = "primitives/commitment" }
-primitives-proofs = { path = "primitives/proofs", default-features = false }
+primitives = { path = "primitives", default-features = false }
 storagext = { path = "storagext/lib" }
 
 # FileCoin proofs
@@ -214,7 +212,6 @@ frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-s
 frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409-2", default-features = false }
 
 # FRAME Pallets
-# TODO(#457,@cernicc,17/10/2024): Switch to BABE
 pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409-2", default-features = false }
 pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409-2", default-features = false }
 pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2409-2", default-features = false }

lib/polka-storage-proofs/Cargo.toml

@@ -11,8 +11,7 @@ version = "0.1.0"
 # Permanently used crates.
 bls12_381 = { workspace = true }
 pairing = { workspace = true }
-primitives-commitment = { workspace = true }
-primitives-proofs = { workspace = true }
+primitives = { workspace = true }
 rand_xorshift = { workspace = true }
 
 # Crates are only imported on feature 'std'.
@@ -53,8 +52,7 @@ std = [
   "dep:storage-proofs-porep",
   "dep:storage-proofs-post",
   "dep:thiserror",
-  "primitives-commitment/std",
-  "primitives-proofs/std",
+  "primitives/std",
   "rand/std",
   "scale-info?/std",
 ]

lib/polka-storage-proofs/src/porep/mod.rs

@@ -6,7 +6,7 @@ pub mod sealer;
 use bellperson::groth16;
 use blstrs::Bls12;
 use filecoin_proofs::{DefaultPieceHasher, SectorShapeBase};
-use primitives_proofs::RegisteredSealProof;
+use primitives::proofs::RegisteredSealProof;
 use rand::rngs::OsRng;
 use storage_proofs_core::{compound_proof::CompoundProof, proof::ProofScheme};
 use storage_proofs_porep::stacked::StackedDrg;

lib/polka-storage-proofs/src/porep/sealer.rs

@@ -8,11 +8,14 @@ use filecoin_proofs::{
     DefaultPieceHasher, PaddedBytesAmount, PoRepConfig, SealCommitPhase1Output,
     SealPreCommitOutput, SealPreCommitPhase1Output, SectorShapeBase, UnpaddedBytesAmount,
 };
-use primitives_commitment::{
-    piece::{PaddedPieceSize, PieceInfo},
-    CommD, CommP, CommR, Commitment,
+use primitives::{
+    commitment::{
+        piece::{PaddedPieceSize, PieceInfo},
+        CommD, CommP, CommR, Commitment,
+    },
+    proofs::RegisteredSealProof,
+    sector::SectorNumber,
 };
-use primitives_proofs::{RegisteredSealProof, SectorNumber};
 use storage_proofs_core::{compound_proof, compound_proof::CompoundProof};
 use storage_proofs_porep::stacked::{self, StackedCompound, StackedDrg};
 
@@ -445,16 +448,15 @@ mod test {
     fn padding_for_sector(#[case] piece_sizes: Vec<usize>) {
         let sealer = Sealer::new(RegisteredSealProof::StackedDRG2KiBV1P1);
 
-        let piece_infos: Vec<(Cursor<Vec<u8>>, primitives_commitment::piece::PieceInfo)> =
-            piece_sizes
-                .into_iter()
-                .map(|size| {
-                    let (piece_bytes, piece_info) =
-                        piece_with_random_data(PaddedBytesAmount(size as u64));
+        let piece_infos: Vec<(Cursor<Vec<u8>>, PieceInfo)> = piece_sizes
+            .into_iter()
+            .map(|size| {
+                let (piece_bytes, piece_info) =
+                    piece_with_random_data(PaddedBytesAmount(size as u64));
 
-                    (Cursor::new(piece_bytes), piece_info)
-                })
-                .collect();
+                (Cursor::new(piece_bytes), piece_info)
+            })
+            .collect();
 
         // Create a file-like sector where non-occupied bytes are 0
         let sector_size = sealer.porep_config.sector_size.0 as usize;
@@ -474,9 +476,7 @@ mod test {
     }
 
     /// Generates a piece of `size` and a PieceInfo for it
-    fn piece_with_random_data(
-        size: PaddedBytesAmount,
-    ) -> (Vec<u8>, primitives_commitment::piece::PieceInfo) {
+    fn piece_with_random_data(size: PaddedBytesAmount) -> (Vec<u8>, PieceInfo) {
         let rng = &mut XorShiftRng::from_seed(filecoin_proofs::TEST_SEED);
 
         let piece_size: UnpaddedBytesAmount = size.into();

lib/polka-storage-proofs/src/post/mod.rs

@@ -11,7 +11,7 @@ use filecoin_proofs::{
     as_safe_commitment, parameters::window_post_setup_params, PoStType, PrivateReplicaInfo,
     SectorShapeBase,
 };
-use primitives_proofs::{RegisteredPoStProof, SectorNumber};
+use primitives::{proofs::RegisteredPoStProof, sector::SectorNumber};
 use rand::rngs::OsRng;
 use storage_proofs_core::compound_proof::{self, CompoundProof};
 use storage_proofs_post::fallback::{

maat/Cargo.toml

@@ -23,17 +23,16 @@ bs58.workspace = true
 cid.workspace = true
 futures.workspace = true
 hex = { workspace = true }
+primitives = { workspace = true, features = ["serde"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["std"] }
+storagext = { workspace = true }
 subxt = { workspace = true, features = ["substrate-compat"] }
 thiserror.workspace = true
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 
-primitives-proofs = { workspace = true, features = ["serde"] }
-storagext = { workspace = true }
-
 zombienet-configuration.workspace = true
 zombienet-sdk.workspace = true
 zombienet-support.workspace = true

maat/tests/real_world.rs

@@ -2,7 +2,7 @@ use std::collections::BTreeSet;
 
 use cid::Cid;
 use maat::*;
-use primitives_proofs::SectorSize;
+use primitives::sector::SectorSize;
 use storagext::{
     clients::ProofsClientExt,
     runtime::runtime_types::{
@@ -38,7 +38,7 @@ where
         .register_storage_provider(
             charlie,
             peer_id.clone(),
-            primitives_proofs::RegisteredPoStProof::StackedDRGWindow2KiBV1P1,
+            primitives::proofs::RegisteredPoStProof::StackedDRGWindow2KiBV1P1,
             true,
         )
         .await
@@ -57,11 +57,11 @@ where
         assert_eq!(event.info.sector_size, SectorSize::_2KiB);
         assert_eq!(
             event.info.window_post_proof_type,
-            primitives_proofs::RegisteredPoStProof::StackedDRGWindow2KiBV1P1
+            primitives::proofs::RegisteredPoStProof::StackedDRGWindow2KiBV1P1
         );
         assert_eq!(
             event.info.window_post_partition_sectors,
-            primitives_proofs::RegisteredPoStProof::StackedDRGWindow2KiBV1P1
+            primitives::proofs::RegisteredPoStProof::StackedDRGWindow2KiBV1P1
                 .window_post_partitions_sector()
         );
     }
@@ -227,7 +227,7 @@ where
         Cid::try_from("bagboea4b5abcaqolcsygu5o756srf7l4pzzagml5r3wa3o6ahoo5vixummsev6rf").unwrap();
 
     let sectors_pre_commit_info = vec![SectorPreCommitInfo {
-        seal_proof: primitives_proofs::RegisteredSealProof::StackedDRG2KiBV1P1,
+        seal_proof: primitives::proofs::RegisteredSealProof::StackedDRG2KiBV1P1,
         sector_number: 1.into(),
         sealed_cid,
         deal_ids: vec![0],
@@ -330,7 +330,7 @@ where
                 proof:
                     storagext::runtime::runtime_types::pallet_storage_provider::proofs::PoStProof {
                         post_proof:
-                            primitives_proofs::RegisteredPoStProof::StackedDRGWindow2KiBV1P1,
+                            primitives::proofs::RegisteredPoStProof::StackedDRGWindow2KiBV1P1,
                         proof_bytes: "beef".to_string().into_bounded_byte_vec(),
                     },
             },

pallets/market/Cargo.toml

@@ -21,8 +21,7 @@ codec = { workspace = true, default-features = false, features = ["derive"] }
 hex = { workspace = true, default-features = false, features = ["alloc"] }
 log = { workspace = true }
 multihash-codetable = { workspace = true, features = ["blake2b"] }
-primitives-commitment = { workspace = true }
-primitives-proofs = { workspace = true, default-features = false }
+primitives = { workspace = true }
 scale-info = { workspace = true, default-features = false, features = ["derive"] }
 thiserror = { workspace = true, default-features = false }
 
@@ -60,7 +59,7 @@ std = [
   "frame-system/std",
   "hex/std",
   "pallet-balances/std",
-  "primitives-proofs/std",
+  "primitives/std",
   "scale-info/std",
   "sp-core/std",
   "sp-io/std",

pallets/market/src/error.rs

@@ -1,5 +1,5 @@
 use codec::{Decode, Encode};
-use primitives_commitment::{piece::PaddedPieceSizeError, CommitmentError};
+use primitives::commitment::{piece::PaddedPieceSizeError, CommitmentError};
 use scale_info::TypeInfo;
 
 // Clone and PartialEq required because of the BoundedVec<(DealId, DealSettlementError)>

pallets/market/src/lib.rs

@@ -38,14 +38,16 @@ pub mod pallet {
         PalletId,
     };
     use frame_system::{pallet_prelude::*, Config as SystemConfig, Pallet as System};
-    use primitives_commitment::{
-        commd::compute_unsealed_sector_commitment,
-        piece::{PaddedPieceSize, PieceInfo},
-        CommP, Commitment, CommitmentError,
-    };
-    use primitives_proofs::{
-        ActiveDeal, ActiveSector, DealId, Market, RegisteredSealProof, SectorDeal, SectorNumber,
-        SectorSize, StorageProviderValidation, MAX_DEALS_PER_SECTOR, MAX_SECTORS_PER_CALL,
+    use primitives::{
+        commitment::{
+            commd::compute_unsealed_sector_commitment,
+            piece::{PaddedPieceSize, PieceInfo},
+            CommP, Commitment, CommitmentError,
+        },
+        pallets::{ActiveDeal, ActiveSector, Market, SectorDeal, StorageProviderValidation},
+        proofs::RegisteredSealProof,
+        sector::{SectorNumber, SectorSize},
+        DealId, MAX_DEALS_PER_SECTOR, MAX_SECTORS_PER_CALL,
     };
     use scale_info::TypeInfo;
     use sp_arithmetic::traits::BaseArithmetic;

pallets/market/src/mock.rs

@@ -6,7 +6,7 @@ use frame_support::{
     PalletId,
 };
 use frame_system::{self as system, pallet_prelude::BlockNumberFor};
-use primitives_proofs::{Randomness, RegisteredPoStProof};
+use primitives::{pallets::Randomness, proofs::RegisteredPoStProof};
 use sp_core::Pair;
 use sp_runtime::{
     traits::{ConstU32, ConstU64, IdentifyAccount, IdentityLookup, Verify},

pallets/market/src/test.rs

@@ -8,10 +8,12 @@ use frame_support::{
     traits::Currency,
     BoundedVec,
 };
-use primitives_commitment::{CommP, Commitment};
-use primitives_proofs::{
-    ActiveDeal, ActiveSector, DealId, Market as MarketTrait, RegisteredSealProof, SectorDeal,
-    SectorNumber, MAX_DEALS_PER_SECTOR,
+use primitives::{
+    commitment::{CommP, Commitment},
+    pallets::{ActiveDeal, ActiveSector, Market as MarketTrait, SectorDeal},
+    proofs::RegisteredSealProof,
+    sector::SectorNumber,
+    DealId, MAX_DEALS_PER_SECTOR,
 };
 use sp_core::H256;
 use sp_runtime::AccountId32;

pallets/proofs/Cargo.toml

@@ -27,8 +27,7 @@ frame-system.workspace = true
 log = { workspace = true }
 num-bigint = { workspace = true }
 polka-storage-proofs = { workspace = true, features = ["substrate"] }
-primitives-commitment = { workspace = true }
-primitives-proofs = { workspace = true }
+primitives = { workspace = true }
 rand = { workspace = true, features = ["alloc"] }
 rand_chacha = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
@@ -63,6 +62,7 @@ std = [
   "frame-support/std",
   "frame-system/std",
   "polka-storage-proofs/std",
+  "primitives/std",
   "scale-info/std",
   "sp-runtime/std",
   "sp-std/std",

pallets/proofs/src/lib.rs

@@ -26,10 +26,12 @@ pub mod pallet {
 
     use frame_support::{pallet_prelude::*, sp_runtime::BoundedBTreeMap};
     use frame_system::pallet_prelude::*;
-    use primitives_proofs::{
-        ProofVerification, ProverId, PublicReplicaInfo, RawCommitment, RegisteredPoStProof,
-        RegisteredSealProof, SectorNumber, Ticket, MAX_POST_PROOF_BYTES, MAX_SEAL_PROOF_BYTES,
-        MAX_SECTORS_PER_PROOF,
+    use primitives::{
+        commitment::RawCommitment,
+        pallets::ProofVerification,
+        proofs::{ProverId, PublicReplicaInfo, RegisteredPoStProof, RegisteredSealProof, Ticket},
+        sector::SectorNumber,
+        MAX_POST_PROOF_BYTES, MAX_SEAL_PROOF_BYTES, MAX_SECTORS_PER_PROOF,
     };
 
     use crate::{

pallets/proofs/src/porep/config.rs

@@ -1,6 +1,6 @@
 use bls12_381::Scalar as Fr;
 use num_bigint::BigUint;
-use primitives_proofs::RegisteredSealProof;
+use primitives::proofs::RegisteredSealProof;
 use sha2::{Digest, Sha256};
 
 use crate::Vec;

pallets/proofs/src/porep/mod.rs

@@ -1,7 +1,11 @@
 mod config;
 
 use config::{Config, PoRepID};
-use primitives_proofs::{ProverId, RawCommitment, RegisteredSealProof, SectorNumber, Ticket};
+use primitives::{
+    commitment::RawCommitment,
+    proofs::{ProverId, RegisteredSealProof, Ticket},
+    sector::SectorNumber,
+};
 use sha2::{Digest, Sha256};
 
 use crate::{
@@ -248,7 +252,7 @@ fn generate_inclusion_input(challenge: usize) -> Fr {
 
 #[cfg(test)]
 mod tests {
-    use primitives_proofs::{RegisteredSealProof, SectorNumber};
+    use primitives::{proofs::RegisteredSealProof, sector::SectorNumber};
 
     use super::{ProofScheme, PublicInputs, Tau};
 

pallets/proofs/src/post/config.rs

@@ -1,4 +1,4 @@
-use primitives_proofs::RegisteredPoStProof;
+use primitives::proofs::RegisteredPoStProof;
 
 pub struct Config {
     /// Size of the sector in bytes.

pallets/proofs/src/post/mod.rs

@@ -3,10 +3,11 @@ mod config;
 use config::Config;
 use frame_support::{pallet_prelude::*, sp_runtime::BoundedBTreeMap};
 use polka_storage_proofs::get_partitions_for_window_post;
-use primitives_commitment::NODE_SIZE;
-use primitives_proofs::{
-    PublicReplicaInfo, RawCommitment, RegisteredPoStProof, SectorNumber, Ticket,
-    MAX_SECTORS_PER_PROOF,
+use primitives::{
+    commitment::RawCommitment,
+    proofs::{PublicReplicaInfo, RegisteredPoStProof, Ticket},
+    sector::SectorNumber,
+    MAX_SECTORS_PER_PROOF, NODE_SIZE,
 };
 use sha2::{Digest, Sha256};
 

pallets/proofs/src/tests/porep.rs

@@ -2,8 +2,11 @@ use codec::{Decode, Encode};
 use frame_support::{assert_noop, assert_ok};
 use hex::FromHex;
 use polka_storage_proofs::{Bls12, VerifyingKey};
-use primitives_proofs::{
-    ProofVerification, ProverId, RawCommitment, RegisteredSealProof, SectorNumber, Ticket,
+use primitives::{
+    commitment::RawCommitment,
+    pallets::ProofVerification,
+    proofs::{ProverId, RegisteredSealProof, Ticket},
+    sector::SectorNumber,
 };
 use rand::SeedableRng;
 use rand_xorshift::XorShiftRng;