chore: feature gate dcipher-agents (#39)

* chore(dcipher-agents): add feature gates

* chore: enable correct features for dsigner, blocklock-agent, and randomness-agent

* ci: use cargo hack to test each individual features

* chore: remove unnecessary solidity deps from dsigner, blocklock-agent, and randomness-agent dockerfiles

Author: azixus

.github/actions/rust-test-action/action.yml

@@ -19,7 +19,7 @@ runs:
     # Pull cargo nextest binaries
     - uses: taiki-e/install-action@v2
       with:
-        tool: nextest
+        tool: nextest,cargo-hack
 
     - name: Check formatting
       working-directory: ${{ inputs.working-directory }}
@@ -31,6 +31,11 @@ runs:
       run: cargo clippy --all-features --all-targets --target-dir ${{ inputs.target-folder }} -- -Dwarnings ${{ inputs.additional-flags }}
       shell: bash
 
+    - name: Check clippy (each features)
+      working-directory: ${{ inputs.working-directory }}
+      run: cargo hack clippy --each-feature --all-targets --target-dir ${{ inputs.target-folder }} -- -Dwarnings ${{ inputs.additional-flags }}
+      shell: bash
+
     - name: Run all tests
       working-directory: ${{ inputs.working-directory }}
       run: cargo nextest run --target-dir ${{ inputs.target-folder }} --no-tests warn

Cargo.lock

@@ -6,7 +6,7 @@ edition.workspace = true
 [dependencies]
 # blockchain
 alloy = { workspace = true, features = ["default", "provider-ws"] }
-dcipher-agents = { workspace = true }
+dcipher-agents = { workspace = true, features = ["blocklock"] }
 
 # async
 futures = { workspace = true }

blocklock-agent/Cargo.toml

@@ -18,15 +18,6 @@ RUN npm install
 COPY ./blocklock-solidity ./
 RUN FOUNDRY_PROFILE=build forge install --no-git && FOUNDRY_PROFILE=build forge build
 
-FROM sol_builder AS sol_randomness
-WORKDIR /app/randomness-solidity
-COPY ./randomness-solidity/package.json ./
-COPY ./randomness-solidity/package-lock.json ./
-RUN npm install
-
-COPY ./randomness-solidity ./
-RUN FOUNDRY_PROFILE=build forge install --no-git && FOUNDRY_PROFILE=build forge build
-
 # Base image for rust
 FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef
 WORKDIR /app
@@ -43,7 +34,6 @@ RUN cargo chef cook --release --recipe-path recipe.json
 
 # Build application
 COPY --from=sol_blocklock /app/blocklock-solidity/out ./blocklock-solidity/out
-COPY --from=sol_randomness /app/randomness-solidity/out ./randomness-solidity/out
 COPY . .
 RUN cargo build --release -p blocklock-agent --example blocklock
 

blocklock-agent/Dockerfile

@@ -4,13 +4,28 @@ version.workspace = true
 edition.workspace = true
 
 [features]
-rayon = ["dep:rayon"]
+# agents
+agents = ["evm"]
+blocklock = ["agents", "decryption_sender", "payment"]
+randomness = ["agents", "signature_sender", "payment"]
+payment = []
+
+# schemes
+decryption_sender = ["fulfiller", "ibe", "evm"]
+signature_sender = ["fulfiller", "evm"]
+ibe = []
+
+# misc
+evm = ["dep:alloy"]
+fulfiller = ["signer"]
+signer = ["dep:dcipher-signer", "dcipher-signer/libp2p"]
+rayon = ["dcipher-signer/rayon"]
 
 [dependencies]
 # workspace crates
-dcipher-signer.workspace = true
+dcipher-signer = { workspace = true, optional = true }
 
-alloy = { workspace = true, features = ["default", "provider-ws"] }
+alloy = { workspace = true, features = ["default", "provider-ws"], optional = true}
 
 # crypto
 ark-bn254 = { workspace = true }
@@ -32,18 +47,11 @@ tokio-util = { workspace = true }
 prometheus = { workspace = true }
 tracing = { workspace = true }
 
-# network
-libp2p = { workspace = true, features = ["tcp", "dns", "noise", "tokio", "ping", "yamux", "macros", "floodsub", "serde"] }
-
 # serde
 serde = { workspace = true, features = ["derive"] }
-serde_cbor = "0.10"
 
 # misc
-itertools = { workspace = true }
 thiserror = { workspace = true }
-lru = "0.14"
-rayon = { version = "1.10", optional = true }
 
 [dev-dependencies]
 hex = { workspace = true }

dcipher-agents/Cargo.toml

@@ -1,5 +1,56 @@
 //! Module for agent-specific code such as blocklock.
 
+use serde::{Deserialize, Serialize};
+
+#[cfg(feature = "blocklock")]
 pub mod blocklock;
-mod payment;
+
+#[cfg(feature = "randomness")]
 pub mod randomness;
+
+#[cfg(feature = "payment")]
+mod payment;
+
+#[derive(
+    Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, serde::Serialize, serde::Deserialize, Debug,
+)]
+pub struct RequestId(pub alloy::primitives::U256);
+
+#[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Serialize, Deserialize, Debug)]
+pub struct BlockNumber(pub u64);
+
+impl From<RequestId> for alloy::primitives::U256 {
+    fn from(value: RequestId) -> Self {
+        value.0
+    }
+}
+
+impl From<alloy::primitives::U256> for RequestId {
+    fn from(value: alloy::primitives::U256) -> Self {
+        Self(value)
+    }
+}
+
+impl AsRef<alloy::primitives::U256> for RequestId {
+    fn as_ref(&self) -> &alloy::primitives::U256 {
+        &self.0
+    }
+}
+
+impl From<u64> for BlockNumber {
+    fn from(number: u64) -> Self {
+        BlockNumber(number)
+    }
+}
+
+impl From<BlockNumber> for u64 {
+    fn from(number: BlockNumber) -> Self {
+        number.0
+    }
+}
+
+impl AsRef<u64> for BlockNumber {
+    fn as_ref(&self) -> &u64 {
+        &self.0
+    }
+}

dcipher-agents/src/agents.rs

@@ -1,8 +1,11 @@
 //! Module for the blocklock agent.
 
+use crate::agents::BlockNumber;
+use crate::decryption_sender::DecryptionRequest;
+use crate::ibe_helper::IbeIdentityOnBn254G1Ciphertext;
+use crate::ser::{EvmDeserialize, IbeIdentityOnBn254G1CiphertextError};
 use alloy::primitives::U256;
 use alloy::sol_types::SolValue;
-use serde::{Deserialize, Serialize};
 
 pub mod agent;
 mod condition_resolver;
@@ -16,9 +19,6 @@ pub enum BlocklockCondition {
     BlockNumber(BlockNumber),
 }
 
-#[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Serialize, Deserialize, Debug)]
-pub struct BlockNumber(pub u64);
-
 #[derive(thiserror::Error, Debug)]
 pub enum BlocklockConditionDecodeError {
     #[error("missing block number prefix")]
@@ -82,20 +82,18 @@ impl From<BlocklockCondition> for alloy::primitives::Bytes {
     }
 }
 
-impl From<u64> for BlockNumber {
-    fn from(number: u64) -> Self {
-        BlockNumber(number)
-    }
-}
+impl TryFrom<&DecryptionRequest> for IbeIdentityOnBn254G1Ciphertext {
+    type Error = IbeIdentityOnBn254G1CiphertextError;
 
-impl From<BlockNumber> for u64 {
-    fn from(number: BlockNumber) -> Self {
-        number.0
+    fn try_from(value: &DecryptionRequest) -> Result<Self, Self::Error> {
+        EvmDeserialize::deser(&value.ciphertext)
     }
 }
 
-impl AsRef<u64> for BlockNumber {
-    fn as_ref(&self) -> &u64 {
-        &self.0
+impl TryFrom<DecryptionRequest> for IbeIdentityOnBn254G1Ciphertext {
+    type Error = IbeIdentityOnBn254G1CiphertextError;
+
+    fn try_from(value: DecryptionRequest) -> Result<Self, Self::Error> {
+        EvmDeserialize::deser(&value.ciphertext)
     }
 }

dcipher-agents/src/agents/blocklock.rs

@@ -6,7 +6,7 @@ pub mod fulfiller;
 pub mod metrics;
 
 use crate::RequestId;
-use crate::agents::blocklock::BlockNumber;
+use crate::agents::BlockNumber;
 use crate::agents::randomness::metrics::Metrics;
 use crate::fulfiller::RequestChannel;
 use crate::signature_sender::SignatureRequest;

dcipher-agents/src/agents/randomness.rs

@@ -10,8 +10,7 @@ use crate::decryption_sender::contracts::DecryptionSender;
 use crate::fulfiller::RetryStrategy;
 use crate::fulfiller::ticker::TickerFulfiller;
 use crate::fulfiller::{Identifier, TransactionFulfiller};
-use crate::ibe_helper::{IbeIdentityOnBn254G1Ciphertext, PairingIbeCipherSuite};
-use crate::ser::{EvmDeserialize, IbeIdentityOnBn254G1CiphertextError};
+use crate::ibe_helper::PairingIbeCipherSuite;
 use crate::signer::AsynchronousSigner;
 use alloy::primitives::{Bytes, U256};
 use serde::{Deserialize, Serialize};
@@ -97,22 +96,6 @@ impl Identifier for SignedDecryptionRequest<'_> {
     }
 }
 
-impl TryFrom<&DecryptionRequest> for IbeIdentityOnBn254G1Ciphertext {
-    type Error = IbeIdentityOnBn254G1CiphertextError;
-
-    fn try_from(value: &DecryptionRequest) -> Result<Self, Self::Error> {
-        EvmDeserialize::deser(&value.ciphertext)
-    }
-}
-
-impl TryFrom<DecryptionRequest> for IbeIdentityOnBn254G1Ciphertext {
-    type Error = IbeIdentityOnBn254G1CiphertextError;
-
-    fn try_from(value: DecryptionRequest) -> Result<Self, Self::Error> {
-        EvmDeserialize::deser(&value.ciphertext)
-    }
-}
-
 impl From<DecryptionSender::DecryptionRequested> for DecryptionRequest {
     fn from(value: DecryptionSender::DecryptionRequested) -> Self {
         Self {

dcipher-agents/src/decryption_sender.rs

@@ -77,6 +77,7 @@ where
 }
 
 #[cfg(test)]
+#[cfg(feature = "blocklock")] // need blocklock types for ibe
 pub(crate) mod tests {
     use super::*;
     use crate::decryption_sender::DecryptionRequest;