Revert "Backport Proof of Space perf improvements from abundance"

Author: teor2345

Cargo.lock

@@ -23,7 +23,6 @@ members = [
 ]
 
 [workspace.dependencies]
-ab-chacha8 = { version = "0.1.0", path = "shared/ab-chacha8" }
 actix-web = { version = "4.9.0", default-features = false }
 aes = "0.9.0-pre.2"
 anyhow = "1.0.89"
@@ -112,7 +111,6 @@ mmr-gadget = { git = "https://github.com/subspace/polkadot-sdk", rev = "e8311328
 mmr-rpc = { git = "https://github.com/subspace/polkadot-sdk", rev = "e831132867930ca90a7088c7246301ab29f015ba" }
 multihash = "0.19.1"
 nohash-hasher = "0.2.0"
-no-panic = "0.1.35"
 num-traits = { version = "0.2.18", default-features = false }
 num_cpus = "1.16.0"
 num_enum = { version = "0.5.3", default-features = false }

Cargo.toml

@@ -13,12 +13,8 @@ use parity_scale_codec::{Decode, Encode};
 use scale_info::prelude::fmt;
 use sp_consensus_slots::Slot;
 use sp_consensus_subspace::SignedVote;
-use sp_runtime::Weight;
 use sp_runtime::traits::{AsSystemOriginSigner, Dispatchable, NumberFor};
-use sp_runtime::transaction_validity::{
-    InvalidTransaction, TransactionSource, TransactionValidityError, UnknownTransaction,
-    ValidTransaction,
-};
+use sp_runtime::transaction_validity::TransactionSource;
 use sp_std::collections::btree_map::BTreeMap;
 use subspace_core_primitives::pieces::PieceOffset;
 use subspace_core_primitives::sectors::SectorIndex;
@@ -86,14 +82,11 @@ mod benchmarks {
             (Option<T::AccountId>, RewardSignature),
         >::default());
 
-        let result;
         #[block]
         {
-            result =
-                SubspaceExtension::<T>::do_check_vote(&signed_vote, TransactionSource::InBlock);
-        };
-
-        handle_error(result);
+            SubspaceExtension::<T>::do_check_vote(&signed_vote, TransactionSource::InBlock)
+                .unwrap();
+        }
     }
 
     #[benchmark]
@@ -139,15 +132,11 @@ mod benchmarks {
             *signed_vote.vote.slot(),
             Some(reward_address),
         ));
-
-        let result;
         #[block]
         {
-            result =
-                SubspaceExtension::<T>::do_check_vote(&signed_vote, TransactionSource::InBlock);
-        };
-
-        handle_error(result);
+            SubspaceExtension::<T>::do_check_vote(&signed_vote, TransactionSource::InBlock)
+                .unwrap();
+        }
     }
 
     impl_benchmark_test_suite!(
@@ -156,65 +145,3 @@ mod benchmarks {
         crate::mock::Test
     );
 }
-
-fn handle_error(result: Result<(ValidTransaction, Weight), TransactionValidityError>) {
-    // This exhaustive match is required because the production runtime does not generate debug impls.
-    if let Err(e) = result {
-        match e {
-            TransactionValidityError::Invalid(e) => match e {
-                InvalidTransaction::Call => {
-                    log::error!("Invalid transaction: Call");
-                }
-                InvalidTransaction::Payment => {
-                    log::error!("Invalid transaction: Payment");
-                    panic!("Invalid transaction: Payment");
-                }
-                InvalidTransaction::Future => {
-                    log::error!("Invalid transaction: Future");
-                }
-                InvalidTransaction::Stale => {
-                    log::error!("Invalid transaction: Stale");
-                }
-                InvalidTransaction::BadProof => {
-                    log::error!("Invalid transaction: BadProof");
-                }
-                InvalidTransaction::AncientBirthBlock => {
-                    log::error!("Invalid transaction: AncientBirthBlock");
-                }
-                InvalidTransaction::ExhaustsResources => {
-                    log::error!("Invalid transaction: ExhaustsResources");
-                }
-                InvalidTransaction::Custom(e) => {
-                    log::error!("Invalid transaction: Custom({})", e);
-                }
-                InvalidTransaction::BadMandatory => {
-                    log::error!("Invalid transaction: BadMandatory");
-                }
-                InvalidTransaction::MandatoryValidation => {
-                    log::error!("Invalid transaction: MandatoryValidation");
-                }
-                InvalidTransaction::BadSigner => {
-                    log::error!("Invalid transaction: BadSigner");
-                }
-                InvalidTransaction::IndeterminateImplicit => {
-                    log::error!("Invalid transaction: IndeterminateImplicit");
-                }
-                InvalidTransaction::UnknownOrigin => {
-                    log::error!("Invalid transaction: UnknownOrigin");
-                }
-            },
-            TransactionValidityError::Unknown(e) => match e {
-                UnknownTransaction::CannotLookup => {
-                    log::error!("Unknown transaction: CannotLookup");
-                }
-                UnknownTransaction::NoUnsignedValidator => {
-                    log::error!("Unknown transaction: NoUnsignedValidator");
-                }
-                UnknownTransaction::Custom(e) => {
-                    log::error!("Unknown transaction: Custom({})", e);
-                }
-            },
-        }
-        panic!("Error: {e:?}");
-    }
-}

crates/pallet-subspace/src/extensions/benchmarking.rs

@@ -58,7 +58,7 @@ std = [
     "sp-weights/std",
     "subspace-core-primitives/std",
     "subspace-kzg/std",
-    "subspace-proof-of-space/alloc",
+    "subspace-proof-of-space/std",
     "subspace-verification/kzg",
     "subspace-verification/std",
     "thiserror/std",

crates/sp-consensus-subspace/Cargo.toml

@@ -1,7 +1,7 @@
 //! Solutions-related data structures and functions.
 
 use crate::pieces::{PieceOffset, Record, RecordCommitment, RecordWitness};
-use crate::pos::{PosProof, PosSeed};
+use crate::pos::PosProof;
 use crate::sectors::SectorIndex;
 use crate::segments::{HistorySize, SegmentIndex};
 use crate::{PublicKey, ScalarBytes};
@@ -227,12 +227,6 @@ impl ChunkWitness {
     pub const SIZE: usize = 48;
 }
 
-/// Proof-of-time verifier trait, used in abundance backports.
-pub trait SolutionPotVerifier {
-    /// Check whether proof created earlier is valid
-    fn is_proof_valid(seed: &PosSeed, challenge_index: u32, proof: &PosProof) -> bool;
-}
-
 /// Farmer solution for slot challenge.
 #[derive(Clone, Debug, Eq, PartialEq, Encode, Decode, TypeInfo)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]

crates/subspace-core-primitives/src/solutions.rs

@@ -6,51 +6,52 @@ version = "0.1.0"
 authors = ["Nazar Mokrynskyi <[email protected]>"]
 edition.workspace = true
 include = [
+    "/benches",
     "/src",
     "/Cargo.toml",
 ]
 
-[package.metadata.docs.rs]
-all-features = true
-
 [lib]
 # Necessary for CLI options to work on benches
 bench = false
 
 [dependencies]
-ab-chacha8.workspace = true
 blake3 = { workspace = true, default-features = false }
-chacha20 = { workspace = true, optional = true }
+chacha20.workspace = true
 derive_more = { workspace = true, features = ["full"] }
+parking_lot = { workspace = true, optional = true }
 rayon = { workspace = true, optional = true }
-seq-macro = { workspace = true, optional = true }
-sha2 = { workspace = true, optional = true }
+seq-macro.workspace = true
+sha2.workspace = true
+spin.workspace = true
 subspace-core-primitives.workspace = true
 
 [dev-dependencies]
-chacha20.workspace = true
+bitvec.workspace = true
 criterion.workspace = true
-hex.workspace = true
 rayon.workspace = true
-seq-macro.workspace = true
-sha2.workspace = true
 
 [[bench]]
 name = "pos"
 harness = false
 
 [features]
-default = []
-alloc = [
-    "dep:chacha20",
-    "dep:seq-macro",
-]
-# Enabling this feature exposes quality search on `chiapos` module as well as enables support for K=15..=25 (by default
-# only K=20 is exposed)
-full-chiapos = [
-    "dep:sha2",
+default = ["std"]
+std = [
+    # TODO: `std` will not be necessary once 1.8.3+ is released with https://github.com/BLAKE3-team/BLAKE3/pull/469
+    "blake3/std",
+    "chacha20/std",
+    "derive_more/std",
+    # In no-std environment we use `spin`
+    "parking_lot",
+    "sha2/std",
+    "subspace-core-primitives/std",
 ]
 parallel = [
-    "alloc",
     "dep:rayon",
 ]
+
+# The std and no_std features are mutually exclusive, so when checking for unused dependencies,
+# ignore the `spin` dependency, which is only used in no_std.
+[package.metadata.cargo-udeps.ignore]
+normal = ["spin"]