eth-types: make Eth2 dependencies optional (#786)

*  `eth-types`: make Eth2 dependencies optional.
* Update build files.

Co-authored-by: Kirill <[email protected]>

Author: karim-en

contracts/near/Cargo.lock

@@ -8,7 +8,7 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-eth-types =  { path = "../eth-types" }
+eth-types =  { path = "../eth-types", default-features = false }
 admin-controlled =  { path = "../admin-controlled" }
 near-sdk = "4.0.0"
 borsh = "0.9.3"

contracts/near/eth-client/Cargo.toml

@@ -9,7 +9,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 wee_alloc = { version = "0.4.5", default-features = false, features = [] }
-eth-types =  { path = "../eth-types" }
+eth-types =  { path = "../eth-types", default-features = false }
 admin-controlled =  { path = "../admin-controlled" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

contracts/near/eth-prover/Cargo.toml

@@ -15,16 +15,17 @@ rlp = "0.4.2"
 rlp-derive = "0.1.0"
 ethereum-types = "0.9.2"
 derive_more = "^0.99.2"
-eth2_ssz = { git = "https://github.com/aurora-is-near/lighthouse.git", rev = "b624c3f0d3c5bc9ea46faa14c9cb2d90ee1e1dec" }
-eth2_ssz_derive = { git = "https://github.com/aurora-is-near/lighthouse.git", rev = "b624c3f0d3c5bc9ea46faa14c9cb2d90ee1e1dec" }
-tree_hash = { git = "https://github.com/aurora-is-near/lighthouse.git", rev = "b624c3f0d3c5bc9ea46faa14c9cb2d90ee1e1dec" }
-tree_hash_derive = { git = "https://github.com/aurora-is-near/lighthouse.git", rev = "b624c3f0d3c5bc9ea46faa14c9cb2d90ee1e1dec" }
-eth2_serde_utils = { git = "https://github.com/aurora-is-near/lighthouse.git", rev = "b624c3f0d3c5bc9ea46faa14c9cb2d90ee1e1dec" }
+eth2_ssz = { git = "https://github.com/aurora-is-near/lighthouse.git", rev = "b624c3f0d3c5bc9ea46faa14c9cb2d90ee1e1dec", optional = true }
+eth2_ssz_derive = { git = "https://github.com/aurora-is-near/lighthouse.git", rev = "b624c3f0d3c5bc9ea46faa14c9cb2d90ee1e1dec", optional = true }
+tree_hash = { git = "https://github.com/aurora-is-near/lighthouse.git", rev = "b624c3f0d3c5bc9ea46faa14c9cb2d90ee1e1dec", optional = true }
+tree_hash_derive = { git = "https://github.com/aurora-is-near/lighthouse.git", rev = "b624c3f0d3c5bc9ea46faa14c9cb2d90ee1e1dec", optional = true }
+eth2_serde_utils = { git = "https://github.com/aurora-is-near/lighthouse.git", rev = "b624c3f0d3c5bc9ea46faa14c9cb2d90ee1e1dec", optional = true }
 hex = "0.4.0"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 serde-big-array = "0.4.1"
 
 [features]
-default = ["eip1559"]
+default = ["eip1559", "eth2"]
 eip1559 = []
+eth2 = ["dep:eth2_ssz", "dep:eth2_ssz_derive", "dep:tree_hash", "dep:tree_hash_derive", "dep:eth2_serde_utils"]

contracts/near/eth-types/Cargo.toml

@@ -11,8 +11,10 @@ use rlp_derive::RlpDecodable as RlpDecodableDerive;
 #[cfg(not(target_arch = "wasm32"))]
 use serde::{Deserialize, Serialize};
 use std::io::{Error, Write};
+#[cfg(feature = "eth2")]
 use tree_hash::{Hash256, TreeHash, TreeHashType};
 
+#[cfg(feature = "eth2")]
 pub mod eth2;
 #[macro_use]
 pub mod macros;
@@ -25,6 +27,7 @@ arr_ethereum_types_wrapper_impl_borsh_serde_ssz!(H512, 64);
 arr_ethereum_types_wrapper_impl_borsh_serde_ssz!(H520, 65);
 arr_ethereum_types_wrapper_impl_borsh_serde_ssz!(Bloom, 256);
 
+#[cfg(feature = "eth2")]
 impl TreeHash for H256 {
     fn tree_hash_type() -> TreeHashType {
         TreeHashType::Vector
@@ -129,24 +132,27 @@ pub struct BlockHeader {
     pub log_bloom: Bloom,
     pub difficulty: U256,
     #[cfg_attr(
-        not(target_arch = "wasm32"),
+        all(feature = "eth2", not(target_arch = "wasm32")),
         serde(with = "eth2_serde_utils::u64_hex_be")
     )]
     pub number: u64,
     pub gas_limit: U256,
     pub gas_used: U256,
     #[cfg_attr(
-        not(target_arch = "wasm32"),
+        all(feature = "eth2", not(target_arch = "wasm32")),
         serde(with = "eth2_serde_utils::u64_hex_be")
     )]
     pub timestamp: u64,
-    #[cfg_attr(not(target_arch = "wasm32"), serde(with = "eth2_serde_utils::hex_vec"))]
+    #[cfg_attr(
+        all(feature = "eth2", not(target_arch = "wasm32")),
+        serde(with = "eth2_serde_utils::hex_vec")
+    )]
     pub extra_data: Vec<u8>,
     pub mix_hash: H256,
     pub nonce: H64,
     #[cfg(feature = "eip1559")]
     #[cfg_attr(
-        not(target_arch = "wasm32"),
+        all(feature = "eth2", not(target_arch = "wasm32")),
         serde(with = "eth2_serde_utils::u64_hex_be")
     )]
     pub base_fee_per_gas: u64,

contracts/near/eth-types/src/lib.rs

@@ -1,3 +1,4 @@
+#[cfg(feature = "eth2")]
 #[macro_export]
 macro_rules! arr_wrapper_impl_tree_hash_and_borsh {
     ($name: ident, $len: expr) => {
@@ -89,6 +90,7 @@ macro_rules! arr_wrapper_impl_tree_hash_and_borsh {
     };
 }
 
+#[cfg(feature = "eth2")]
 #[macro_export]
 macro_rules! vec_wrapper_impl_tree_hash {
     ($name: ident) => {
@@ -199,6 +201,7 @@ macro_rules! arr_ethereum_types_wrapper_impl_borsh_serde_ssz {
             }
         }
 
+        #[cfg(feature = "eth2")]
         impl ssz::Decode for $name {
             fn is_ssz_fixed_len() -> bool {
                 true
@@ -220,6 +223,7 @@ macro_rules! arr_ethereum_types_wrapper_impl_borsh_serde_ssz {
             }
         }
 
+        #[cfg(feature = "eth2")]
         impl ssz::Encode for $name {
             fn is_ssz_fixed_len() -> bool {
                 true