chore: add kzg-rs feature to revm-interpreter

bluealloy · Jul 8, 2024 · 51a9fca · 51a9fca
1 parent ac5f264
commit 51a9fca
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/crates/interpreter/Cargo.toml b/crates/interpreter/Cargo.toml
@@ -81,3 +81,5 @@ optional_eip3607 = ["revm-primitives/optional_eip3607"]
 optional_gas_refund = ["revm-primitives/optional_gas_refund"]
 optional_no_base_fee = ["revm-primitives/optional_no_base_fee"]
 optional_beneficiary_reward = ["revm-primitives/optional_beneficiary_reward"]
+
+kzg-rs = ["revm-primitives/kzg-rs"]
diff --git a/crates/precompile/Cargo.toml b/crates/precompile/Cargo.toml
@@ -60,8 +60,8 @@ p256 = { version = "0.13.2", optional = true, default-features = false, features
     "ecdsa",
 ] }
 
-# Utility
-cfg-if = "1"
+# utils
+cfg-if = { version = "1.0", default-features = false }
 
 [dev-dependencies]
 criterion = "0.5"

diff --git a/crates/precompile/src/lib.rs b/crates/precompile/src/lib.rs
@@ -28,17 +28,16 @@ pub use fatal_precompile::fatal_precompile;
 #[cfg(feature = "kzg-rs")]
 // silence lint
 use kzg_rs as _;
-
-use core::hash::Hash;
-use once_cell::race::OnceBox;
-#[doc(hidden)]
-pub use revm_primitives as primitives;
-pub use revm_primitives::{
+pub use primitives::{
     precompile::{PrecompileError as Error, *},
     Address, Bytes, HashMap, HashSet, Log, B256,
 };
+#[doc(hidden)]
+pub use revm_primitives as primitives;
 
 use cfg_if::cfg_if;
+use core::hash::Hash;
+use once_cell::race::OnceBox;
 use std::{boxed::Box, vec::Vec};
 
 pub fn calc_linear_cost_u32(len: usize, base: u64, word: u64) -> u64 {

diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml
@@ -56,7 +56,7 @@ serde = { version = "1.0", default-features = false, features = [
 hex = { version = "0.4", default-features = false }
 
 [features]
-default = ["std", "kzg-rs"]
+default = ["std", "c-kzg", "portable"]
 std = [
     "serde?/std",
     "alloy-eips/std",

diff --git a/crates/primitives/src/kzg/env_settings.rs b/crates/primitives/src/kzg/env_settings.rs
@@ -2,15 +2,14 @@ use super::{
     trusted_setup_points::{G1_POINTS, G2_POINTS},
     KzgSettings,
 };
-use core::hash::Hash;
 use once_cell::race::OnceBox;
 use std::{boxed::Box, sync::Arc};
 
 cfg_if::cfg_if! {
     if #[cfg(feature = "c-kzg")] {
         /// KZG Settings that allow us to specify a custom trusted setup.
         /// or use hardcoded default settings.
-        #[derive(Debug, Clone, Default, PartialEq, Eq, Hash)]
+        #[derive(Debug, Clone, Default, PartialEq, Eq )]
         pub enum EnvKzgSettings {
             /// Default mainnet trusted setup
             #[default]

diff --git a/crates/revm/Cargo.toml b/crates/revm/Cargo.toml
@@ -126,6 +126,7 @@ optional_beneficiary_reward = ["revm-interpreter/optional_beneficiary_reward"]
 # See comments in `revm-precompile`
 secp256k1 = ["revm-precompile/secp256k1"]
 c-kzg = ["revm-precompile/c-kzg"]
+kzg-rs = ["revm-precompile/kzg-rs"]
 blst = ["revm-precompile/blst"]
 
 [[example]]