Refactor: keyless eth rpc client

api/bin/chainflip-ingress-egress-tracker/src/main.rs

@@ -1,7 +1,7 @@
 use chainflip_engine::settings::{HttpBasicAuthEndpoint, WsHttpEndpoints};
 use futures::FutureExt;
 use jsonrpsee::{core::Error, server::ServerBuilder, RpcModule};
-use std::{env, io::Write, net::SocketAddr, path::PathBuf};
+use std::{env, net::SocketAddr};
 use tracing::log;
 use utilities::task_scope;
 
@@ -11,7 +11,6 @@ mod witnessing;
 pub struct DepositTrackerSettings {
 	eth_node: WsHttpEndpoints,
 	// The key shouldn't be necessary, but the current witnesser wants this
-	eth_key_path: PathBuf,
 	dot_node: WsHttpEndpoints,
 	state_chain_ws_endpoint: String,
 	btc: HttpBasicAuthEndpoint,
@@ -83,13 +82,6 @@ async fn start(
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-	// Temporary hack: we don't actually use eth key, but the current witnesser is
-	// expecting a path with a valid key, so we create a temporary dummy key file here:
-	let mut eth_key_temp_file = tempfile::NamedTempFile::new()?;
-	eth_key_temp_file
-		.write_all(b"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef")
-		.unwrap();
-
 	let settings = DepositTrackerSettings {
 		eth_node: WsHttpEndpoints {
 			ws_endpoint: env::var("ETH_WS_ENDPOINT")
@@ -99,7 +91,6 @@ async fn main() -> anyhow::Result<()> {
 				.unwrap_or("http://localhost:8545".to_string())
 				.into(),
 		},
-		eth_key_path: eth_key_temp_file.path().into(),
 		dot_node: WsHttpEndpoints {
 			ws_endpoint: env::var("DOT_WS_ENDPOINT")
 				.unwrap_or("ws://localhost:9947".to_string())

api/bin/chainflip-ingress-egress-tracker/src/witnessing/eth.rs

@@ -4,7 +4,7 @@ use cf_primitives::chains::assets::eth::Asset;
 use utilities::task_scope;
 
 use chainflip_engine::{
-	eth::{retry_rpc::EthersRetryRpcClient, rpc::EthRpcSigningClient},
+	eth::{retry_rpc::EthersRetryRpcClient, rpc::EthRpcClient},
 	settings::NodeContainer,
 	state_chain_observer::client::{StateChainClient, StateChainStreamApi},
 	witness::{
@@ -40,12 +40,7 @@ where
 	let eth_client = {
 		let nodes = NodeContainer { primary: settings.eth_node.clone(), backup: None };
 
-		EthersRetryRpcClient::<EthRpcSigningClient>::new(
-			scope,
-			settings.eth_key_path,
-			nodes,
-			env_params.eth_chain_id.into(),
-		)?
+		EthersRetryRpcClient::<EthRpcClient>::new(scope, nodes, env_params.eth_chain_id.into())?
 	};
 
 	let vaults = epoch_source.vaults().await;

engine/src/eth/retry_rpc/address_checker.rs

@@ -2,7 +2,7 @@ use ethers::prelude::*;
 
 use crate::eth::rpc::{
 	address_checker::{AddressCheckerRpcApi, *},
-	EthRpcSigningClient,
+	EthRpcApi,
 };
 
 use super::EthersRetryRpcClient;
@@ -27,7 +27,9 @@ pub trait AddressCheckerRetryRpcApi {
 }
 
 #[async_trait::async_trait]
-impl AddressCheckerRetryRpcApi for EthersRetryRpcClient<EthRpcSigningClient> {
+impl<Rpc: EthRpcApi + AddressCheckerRpcApi> AddressCheckerRetryRpcApi
+	for EthersRetryRpcClient<Rpc>
+{
 	async fn address_states(
 		&self,
 		block_hash: H256,

engine/src/eth/rpc/address_checker.rs

@@ -2,7 +2,7 @@ use ethers::prelude::*;
 
 use anyhow::{Ok, Result};
 
-use super::EthRpcSigningClient;
+use super::{EthRpcClient, EthRpcSigningClient};
 
 abigen!(AddressChecker, "$CF_ETH_CONTRACT_ABI_ROOT/$CF_ETH_CONTRACT_ABI_TAG/IAddressChecker.json");
 
@@ -24,14 +24,14 @@ pub trait AddressCheckerRpcApi {
 }
 
 #[async_trait::async_trait]
-impl AddressCheckerRpcApi for EthRpcSigningClient {
+impl AddressCheckerRpcApi for EthRpcClient {
 	async fn address_states(
 		&self,
 		block_hash: H256,
 		contract_address: H160,
 		addresses: Vec<H160>,
 	) -> Result<Vec<AddressState>> {
-		Ok(AddressChecker::new(contract_address, self.signer.inner().clone())
+		Ok(AddressChecker::new(contract_address, self.provider.clone())
 			.address_states(addresses)
 			.block(BlockId::Hash(block_hash))
 			.call()
@@ -44,10 +44,31 @@ impl AddressCheckerRpcApi for EthRpcSigningClient {
 		contract_address: H160,
 		addresses: Vec<H160>,
 	) -> Result<Vec<U256>> {
-		Ok(AddressChecker::new(contract_address, self.signer.inner().clone())
+		Ok(AddressChecker::new(contract_address, self.provider.clone())
 			.native_balances(addresses)
 			.block(BlockId::Hash(block_hash))
 			.call()
 			.await?)
 	}
 }
+
+#[async_trait::async_trait]
+impl AddressCheckerRpcApi for EthRpcSigningClient {
+	async fn address_states(
+		&self,
+		block_hash: H256,
+		contract_address: H160,
+		addresses: Vec<H160>,
+	) -> Result<Vec<AddressState>> {
+		self.rpc_client.address_states(block_hash, contract_address, addresses).await
+	}
+
+	async fn balances(
+		&self,
+		block_hash: H256,
+		contract_address: H160,
+		addresses: Vec<H160>,
+	) -> Result<Vec<U256>> {
+		self.rpc_client.balances(block_hash, contract_address, addresses).await
+	}
+}

engine/src/witness/eth/ethereum_deposits.rs

@@ -228,7 +228,7 @@ mod tests {
 	use crate::{
 		eth::{
 			retry_rpc::{EthersRetryRpcApi, EthersRetryRpcClient},
-			rpc::EthRpcSigningClient,
+			rpc::EthRpcClient,
 		},
 		settings::Settings,
 		witness::common::chain_source::Header,
@@ -307,7 +307,7 @@ mod tests {
 		);
 	}
 
-	#[ignore = "requries connection to a node"]
+	#[ignore = "requires connection to a node"]
 	#[tokio::test]
 	async fn test_get_ingress_contract() {
 		task_scope::task_scope(|scope| {
@@ -318,9 +318,8 @@ mod tests {
 					"e7f1725E7734CE288F8367e1Bb143E90bb3F0512".parse::<Address>().unwrap();
 
 				let settings = Settings::new_test().unwrap();
-				let client = EthersRetryRpcClient::<EthRpcSigningClient>::new(
+				let client = EthersRetryRpcClient::<EthRpcClient>::new(
 					scope,
-					settings.eth.private_key_file,
 					settings.eth.nodes,
 					U256::from(1337u64),
 				)

engine/src/witness/eth/key_manager.rs

@@ -186,8 +186,8 @@ mod tests {
 	use super::super::eth_source::EthSource;
 
 	use crate::{
-		eth::{retry_rpc::EthersRetryRpcClient, rpc::EthRpcSigningClient},
-		settings::{self, NodeContainer, WsHttpEndpoints},
+		eth::{retry_rpc::EthersRetryRpcClient, rpc::EthRpcClient},
+		settings::{NodeContainer, WsHttpEndpoints},
 		state_chain_observer::client::StateChainClient,
 		witness::common::{chain_source::extension::ChainSourceExt, epoch_source::EpochSource},
 	};
@@ -197,21 +197,15 @@ mod tests {
 	async fn test_key_manager_witnesser() {
 		task_scope(|scope| {
 			async {
-				let eth_settings = settings::Eth {
-					nodes: NodeContainer {
+				let retry_client = EthersRetryRpcClient::<EthRpcClient>::new(
+					scope,
+					NodeContainer {
 						primary: WsHttpEndpoints {
 							ws_endpoint: "ws://localhost:8546".into(),
 							http_endpoint: "http://localhost:8545".into(),
 						},
 						backup: None,
 					},
-					private_key_file: PathBuf::from_str("/some/key/file").unwrap(),
-				};
-
-				let retry_client = EthersRetryRpcClient::<EthRpcSigningClient>::new(
-					scope,
-					eth_settings.private_key_file,
-					eth_settings.nodes,
 					U256::from(1337u64),
 				)
 				.unwrap();