ci: use cargo hack

Author: agostbiro

.cargo-husky/hooks/pre-commit

@@ -14,7 +14,7 @@ fi
 set -xe
 
 # Setting RUSTFLAGS env for clippy makes it not include custom rules
-RUSTFLAGS=-Dwarnings cargo check --workspace --all-targets --profile bench ${ALL_FEATURES}
+RUSTFLAGS=-Dwarnings cargo hack check --feature-powerset --no-dev-deps
 cargo clippy --all --all-targets ${ALL_FEATURES} -- -D warnings
 cargo fmt --all -- --check
 cargo test --doc --workspace ${ALL_FEATURES}

.github/workflows/hardhat-core-ci.yml

@@ -53,19 +53,16 @@ jobs:
           profile: minimal
           override: true
 
-      - uses: Swatinem/rust-cache@v2
+      # Install pre-built binaries for cargo hack
+      - uses: taiki-e/install-action@cargo-hack
 
-      - name: Cargo check
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --workspace --all-features --all-targets --profile bench
+      - uses: Swatinem/rust-cache@v2
 
-      - name: Cargo check without all features
+      - name: Cargo hack
         uses: actions-rs/cargo@v1
         with:
-          command: check
-          args: --workspace --all-targets --no-default-features --profile bench
+          command: hack
+          args: check --feature-powerset --no-dev-deps
 
   test-core:
     name: Test core (${{ matrix.os }}, Node ${{ matrix.node }}, ${{ matrix.vm }})

Brewfile

@@ -1,5 +1,9 @@
+tap "taiki-e/tap"
+
 # Rust toolchain
 brew "rustup-init"
+# Cargo hack CLI
+brew "taiki-e/tap/cargo-hack"
 # NodeJS version 18
 brew "node@18"
 # Yarn package manager for NodeJS

crates/rethnet_eth/src/block.rs

@@ -10,21 +10,22 @@ mod reorg;
 
 use std::sync::OnceLock;
 
-use revm_primitives::{
-    keccak256,
-    ruint::{self, aliases::U160},
-    SpecId, B160,
-};
+use revm_primitives::{keccak256, ruint::aliases::U160, SpecId, B160};
 use rlp::Decodable;
 
+#[cfg(feature = "serde")]
+use revm_primitives::ruint;
+
 use crate::{
-    remote::eth::{self, TransactionConversionError},
     transaction::SignedTransaction,
     trie::{self, KECCAK_NULL_RLP},
     withdrawal::Withdrawal,
     Address, Bloom, Bytes, B256, B64, U256,
 };
 
+#[cfg(feature = "serde")]
+use crate::remote::eth::{self, TransactionConversionError};
+
 use self::difficulty::calculate_ethash_canonical_difficulty;
 pub use self::{
     detailed::DetailedBlock,
@@ -103,6 +104,7 @@ impl PartialEq for Block {
 
 /// Error that occurs when trying to convert the JSON-RPC `Block` type.
 #[derive(Debug, thiserror::Error)]
+#[cfg(feature = "serde")]
 pub enum BlockConversionError {
     /// Missing miner
     #[error("Missing miner")]
@@ -118,6 +120,7 @@ pub enum BlockConversionError {
     TransactionConversionError(#[from] TransactionConversionError),
 }
 
+#[cfg(feature = "serde")]
 impl TryFrom<eth::Block<eth::Transaction>> for BlockAndCallers {
     type Error = BlockConversionError;
 
@@ -208,9 +211,9 @@ pub struct Header {
     pub withdrawals_root: Option<B256>,
 }
 
-#[cfg(feature = "serde")]
 #[derive(serde::Serialize, serde::Deserialize)]
 #[serde(remote = "B64")]
+#[cfg(feature = "serde")]
 struct B64Def(#[serde(getter = "B64::as_uint")] ruint::aliases::U64);
 
 #[cfg(feature = "serde")]

crates/rethnet_eth/src/signature.rs

@@ -11,7 +11,6 @@ use secp256k1::{
     PublicKey, Secp256k1, SecretKey, SignOnly, ThirtyTwoByteHash,
 };
 use sha3::{Digest, Keccak256};
-use thiserror::Error;
 
 use crate::{utils::hash_message, Address, B256, U256};
 
@@ -52,23 +51,30 @@ fn private_to_public_key(
 }
 
 /// An error involving a signature.
-#[derive(Debug, Error)]
+#[derive(Debug)]
+#[cfg_attr(feature = "std", derive(thiserror::Error))]
 pub enum SignatureError {
     /// Invalid length, secp256k1 signatures are 65 bytes
-    #[error("invalid signature length, got {0}, expected 65")]
+    #[cfg_attr(
+        feature = "std",
+        error("invalid signature length, got {0}, expected 65")
+    )]
     InvalidLength(usize),
     /// When parsing a signature from string to hex
-    #[error(transparent)]
-    DecodingError(#[from] hex::FromHexError),
+    #[cfg_attr(feature = "std", error(transparent))]
+    DecodingError(#[cfg_attr(feature = "std", from)] hex::FromHexError),
     /// Thrown when signature verification failed (i.e. when the address that
     /// produced the signature did not match the expected address)
-    #[error("Signature verification failed. Expected {0}, got {1}")]
+    #[cfg_attr(
+        feature = "std",
+        error("Signature verification failed. Expected {0}, got {1}")
+    )]
     VerificationError(Address, Address),
     /// Internal error during signature recovery
-    #[error(transparent)]
-    K256Error(#[from] secp256k1::Error),
+    #[cfg_attr(feature = "std", error(transparent))]
+    K256Error(#[cfg_attr(feature = "std", from)] secp256k1::Error),
     /// Error in recovering public key from signature
-    #[error("Public key recovery error")]
+    #[cfg_attr(feature = "std", error("Public key recovery error"))]
     RecoveryError,
 }
 
@@ -186,7 +192,9 @@ impl Signature {
         let (recoverable_sig, _recovery_id) = self.as_signature()?;
 
         let context = Secp256k1::verification_only();
-        let public_key = context.recover_ecdsa(&message_hash.into(), &recoverable_sig)?;
+        let public_key = context
+            .recover_ecdsa(&message_hash.into(), &recoverable_sig)
+            .map_err(SignatureError::K256Error)?;
 
         Ok(public_key_to_address(public_key))
     }
@@ -202,7 +210,8 @@ impl Signature {
             bytes[..32].copy_from_slice(&r_bytes);
             bytes[32..64].copy_from_slice(&s_bytes);
 
-            RecoverableSignature::from_compact(&bytes, recovery_id)?
+            RecoverableSignature::from_compact(&bytes, recovery_id)
+                .map_err(SignatureError::K256Error)?
         };
 
         Ok((signature, recovery_id))
@@ -211,7 +220,7 @@ impl Signature {
     /// Retrieve the recovery ID.
     pub fn recovery_id(&self) -> Result<RecoveryId, SignatureError> {
         let standard_v = normalize_recovery_id(self.v);
-        Ok(RecoveryId::from_i32(standard_v)?)
+        RecoveryId::from_i32(standard_v).map_err(SignatureError::K256Error)
     }
 
     /// Copies and serializes `self` into a new `Vec` with the recovery id included
@@ -283,12 +292,13 @@ impl<'a> TryFrom<&'a [u8]> for Signature {
     }
 }
 
+#[cfg(feature = "std")]
 impl FromStr for Signature {
     type Err = SignatureError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let s = s.strip_prefix("0x").unwrap_or(s);
-        let bytes = hex::decode(s)?;
+        let bytes = hex::decode(s).map_err(SignatureError::DecodingError)?;
         Signature::try_from(&bytes[..])
     }
 }

scripts/setup.sh

@@ -6,6 +6,9 @@ rust_version=$(<rust-toolchain)
 # rustup
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $rust_version
 
+# cargo hack CLI
+cargo install cargo-hack
+
 sudo apt update
 
 # TODO: nodejs, npm, yarn