Eth2Near-relay: split relay on a few crates, many improvements

.github/workflows/contracts-near.yml

@@ -58,6 +58,18 @@ jobs:
               ./test.sh
             timeout-minutes: 20
 
+          - job-name: test eth2near/eth2-contract-init
+            cmd: |
+              cd eth2near/eth2-contract-init
+              ./test.sh
+            timeout-minutes: 20
+
+          - job-name: test eth2near/eth_rpc_client
+            cmd: |
+              cd eth2near/eth_rpc_client
+              ./test.sh
+            timeout-minutes: 20
+
     name: ${{ matrix.job-name }}
     steps:
       - name: Clone the repository

eth2near/contract_wrapper/src/dao_eth_client_contract.rs

@@ -127,9 +127,7 @@ impl EthClientContractTrait for DaoEthClientContract {
 mod tests {
     use crate::eth_client_contract_trait::EthClientContractTrait;
     use crate::near_contract_wrapper::NearContractWrapper;
-    use crate::{
-        dao_contract, dao_eth_client_contract, eth_client_contract, near_contract_wrapper, utils,
-    };
+    use crate::{dao_contract, dao_eth_client_contract, eth_client_contract, eth_network_enum, near_contract_wrapper, utils};
     use eth_types::eth2::{ExtendedBeaconBlockHeader, LightClientUpdate, SyncCommittee};
     use eth_types::BlockHeader;
     use std::path::PathBuf;
@@ -173,8 +171,6 @@ mod tests {
         const CONTRACT_ACCOUNT_ID: &str = "dev-1660212590113-35162107482173";
         const DAO_CONTRACT_ACCOUNT_ID: &str = "eth2-test.sputnikv2.testnet";
 
-        const NETWORK: &str = "kiln";
-
         let near_contract_wrapper = Box::new(NearContractWrapper::new_with_raw_secret_key(
             NEAR_ENDPOINT,
             &signer_account_id,
@@ -225,11 +221,13 @@ mod tests {
         }
 
         eth_client.init_contract(
-            NETWORK.to_string(),
+            eth_network_enum::EthNetwork::Kiln,
             finalized_execution_header.unwrap(),
             finalized_beacon_header,
             current_sync_committee,
             next_sync_committee,
+            true,
+            false,
             None,
             None,
             Some(eth_client.contract_wrapper.get_signer_account_id()),

eth2near/contract_wrapper/src/eth_client_contract.rs

@@ -14,6 +14,7 @@ use std::error::Error;
 use std::option::Option;
 use std::string::String;
 use std::vec::Vec;
+use crate::eth_network_enum::EthNetwork;
 use serde::Serialize;
 
 /// Implementation for interaction with Ethereum Light Client Contract on NEAR.
@@ -47,11 +48,13 @@ impl EthClientContract {
     /// * `trusted_signer` - the account address of the trusted signer which is allowed to submit light client updates.
     pub fn init_contract(
         &self,
-        network: String,
+        network: EthNetwork,
         finalized_execution_header: BlockHeader,
         finalized_beacon_header: ExtendedBeaconBlockHeader,
         current_sync_committee: SyncCommittee,
         next_sync_committee: SyncCommittee,
+        validate_updates: bool,
+        verify_bls_signatures: bool,
         hashes_gc_threshold: Option<u64>,
         max_submitted_blocks_by_account: Option<u32>,
         trusted_signer: Option<AccountId>,
@@ -71,13 +74,13 @@ impl EthClientContract {
         }
 
         let init_input = InitInput {
-            network,
+            network: network.to_string(),
             finalized_execution_header,
             finalized_beacon_header,
             current_sync_committee,
             next_sync_committee,
-            validate_updates: true,
-            verify_bls_signatures: false,
+            validate_updates,
+            verify_bls_signatures,
             hashes_gc_threshold: hashes_gc_threshold.unwrap_or(51_000),
             max_submitted_blocks_by_account: max_submitted_blocks_by_account.unwrap_or(8000),
             trusted_signer,
@@ -103,7 +106,9 @@ impl EthClientContract {
         self.contract_wrapper.get_account_id()
     }
 
-    pub fn get_signature_account_id(&self) -> AccountId { self.contract_wrapper.get_signer_account_id() }
+    pub fn get_signer_account_id(&self) -> AccountId {
+        self.contract_wrapper.get_signer_account_id()
+    }
 }
 
 impl EthClientContractTrait for EthClientContract {
@@ -311,7 +316,6 @@ mod tests {
         const PATH_TO_CURRENT_SYNC_COMMITTEE: &str =
             "./data/next_sync_committee_kiln_period_133.json";
         const PATH_TO_NEXT_SYNC_COMMITTEE: &str = "./data/next_sync_committee_kiln_period_134.json";
-        const NETWORK: &str = "kiln";
 
         let current_sync_committee: SyncCommittee = serde_json::from_str(
             &std::fs::read_to_string(PATH_TO_CURRENT_SYNC_COMMITTEE).expect("Unable to read file"),
@@ -344,11 +348,13 @@ mod tests {
         }
 
         eth_client_contract.init_contract(
-            NETWORK.to_string(),
+            eth_client_contract::EthNetwork::Kiln,
             finalized_execution_header.unwrap(),
             finalized_beacon_header,
             current_sync_committee,
             next_sync_committee,
+            true,
+            false,
             None,
             None,
             Option::<AccountId>::Some(trusted_signer.parse().unwrap()),

eth2near/contract_wrapper/src/eth_network_enum.rs

@@ -0,0 +1,63 @@
+use std::error::Error;
+use std::fmt;
+use std::fmt::{Display, Formatter};
+use std::str::FromStr;
+use serde::Deserialize;
+
+#[derive(Debug, Clone, Deserialize)]
+pub enum EthNetwork {
+    Mainnet,
+    Kiln,
+    Ropsten,
+    Goerli,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct IncorrectEthNetwork;
+
+impl Display for IncorrectEthNetwork {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "Unknown Eth network. Possible Eth network: 'Mainnet', 'Kiln', 'Goerli', 'Ropsten'"
+        )
+    }
+}
+
+impl Error for IncorrectEthNetwork {}
+
+impl Display for EthNetwork {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match self {
+            EthNetwork::Mainnet => write!(f, "mainnet"),
+            EthNetwork::Kiln => write!(f, "kiln"),
+            EthNetwork::Goerli => write!(f, "goerli"),
+            EthNetwork::Ropsten => write!(f, "ropsten")
+        }
+    }
+}
+
+impl EthNetwork {
+    pub fn as_str(&self) -> &str {
+        match self {
+            EthNetwork::Mainnet => "mainnet",
+            EthNetwork::Kiln => "kiln",
+            EthNetwork::Goerli => "goerli",
+            EthNetwork::Ropsten => "ropsten"
+        }
+    }
+}
+
+impl FromStr for EthNetwork {
+    type Err = IncorrectEthNetwork;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "Mainnet" | "mainnet" => Ok(EthNetwork::Mainnet),
+            "Kiln" | "kiln" => Ok(EthNetwork::Kiln),
+            "Goerli" | "goerli" => Ok(EthNetwork::Goerli),
+            "Ropsten" | "ropsten" => Ok(EthNetwork::Ropsten),
+            _ => Err(IncorrectEthNetwork),
+        }
+    }
+}

eth2near/contract_wrapper/src/lib.rs

@@ -8,4 +8,7 @@ pub mod eth_client_contract_trait;
 pub mod file_eth_client_contract;
 pub mod near_contract_wrapper;
 pub mod sandbox_contract_wrapper;
-pub mod utils;
+pub mod utils;
+pub mod eth_network_enum;
+pub mod near_network_enum;
+pub mod near_rpc_client;

eth2near/contract_wrapper/src/near_network_enum.rs

@@ -0,0 +1,55 @@
+use std::error::Error;
+use std::fmt;
+use std::fmt::{Display, Formatter};
+use std::str::FromStr;
+use serde::Deserialize;
+
+#[derive(Debug, Clone, Deserialize)]
+pub enum NearNetwork {
+    Mainnet,
+    Testnet,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct IncorrectNearNetwork;
+
+impl Display for IncorrectNearNetwork {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "Unknown near network id. Possible near networks: 'Mainnet', 'Testnet'"
+        )
+    }
+}
+
+impl Error for IncorrectNearNetwork {}
+
+impl Display for NearNetwork {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match self {
+            NearNetwork::Mainnet => write!(f, "mainnet"),
+            NearNetwork::Testnet => write!(f, "testnet"),
+        }
+    }
+}
+
+impl NearNetwork {
+    pub fn as_str(&self) -> &str {
+        match self {
+            NearNetwork::Mainnet => "mainnet",
+            NearNetwork::Testnet => "testnet",
+        }
+    }
+}
+
+impl FromStr for NearNetwork {
+    type Err = IncorrectNearNetwork;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "Mainnet" | "mainnet" => Ok(NearNetwork::Mainnet),
+            "Testnet" | "testnet" => Ok(NearNetwork::Testnet),
+            _ => Err(IncorrectNearNetwork),
+        }
+    }
+}