From 5699a8940159f09dc9e2d439459bc1d4944f9612 Mon Sep 17 00:00:00 2001 From: karim-en Date: Wed, 6 Dec 2023 19:24:50 +0000 Subject: [PATCH] Fix relayer build --- eth2near/contract_wrapper/src/eth_client_contract.rs | 7 +++---- eth2near/eth2near-block-relay-rs/rust-toolchain | 2 +- eth2near/eth_rpc_client/Cargo.toml | 1 - eth2near/rust-toolchain | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/eth2near/contract_wrapper/src/eth_client_contract.rs b/eth2near/contract_wrapper/src/eth_client_contract.rs index 927e0029..5aeca58e 100644 --- a/eth2near/contract_wrapper/src/eth_client_contract.rs +++ b/eth2near/contract_wrapper/src/eth_client_contract.rs @@ -1,13 +1,12 @@ use crate::contract_wrapper_trait::ContractWrapper; use crate::eth_client_contract_trait::EthClientContractTrait; use crate::eth_network::EthNetwork; -use borsh::BorshDeserialize; +use borsh::{self, BorshDeserialize, BorshSerialize}; use eth2_utility::types::ClientMode; use eth_types::eth2::{ ExtendedBeaconBlockHeader, LightClientState, LightClientUpdate, SyncCommittee, }; use eth_types::{BlockHeader, H256}; -use near_primitives::borsh::BorshSerialize; use near_primitives::types::AccountId; use near_primitives::views::FinalExecutionOutcomeView; use serde::Serialize; @@ -61,7 +60,7 @@ impl EthClientContract { pub validate_updates: bool, pub verify_bls_signatures: bool, pub hashes_gc_threshold: u64, - pub trusted_signer: Option, + pub trusted_signer: Option, } let init_input = InitInput { @@ -73,7 +72,7 @@ impl EthClientContract { validate_updates: validate_updates.unwrap_or(true), verify_bls_signatures: verify_bls_signatures.unwrap_or(false), hashes_gc_threshold: hashes_gc_threshold.unwrap_or(51_000), - trusted_signer, + trusted_signer: trusted_signer.map(|a| a.to_string()), }; println!( diff --git a/eth2near/eth2near-block-relay-rs/rust-toolchain b/eth2near/eth2near-block-relay-rs/rust-toolchain index 421bf0f8..f2415f83 100644 --- a/eth2near/eth2near-block-relay-rs/rust-toolchain +++ b/eth2near/eth2near-block-relay-rs/rust-toolchain @@ -1,2 +1,2 @@ [toolchain] -channel = "1.68.0" +channel = "1.69.0" diff --git a/eth2near/eth_rpc_client/Cargo.toml b/eth2near/eth_rpc_client/Cargo.toml index 795dbc08..83b6c7fe 100644 --- a/eth2near/eth_rpc_client/Cargo.toml +++ b/eth2near/eth_rpc_client/Cargo.toml @@ -33,5 +33,4 @@ bitvec = "1.0.0" prometheus = { version = "0.9", features = ["process"] } lazy_static = "1.4" warp = "0.2" -thread = "*" dotenv = "0.15.0" diff --git a/eth2near/rust-toolchain b/eth2near/rust-toolchain index 421bf0f8..f2415f83 100644 --- a/eth2near/rust-toolchain +++ b/eth2near/rust-toolchain @@ -1,2 +1,2 @@ [toolchain] -channel = "1.68.0" +channel = "1.69.0"