feat: Add arkworks wrapper for bls12-381

Cargo.toml

@@ -70,6 +70,7 @@ alloy-transport = { version = "0.12.4", default-features = false }
 
 # precompiles
 ark-bn254 = { version = "0.5", default-features = false }
+ark-bls12-381 = { version = "0.5", default-features = false }
 ark-ec = { version = "0.5", default-features = false }
 ark-ff = { version = "0.5", default-features = false }
 ark-serialize = { version = "0.5", default-features = false }

crates/optimism/src/evm.rs

@@ -283,7 +283,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "blst")]
     fn test_halted_tx_call_bls12_381_g1_add_out_of_gas() {
         let ctx = Context::op()
             .modify_tx_chained(|tx| {
@@ -311,7 +310,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "blst")]
     fn test_halted_tx_call_bls12_381_g1_add_input_wrong_size() {
         let ctx = Context::op()
             .modify_tx_chained(|tx| {
@@ -370,7 +368,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "blst")]
     fn test_halted_tx_call_bls12_381_g1_msm_input_wrong_size() {
         let ctx = g1_msm_test_tx().modify_tx_chained(|tx| tx.base.data = tx.base.data.slice(1..));
 
@@ -388,7 +385,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "blst")]
     fn test_halted_tx_call_bls12_381_g1_msm_out_of_gas() {
         let ctx = g1_msm_test_tx().modify_tx_chained(|tx| tx.base.gas_limit -= 1);
 
@@ -406,7 +402,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "blst")]
     fn test_halted_tx_call_bls12_381_g1_msm_wrong_input_layout() {
         let ctx = g1_msm_test_tx();
 
@@ -424,7 +419,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "blst")]
     fn test_halted_tx_call_bls12_381_g2_add_out_of_gas() {
         let ctx = Context::op()
             .modify_tx_chained(|tx| {
@@ -452,7 +446,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "blst")]
     fn test_halted_tx_call_bls12_381_g2_add_input_wrong_size() {
         let ctx = Context::op()
             .modify_tx_chained(|tx| {
@@ -512,7 +505,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "blst")]
     fn test_halted_tx_call_bls12_381_g2_msm_input_wrong_size() {
         let ctx = g2_msm_test_tx().modify_tx_chained(|tx| tx.base.data = tx.base.data.slice(1..));
 
@@ -530,7 +522,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "blst")]
     fn test_halted_tx_call_bls12_381_g2_msm_out_of_gas() {
         let ctx = g2_msm_test_tx().modify_tx_chained(|tx| tx.base.gas_limit -= 1);
 
@@ -548,7 +539,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "blst")]
     fn test_halted_tx_call_bls12_381_g2_msm_wrong_input_layout() {
         let ctx = g2_msm_test_tx();
 
@@ -596,7 +586,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "blst")]
     fn test_halted_tx_call_bls12_381_pairing_input_wrong_size() {
         let ctx = bl12_381_pairing_test_tx()
             .modify_tx_chained(|tx| tx.base.data = tx.base.data.slice(1..));
@@ -615,7 +604,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "blst")]
     fn test_halted_tx_call_bls12_381_pairing_out_of_gas() {
         let ctx = bl12_381_pairing_test_tx().modify_tx_chained(|tx| tx.base.gas_limit -= 1);
 
@@ -633,7 +621,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "blst")]
     fn test_tx_call_bls12_381_pairing_wrong_input_layout() {
         let ctx = bl12_381_pairing_test_tx();
 
@@ -678,7 +665,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "blst")]
     fn test_halted_tx_call_bls12_381_map_fp_to_g1_out_of_gas() {
         let ctx = fp_to_g1_test_tx().modify_tx_chained(|tx| tx.base.gas_limit -= 1);
 
@@ -696,7 +682,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "blst")]
     fn test_halted_tx_call_bls12_381_map_fp_to_g1_input_wrong_size() {
         let ctx = fp_to_g1_test_tx().modify_tx_chained(|tx| tx.base.data = tx.base.data.slice(1..));
 
@@ -741,7 +726,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "blst")]
     fn test_halted_tx_call_bls12_381_map_fp2_to_g2_out_of_gas() {
         let ctx = fp2_to_g2_test_tx().modify_tx_chained(|tx| tx.base.gas_limit -= 1);
 
@@ -759,7 +743,6 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "blst")]
     fn test_halted_tx_call_bls12_381_map_fp2_to_g2_input_wrong_size() {
         let ctx =
             fp2_to_g2_test_tx().modify_tx_chained(|tx| tx.base.data = tx.base.data.slice(1..));

crates/optimism/src/precompiles.rs

@@ -70,21 +70,9 @@ pub fn granite() -> &'static Precompiles {
 pub fn isthmus() -> &'static Precompiles {
     static INSTANCE: OnceBox<Precompiles> = OnceBox::new();
     INSTANCE.get_or_init(|| {
-        let precompiles = granite().clone();
+        let mut precompiles = granite().clone();
         // Prague bls12 precompiles
-        // Don't include BLS12-381 precompiles in no_std builds.
-        #[cfg(feature = "blst")]
-        let precompiles = {
-            let mut precompiles = precompiles;
-            precompiles.extend(precompile::bls12_381::precompiles());
-            precompiles
-        };
-        #[cfg(not(feature = "blst"))]
-        let precompiles = {
-            let mut precompiles = precompiles;
-            precompiles.extend(precompile::bls12_381_utils::bls12_381_precompiles_not_supported());
-            precompiles
-        };
+        precompiles.extend(precompile::bls12_381::precompiles());
         Box::new(precompiles)
     })
 }

crates/precompile/Cargo.toml

@@ -64,9 +64,12 @@ c-kzg = { workspace = true, optional = true, features = [
 # Optionally use `kzg-rs` for a pure Rust implementation of KZG point evaluation.
 kzg-rs = { workspace = true, optional = true }
 
-# BLS12-381 precompiles
+# Use the BLS12-381 implementation of blst for EIP2537
 blst = { workspace = true, optional = true }
 
+# Use the BLS12-381 implementation of arkworks for EIP2537
+ark-bls12-381 = { workspace = true, features = ["curve"] }
+
 # p256verify precompile
 p256 = { workspace = true, optional = true, features = ["ecdsa"] }
 
@@ -98,6 +101,7 @@ std = [
 	"serde/std",
 	"serde_json/std",
 	"ark-bn254/std",
+	"ark-bls12-381/std",
 	"ark-ec/std",
 	"ark-ff/std",
 	"ark-serialize/std",
@@ -125,7 +129,7 @@ portable = ["c-kzg?/portable", "blst?/portable"]
 secp256k1 = ["dep:secp256k1"]
 libsecp256k1 = ["dep:libsecp256k1"]
 
-# Enables the BLS12-381 precompiles.
+# Enables the blst implementation of the BLS12-381 precompile.
 blst = ["dep:blst"]
 
 # Enables the substrate implementation of eip1962

crates/precompile/src/bls12_381.rs

@@ -1,6 +1,14 @@
 use crate::PrecompileWithAddress;
 
-mod blst;
+cfg_if::cfg_if! {
+    if #[cfg(feature = "blst")]{
+        mod blst;
+        use blst as crypto_backend;
+    } else {
+        mod arkworks;
+        use arkworks as crypto_backend;
+    }
+}
 
 pub mod g1_add;
 pub mod g1_msm;