Replace H160 in config and cli options of relayer by Bytes20

CHANGELOG.md

@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 - [2119](https://github.com/FuelLabs/fuel-core/pull/2119): GraphQL query fields for retrieving information about upgrades.
+- [2116](https://github.com/FuelLabs/fuel-core/pull/2116): Replace `H160` in config and cli options of relayer by `Bytes20` of `fuel-types`
 
 ## [Version 0.34.0]
 

bin/fuel-core/src/cli/run/relayer.rs

@@ -4,13 +4,10 @@ use clap::{
 };
 use core::time::Duration;
 use fuel_core::{
-    relayer::{
-        Config,
-        H160,
-    },
+    relayer::Config,
     types::blockchain::primitives::DaBlockHeight,
 };
-use std::str::FromStr;
+use fuel_core_types::fuel_types::Bytes20;
 
 #[derive(Debug, Clone, Args)]
 pub struct RelayerArgs {
@@ -28,8 +25,8 @@ pub struct RelayerArgs {
     pub relayer: Option<Vec<url::Url>>,
 
     /// Ethereum contract address. Create EthAddress into fuel_types
-    #[arg(long = "relayer-v2-listening-contracts", value_parser = parse_h160, value_delimiter = ',', env)]
-    pub eth_v2_listening_contracts: Vec<H160>,
+    #[arg(long = "relayer-v2-listening-contracts", value_delimiter = ',', env)]
+    pub eth_v2_listening_contracts: Vec<Bytes20>,
 
     /// Number of da block that the contract is deployed at.
     #[clap(long = "relayer-da-deploy-height", default_value_t = Config::DEFAULT_DA_DEPLOY_HEIGHT, env)]
@@ -53,10 +50,6 @@ pub struct RelayerArgs {
     pub syncing_log_frequency_secs: u64,
 }
 
-pub fn parse_h160(input: &str) -> Result<H160, <H160 as FromStr>::Err> {
-    H160::from_str(input)
-}
-
 impl RelayerArgs {
     pub fn into_config(self) -> Option<Config> {
         if !self.enable_relayer {

crates/services/relayer/Cargo.toml

@@ -14,6 +14,7 @@ anyhow = { workspace = true }
 async-trait = { workspace = true }
 bytes = { version = "1.1", optional = true }
 enum-iterator = { workspace = true }
+ethereum-types = "0.14.1"
 ethers-contract = { version = "2", default-features = false, features = [
   "abigen",
 ] }

crates/services/relayer/src/config.rs

@@ -1,9 +1,9 @@
 use ethers_contract::EthEvent;
-use ethers_core::types::{
-    H160,
-    H256,
+use ethers_core::types::H256;
+use fuel_core_types::{
+    blockchain::primitives::DaBlockHeight,
+    fuel_types::Bytes20,
 };
-use fuel_core_types::blockchain::primitives::DaBlockHeight;
 use once_cell::sync::Lazy;
 use std::{
     str::FromStr,
@@ -26,7 +26,7 @@ pub struct Config {
     pub relayer: Option<Vec<url::Url>>,
     // TODO: Create `EthAddress` into `fuel_core_types`.
     /// Ethereum contract address.
-    pub eth_v2_listening_contracts: Vec<H160>,
+    pub eth_v2_listening_contracts: Vec<Bytes20>,
     /// Number of pages or blocks containing logs that
     /// should be downloaded in a single call to the da layer
     pub log_page_size: u64,
@@ -58,7 +58,7 @@ impl Default for Config {
         Self {
             da_deploy_height: DaBlockHeight::from(Self::DEFAULT_DA_DEPLOY_HEIGHT),
             relayer: None,
-            eth_v2_listening_contracts: vec![H160::from_str(
+            eth_v2_listening_contracts: vec![Bytes20::from_str(
                 "0x03E4538018285e1c03CCce2F92C9538c87606911",
             )
             .unwrap()],
@@ -70,3 +70,21 @@ impl Default for Config {
         }
     }
 }
+
+mod tests {
+
+    #[test]
+    fn conversion_str_h160_bytes() {
+        use std::str::FromStr;
+
+        let bytes20 = fuel_core_types::fuel_types::Bytes20::from_str(
+            "0x03E4538018285e1c03CCce2F92C9538c87606911",
+        )
+        .unwrap();
+        let h160 = ethers_core::types::H160::from_str(
+            "0x03E4538018285e1c03CCce2F92C9538c87606911",
+        )
+        .unwrap();
+        assert_eq!(bytes20.as_slice(), h160.as_bytes());
+    }
+}

crates/services/relayer/src/service.rs

@@ -13,7 +13,6 @@ use ethers_core::types::{
     Log,
     SyncingStatus,
     ValueOrArray,
-    H160,
 };
 use ethers_providers::{
     Http,

crates/services/relayer/src/service/get_logs.rs

@@ -1,6 +1,7 @@
 use super::*;
 use fuel_core_types::{
     entities::RelayedTransaction,
+    fuel_types::Bytes20,
     services::relayer::Event,
 };
 use futures::TryStreamExt;
@@ -18,7 +19,7 @@ pub struct DownloadedLogs {
 /// Download the logs from the DA layer.
 pub(crate) fn download_logs<'a, P>(
     eth_sync_gap: &state::EthSyncGap,
-    contracts: Vec<H160>,
+    contracts: Vec<Bytes20>,
     eth_node: &'a P,
     page_size: u64,
 ) -> impl futures::Stream<Item = Result<DownloadedLogs, ProviderError>> + 'a
@@ -29,7 +30,10 @@ where
     futures::stream::try_unfold(
         eth_sync_gap.page(page_size),
         move |page: Option<state::EthSyncPage>| {
-            let contracts = contracts.clone();
+            let contracts = contracts
+                .iter()
+                .map(|c| ethereum_types::Address::from_slice(c.as_slice()))
+                .collect();
             async move {
                 match page {
                     None => Ok(None),

crates/services/relayer/src/service/get_logs/test.rs

@@ -50,7 +50,9 @@ fn message(nonce: u64, block_number: u64, contract_address: u32, index: u64) ->
         ..Default::default()
     };
     let mut log = message.into_log();
-    log.address = u32_to_contract(contract_address);
+    log.address = crate::test_helpers::convert_to_address(
+        u32_to_contract(contract_address).as_slice(),
+    );
     log.block_number = Some(block_number.into());
     log.log_index = Some(index.into());
     log
@@ -76,17 +78,19 @@ fn transaction(nonce: u64, block_number: u64, contract_address: u32, index: u64)
         ..Default::default()
     };
     let mut log = transaction.into_log();
-    log.address = u32_to_contract(contract_address);
+    log.address = crate::test_helpers::convert_to_address(
+        u32_to_contract(contract_address).as_slice(),
+    );
     log.block_number = Some(block_number.into());
     log.log_index = Some(index.into());
     log
 }
 
-fn contracts(c: &[u32]) -> Vec<H160> {
+fn contracts(c: &[u32]) -> Vec<Bytes20> {
     c.iter().copied().map(u32_to_contract).collect()
 }
 
-fn u32_to_contract(n: u32) -> H160 {
+fn u32_to_contract(n: u32) -> Bytes20 {
     let address: [u8; 20] = n
         .to_ne_bytes()
         .into_iter()
@@ -101,7 +105,7 @@ fn u32_to_contract(n: u32) -> H160 {
 #[derive(Clone, Debug)]
 struct Input {
     eth_gap: RangeInclusive<u64>,
-    c: Vec<H160>,
+    c: Vec<Bytes20>,
     m: Vec<Log>,
 }
 #[derive(Clone, Debug, PartialEq, Eq)]

crates/services/relayer/src/test_helpers.rs

@@ -151,3 +151,7 @@ fn log_default(address: H160, eth_block: u64, topics: Vec<H256>, data: Bytes) ->
         removed: Some(false),
     }
 }
+
+pub fn convert_to_address(bytes: &[u8]) -> ethereum_types::Address {
+    ethereum_types::Address::from_slice(bytes)
+}

crates/services/relayer/tests/integration.rs

@@ -284,7 +284,9 @@ impl TestContext {
     }
 
     fn given_logs(&mut self, mut logs: Vec<Log>) {
-        let contract_address = self.config.eth_v2_listening_contracts[0];
+        let contract_address = fuel_core_relayer::test_helpers::convert_to_address(
+            self.config.eth_v2_listening_contracts[0].as_slice(),
+        );
         for log in &mut logs {
             log.address = contract_address;
         }

tests/tests/relayer.rs

@@ -28,13 +28,10 @@ use fuel_core_client::client::{
     FuelClient,
 };
 use fuel_core_poa::service::Mode;
-use fuel_core_relayer::{
-    test_helpers::{
-        middleware::MockMiddleware,
-        EvtToLog,
-        LogTestHelper,
-    },
-    H160,
+use fuel_core_relayer::test_helpers::{
+    middleware::MockMiddleware,
+    EvtToLog,
+    LogTestHelper,
 };
 use fuel_core_storage::{
     tables::Messages,
@@ -51,6 +48,7 @@ use fuel_core_types::{
         Nonce,
     },
 };
+use fuel_types::Bytes20;
 use hyper::{
     service::{
         make_service_fn,
@@ -368,7 +366,7 @@ async fn can_restart_node_with_relayer_data() {
 fn make_message_event(
     nonce: Nonce,
     block_number: u64,
-    contract_address: H160,
+    contract_address: Bytes20,
     sender: Option<[u8; 32]>,
     recipient: Option<[u8; 32]>,
     amount: Option<u64>,
@@ -383,7 +381,8 @@ fn make_message_event(
         data: data.map(Into::into).unwrap_or_default(),
     };
     let mut log = message.into_log();
-    log.address = contract_address;
+    log.address =
+        fuel_core_relayer::test_helpers::convert_to_address(contract_address.as_slice());
     log.block_number = Some(block_number.into());
     log.log_index = Some(log_index.into());
     log