Eth2-to-Near-relay: minor improvements, tests improvements and fixes

eth2near/contract_wrapper/src/dao_eth_client_contract.rs

@@ -224,6 +224,7 @@ mod tests {
             finalized_beacon_header,
             current_sync_committee,
             next_sync_committee,
+            signer_account_id.clone()
         );
 
         let dao_contract_wrapper =

eth2near/contract_wrapper/src/errors.rs

@@ -11,4 +11,4 @@ impl Display for TryToSubmitZeroHeaderError {
     }
 }
 
-impl Error for TryToSubmitZeroHeaderError {}
+impl Error for TryToSubmitZeroHeaderError {}

eth2near/contract_wrapper/src/eth_client_contract.rs

@@ -35,6 +35,7 @@ impl EthClientContract {
         finalized_beacon_header: ExtendedBeaconBlockHeader,
         current_sync_committee: SyncCommittee,
         next_sync_committee: SyncCommittee,
+        trusted_signer: String,
     ) {
         #[derive(BorshSerialize)]
         pub struct InitInput {
@@ -60,7 +61,7 @@ impl EthClientContract {
             verify_bls_signatures: false,
             hashes_gc_threshold: 51000,
             max_submitted_blocks_by_account: 8000,
-            trusted_signer: Option::<AccountId>::None,
+            trusted_signer: Option::<AccountId>::Some(trusted_signer.parse().unwrap()),
         };
 
         self.contract_wrapper
@@ -76,6 +77,8 @@ impl EthClientContract {
     pub fn get_account_id(&self) -> AccountId {
         self.contract_wrapper.get_account_id()
     }
+
+    pub fn get_signature_account_id(&self) -> AccountId { self.contract_wrapper.get_signer_account_id() }
 }
 
 impl EthClientContractTrait for EthClientContract {
@@ -194,7 +197,7 @@ mod tests {
 
     // TODO: use a more clean approach to include binary
     const WASM_FILEPATH: &str =
-        "../../contracts/near/target/wasm32-unknown-unknown/release/eth2_client.wasm";
+        "../../contracts/near/res/eth2_client.wasm";
 
     struct EthState {
         pub execution_blocks: Vec<BlockHeader>,
@@ -259,7 +262,6 @@ mod tests {
 
         let worker = rt.block_on(workspaces::sandbox()).unwrap();
         let wasm = std::fs::read(WASM_FILEPATH).unwrap();
-        let contract = rt.block_on(worker.dev_deploy(&wasm)).unwrap();
 
         // create accounts
         let owner = worker.root_account().unwrap();
@@ -274,10 +276,12 @@ mod tests {
             .into_result()
             .unwrap();
 
+        let contract = rt.block_on(owner.deploy(&wasm)).unwrap().unwrap();
+
         (relay_account, contract)
     }
 
-    fn init_contract(eth_client_contract: &EthClientContract, eth_state: &mut EthState) {
+    fn init_contract(eth_client_contract: &EthClientContract, eth_state: &mut EthState, trusted_signer: String) {
         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";
@@ -319,6 +323,7 @@ mod tests {
             finalized_beacon_header,
             current_sync_committee,
             next_sync_committee,
+            trusted_signer,
         );
         eth_state.current_light_client_update = 1;
     }
@@ -336,7 +341,7 @@ mod tests {
 
         let mut eth_state = EthState::new();
 
-        init_contract(&eth_client_contract, &mut eth_state);
+        init_contract(&eth_client_contract, &mut eth_state, relay_account.id().to_string());
         let first_finalized_slot = eth_client_contract
             .get_finalized_beacon_block_slot()
             .unwrap();

eth2near/contract_wrapper/src/lib.rs

@@ -8,4 +8,4 @@ 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;

eth2near/eth2near-block-relay-rs/Cargo.toml

@@ -16,7 +16,7 @@ reqwest = { version = "0.11", features = ["blocking"] }
 eth-types = { path = "../../contracts/near/eth-types/", features = ["eip1559"]}
 contract_wrapper = { path = "../contract_wrapper" }
 clap = { version = "3.1.6", features = ["derive"] }
-tokio = { version = "0.2", features = ["macros", "rt-threaded", "time"] }
+tokio = { version = "1.1", features = ["macros", "rt", "time"] }
 env_logger = "0.9.0"
 borsh = "0.9.3"
 near-sdk = "4.0.0"

eth2near/eth2near-block-relay-rs/config_for_tests.toml

@@ -0,0 +1,23 @@
+beacon_endpoint = "https://lodestar-goerli.chainsafe.io"
+eth1_endpoint = "https://goerli.infura.io/v3/64aa9edc46d941c3b30882ad2eae4304"
+path_to_current_sync_committee = "./data/goerli_testdata/next_sync_committee_goerli_period_473.json"
+path_to_next_sync_committee = "./data/goerli_testdata/next_sync_committee_goerli_period_474.json"
+path_to_execution_blocks_headers = "./data/goerli_testdata/execution_block_headers_goerli_slots_3885697_3886176.json"
+path_to_light_client_updates = "./data/goerli_testdata/light_client_updates_goerli_slots_3885697_3886176.json"
+path_to_attested_state = "./data/goerli_testdata/beacon_state_goerli_slot_3885731.json"
+path_to_finality_state = "./data/goerli_testdata/beacon_state_goerli_slot_3885664.json"
+path_to_attested_state_for_period = "./data/goerli_testdata/beacon_state_goerli_slot_3887699.json"
+path_to_finality_state_for_period = "./data/goerli_testdata/beacon_state_goerli_slot_3887616.json"
+network_name = "goerli"
+first_slot = 3885632
+slot_without_block = 3885649
+right_bound_in_slot_search = 3885800
+left_empty_slot = 3885722
+right_empty_slot = 3885723
+slot_without_block_2 = 3885743
+wasm_filepath = "../../contracts/near/res/eth2_client.wasm"
+finalized_slot_before_new_period = 3891168
+eth1_number = 0x73cb47
+path_to_block = "./data/goerli_testdata/beacon_block_goerli_slot_3885632.json"
+path_to_header = "./data/goerli_testdata/beacon_header_goerli_slot_3885632.json"
+path_to_light_client_update = "./data/goerli_testdata/beacon_light_client_update_goerli_period_474.json"

eth2near/eth2near-block-relay-rs/data/goerli_testdata/.gitattributes

@@ -0,0 +1,4 @@
+beacon_state_goerli_slot_3887616.json filter=lfs diff=lfs merge=lfs -text
+beacon_state_goerli_slot_3887699.json filter=lfs diff=lfs merge=lfs -text
+beacon_state_goerli_slot_3885664.json filter=lfs diff=lfs merge=lfs -text
+beacon_state_goerli_slot_3885731.json filter=lfs diff=lfs merge=lfs -text

eth2near/eth2near-block-relay-rs/data/goerli_testdata/beacon_header_goerli_slot_3885632.json

@@ -0,0 +1 @@
+{"data":{"root":"0xa1600e330efcf934b23706365793966c4fed60d34dcdd897620810315b5abda8","canonical":true,"header":{"message":{"slot":"3885632","proposer_index":"121460","parent_root":"0x0cb13db52b63240d561b36495723229e0424fc72a25e74c02b61ae448a5f6347","state_root":"0xad73703cc94bfa83619e913bb7de2850ff08d613008a74a80df4e6977f23517c","body_root":"0x6b603cb237df9ebab0c7dc55d37ea99a2cfa381a49d220493df8f3cc3922905d"},"signature":"0x90aca2fff31ad0425a0f2a25bd92d948b5d34dfcddb15ea7fc3a7984708c70b28f531971d7b73fafd68d54ecb9e6275a0f7153c4e53c2a66b0a004338cf252e07d101e7807667bb456f38df5eff4a6b27cf1a1b51c70eb3af5297c484ad462be"}}}