feat: mock cctp relayer (#299)

Author: bekauz

e2e/examples/eth_vault/neutron.rs

@@ -21,8 +21,8 @@ use valence_chain_client_utils::neutron::NeutronClient;
 use valence_e2e::{
     async_run,
     utils::{
-        parse::get_grpc_address_and_port_from_logs, ADMIN_MNEMONIC, ASTROPORT_PATH, GAS_FLAGS,
-        LOCAL_CODE_ID_CACHE_PATH_NEUTRON,
+        parse::{get_chain_field_from_local_ic_log, get_grpc_address_and_port_from_url},
+        ADMIN_MNEMONIC, ASTROPORT_PATH, GAS_FLAGS, LOCAL_CODE_ID_CACHE_PATH_NEUTRON,
     },
 };
 
@@ -276,7 +276,9 @@ pub fn setup_astroport_cl_pool(
 }
 
 pub fn get_neutron_client(rt: &Runtime) -> Result<NeutronClient, Box<dyn Error>> {
-    let (grpc_url, grpc_port) = get_grpc_address_and_port_from_logs(NEUTRON_CHAIN_ID)?;
+    let grpc_addr = get_chain_field_from_local_ic_log(NEUTRON_CHAIN_ID, "grpc_address")?;
+    let (grpc_url, grpc_port) = get_grpc_address_and_port_from_url(&grpc_addr)?;
+
     let neutron_client = async_run!(
         rt,
         NeutronClient::new(

e2e/examples/eth_vault/noble.rs

@@ -6,13 +6,14 @@ use valence_chain_client_utils::{cosmos::base_client::BaseClient, noble::NobleCl
 use valence_e2e::{
     async_run,
     utils::{
-        parse::get_grpc_address_and_port_from_logs, ADMIN_MNEMONIC, NOBLE_CHAIN_ADMIN_ADDR,
-        NOBLE_CHAIN_DENOM, NOBLE_CHAIN_ID, UUSDC_DENOM,
+        parse::{get_chain_field_from_local_ic_log, get_grpc_address_and_port_from_url},
+        ADMIN_MNEMONIC, NOBLE_CHAIN_ADMIN_ADDR, NOBLE_CHAIN_DENOM, NOBLE_CHAIN_ID, UUSDC_DENOM,
     },
 };
 
 pub fn get_client(rt: &Runtime) -> Result<NobleClient, Box<dyn Error>> {
-    let (grpc_url, grpc_port) = get_grpc_address_and_port_from_logs(NOBLE_CHAIN_ID)?;
+    let grpc_addr = get_chain_field_from_local_ic_log(NOBLE_CHAIN_ID, "grpc_address")?;
+    let (grpc_url, grpc_port) = get_grpc_address_and_port_from_url(&grpc_addr)?;
 
     let noble_client = async_run!(
         rt,

e2e/examples/eth_vault/program.rs

@@ -123,7 +123,7 @@ pub fn setup_neutron_libraries(
     processor: &str,
     amount: u128,
     usdc_on_neutron: &str,
-    eth_admin_addr: String,
+    eth_withdraw_acc: String,
 ) -> Result<NeutronProgramLibraries, Box<dyn Error>> {
     let astro_cl_pool_asset_data = AssetData {
         asset1: NEUTRON_CHAIN_DENOM.to_string(),
@@ -172,7 +172,7 @@ pub fn setup_neutron_libraries(
             .noble_outbound_ica
             .library_account
             .clone(),
-        eth_admin_addr,
+        eth_withdraw_acc,
         processor.to_string(),
         amount,
     )?;

e2e/examples/eth_vault/vault.rs

@@ -29,6 +29,7 @@ use valence_e2e::{
             ICA_CCTP_TRANSFER_NAME, ICA_IBC_TRANSFER_NAME, INTERCHAIN_ACCOUNT_NAME,
             NEUTRON_IBC_TRANSFER_NAME,
         },
+        mock_cctp_relayer,
         solidity_contracts::ValenceVault,
         vault::{self, setup_cctp_transfer, setup_valence_vault},
         DEFAULT_ANVIL_RPC_ENDPOINT, LOCAL_CODE_ID_CACHE_PATH_NEUTRON, LOGS_FILE_PATH,
@@ -59,6 +60,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     async_run!(rt, ethereum_utils::set_up_anvil_container().await)?;
 
     let eth = EthClient::new(DEFAULT_ANVIL_RPC_ENDPOINT)?;
+
     let eth_client = valence_chain_client_utils::ethereum::EthereumClient::new(
         DEFAULT_ANVIL_RPC_ENDPOINT,
         "test test test test test test test test test test test junk",
@@ -70,6 +72,15 @@ fn main() -> Result<(), Box<dyn Error>> {
     let eth_admin_acc = eth_accounts[0];
     let _eth_user_acc = eth_accounts[2];
 
+    // create two Valence Base Accounts on Ethereum to test the processor with libraries (in this case the forwarder)
+    let deposit_acc_addr =
+        ethereum_utils::valence_account::setup_valence_account(&rt, &eth_client, eth_admin_acc)?;
+    let withdraw_acc_addr =
+        ethereum_utils::valence_account::setup_valence_account(&rt, &eth_client, eth_admin_acc)?;
+    // set up the cctp messenger
+    let mock_cctp_messenger_address =
+        valence_e2e::utils::vault::setup_mock_token_messenger(&rt, &eth_client)?;
+
     info!("Setting up Neutron side flow...");
 
     let mut test_ctx = TestContextBuilder::default()
@@ -178,7 +189,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         &neutron_processor_address,
         amount_to_transfer,
         &uusdc_on_neutron_denom,
-        eth_admin_acc.to_string(),
+        withdraw_acc_addr.to_string(),
     )?;
 
     noble::mint_usdc_to_addr(
@@ -225,6 +236,21 @@ fn main() -> Result<(), Box<dyn Error>> {
         &pool_addr,
     )?;
 
+    let usdc_token_address =
+        ethereum_utils::mock_erc20::setup_deposit_erc20(&rt, &eth_client, "MockUSDC", "USDC")?;
+
+    info!("Starting CCTP mock relayer between Noble and Ethereum...");
+    let mock_cctp_relayer = mock_cctp_relayer::MockCctpRelayer::new(
+        &rt,
+        mock_cctp_messenger_address,
+        usdc_token_address,
+    )?;
+    let rly_rt = tokio::runtime::Runtime::new().unwrap();
+
+    let _join_handle = rly_rt.spawn(mock_cctp_relayer.start());
+    info!("main sleep for 3...");
+    sleep(Duration::from_secs(3));
+
     strategist::route_usdc_to_noble(
         &rt,
         &neutron_client,
@@ -233,8 +259,6 @@ fn main() -> Result<(), Box<dyn Error>> {
         &uusdc_on_neutron_denom,
     )?;
 
-    sleep(Duration::from_secs(5));
-
     let noble_outbound_ica_usdc_bal = async_run!(
         &rt,
         noble_client
@@ -255,15 +279,6 @@ fn main() -> Result<(), Box<dyn Error>> {
         &neutron_program_libraries,
     )?;
 
-    // create two Valence Base Accounts on Ethereum to test the processor with libraries (in this case the forwarder)
-    let deposit_acc_addr =
-        ethereum_utils::valence_account::setup_valence_account(&rt, &eth_client, eth_admin_acc)?;
-    let withdraw_acc_addr =
-        ethereum_utils::valence_account::setup_valence_account(&rt, &eth_client, eth_admin_acc)?;
-
-    let usdc_token_address =
-        ethereum_utils::mock_erc20::setup_deposit_erc20(&rt, &eth_client, "MockUSDC", "USDC")?;
-
     info!("Setting up Lite Processor on Ethereum");
     let _lite_processor_address = ethereum_utils::lite_processor::setup_lite_processor(
         &rt,
@@ -276,9 +291,6 @@ fn main() -> Result<(), Box<dyn Error>> {
         authorization_contract_address.as_str(),
     )?;
 
-    let mock_cctp_messenger_address =
-        valence_e2e::utils::vault::setup_mock_token_messenger(&rt, &eth_client)?;
-
     info!("Setting up Valence Vault...");
     let vault_address = setup_valence_vault(
         &rt,
@@ -293,7 +305,10 @@ fn main() -> Result<(), Box<dyn Error>> {
     let cctp_forwarder = setup_cctp_transfer(
         &rt,
         &eth_client,
-        neutron_program_accounts.noble_inbound_ica.remote_addr,
+        neutron_program_accounts
+            .noble_inbound_ica
+            .remote_addr
+            .to_string(),
         deposit_acc_addr,
         eth_admin_acc,
         eth_admin_acc,
@@ -497,52 +512,60 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     info!("user1 completing withdraw request...");
     vault::complete_withdraw_request(*valence_vault.address(), &rt, &eth_client, eth_user_acc)?;
-    let withdraw_acc_usdc_bal = ethereum_utils::mock_erc20::query_balance(
-        &rt,
-        &eth_client,
-        usdc_token_address,
-        withdraw_acc_addr,
-    );
+
     let user1_usdc_bal = ethereum_utils::mock_erc20::query_balance(
         &rt,
         &eth_client,
         usdc_token_address,
         eth_user_acc,
     );
-    assert_eq!(withdraw_acc_usdc_bal, U256::from(50)); // fees leftover
     assert_eq!(user1_usdc_bal, user_1_deposit_amount - U256::from(50));
 
-    let deposit_acc_usdc_bal = ethereum_utils::mock_erc20::query_balance(
+    let pre_cctp_deposit_acc_usdc_bal = ethereum_utils::mock_erc20::query_balance(
         &rt,
         &eth_client,
         usdc_token_address,
         deposit_acc_addr,
     );
-    info!("deposit account usdc balance: {deposit_acc_usdc_bal}");
-    assert_ne!(deposit_acc_usdc_bal, U256::ZERO);
+    let pre_cctp_neutron_ica_bal = async_run!(
+        &rt,
+        noble_client
+            .query_balance(
+                &neutron_program_accounts.noble_inbound_ica.remote_addr,
+                UUSDC_DENOM
+            )
+            .await
+            .unwrap()
+    );
+
+    assert_eq!(pre_cctp_neutron_ica_bal, 0);
+    assert_eq!(pre_cctp_deposit_acc_usdc_bal, U256::from(1000000));
 
     info!("strategist cctp routing eth->ntrn...");
     strategist::cctp_route_usdc_from_eth(&rt, &eth_client, cctp_forwarder, eth_admin_acc)?;
 
-    let deposit_acc_usdc_bal = ethereum_utils::mock_erc20::query_balance(
+    info!("[MAIN] sleeping for 5 to give cctp time to relay");
+    sleep(Duration::from_secs(5));
+
+    let post_cctp_deposit_acc_usdc_bal = ethereum_utils::mock_erc20::query_balance(
         &rt,
         &eth_client,
         usdc_token_address,
         deposit_acc_addr,
     );
-    assert_eq!(deposit_acc_usdc_bal, U256::ZERO);
-
-    log_eth_balances(
-        &eth_client,
+    let post_cctp_neutron_ica_bal = async_run!(
         &rt,
-        valence_vault.address(),
-        &usdc_token_address,
-        &deposit_acc_addr,
-        &withdraw_acc_addr,
-        &eth_user_acc,
-        &eth_user2_acc,
-    )
-    .unwrap();
+        noble_client
+            .query_balance(
+                &neutron_program_accounts.noble_inbound_ica.remote_addr,
+                UUSDC_DENOM
+            )
+            .await
+            .unwrap()
+    );
+
+    assert_eq!(post_cctp_neutron_ica_bal, 1000000);
+    assert_eq!(post_cctp_deposit_acc_usdc_bal, U256::ZERO);
 
     Ok(())
 }

e2e/examples/ica_libraries.rs

@@ -13,7 +13,9 @@ use valence_chain_client_utils::{
     cosmos::base_client::BaseClient, neutron::NeutronClient, noble::NobleClient,
 };
 use valence_e2e::utils::{
-    ibc::poll_for_ica_state, parse::get_grpc_address_and_port_from_logs, relayer::restart_relayer,
+    ibc::poll_for_ica_state,
+    parse::{get_chain_field_from_local_ic_log, get_grpc_address_and_port_from_url},
+    relayer::restart_relayer,
     ADMIN_MNEMONIC, GAS_FLAGS, LOGS_FILE_PATH, NOBLE_CHAIN_ADMIN_ADDR, NOBLE_CHAIN_DENOM,
     NOBLE_CHAIN_ID, NOBLE_CHAIN_NAME, NOBLE_CHAIN_PREFIX, UUSDC_DENOM, VALENCE_ARTIFACTS_PATH,
 };
@@ -42,7 +44,8 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     let rt = tokio::runtime::Runtime::new()?;
     // Get the grpc url and the port for the noble chain
-    let (grpc_url, grpc_port) = get_grpc_address_and_port_from_logs(NOBLE_CHAIN_ID)?;
+    let grpc_addr = get_chain_field_from_local_ic_log(NOBLE_CHAIN_ID, "grpc_address")?;
+    let (grpc_url, grpc_port) = get_grpc_address_and_port_from_url(&grpc_addr)?;
 
     let noble_client = rt.block_on(async {
         NobleClient::new(
@@ -399,7 +402,9 @@ fn main() -> Result<(), Box<dyn Error>> {
         .dest(NEUTRON_CHAIN_NAME)
         .get();
 
-    let (grpc_url, grpc_port) = get_grpc_address_and_port_from_logs(NEUTRON_CHAIN_ID)?;
+    let grpc_addr = get_chain_field_from_local_ic_log(NEUTRON_CHAIN_ID, "grpc_address")?;
+    let (grpc_url, grpc_port) = get_grpc_address_and_port_from_url(&grpc_addr)?;
+
     let neutron_client = rt.block_on(async {
         NeutronClient::new(
             &grpc_url,

e2e/hyperlane/config/config.json

@@ -14,9 +14,9 @@
       "displayName": "Ethereum",
       "domainId": 1,
       "gasCurrencyCoinGeckoId": "ethereum",
-      "interchainGasPaymaster": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0",
-      "mailbox": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
-      "merkleTreeHook": "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512",
+      "interchainGasPaymaster": "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707",
+      "mailbox": "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9",
+      "merkleTreeHook": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9",
       "name": "ethereum",
       "nativeToken": {
         "decimals": 18,
@@ -30,7 +30,7 @@
         }
       ],
       "technicalStack": "other",
-      "validatorAnnounce": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9"
+      "validatorAnnounce": "0xa513E6E4b8f2a923D98304ec87F64353C4D5C853"
     },
     "neutron": {
       "bech32Prefix": "neutron",
@@ -58,10 +58,10 @@
           "http": "http://localneutron-1-val-0-neutronic:9090"
         }
       ],
-      "interchainGasPaymaster": "0x2943ecc95e93154658ca301d3babfd18b076cc9e64a80ac79f3dfb352871aaf4",
+      "interchainGasPaymaster": "0x829596c5dd7adcddc4b76cff4b072f8d969c43bca643a09bb8afaa401abb38fa",
       "isTestnet": false,
-      "mailbox": "0x9ab0f7fe807c59289077acdb20d10f5cfe54d53200242eb9a83250cd6659b0cd",
-      "merkleTreeHook": "0xbb0739110d17f8230076322931c82be430a126d8513f56c75fda077e99459d24",
+      "mailbox": "0xc7ae3be80aa45fbaeebfff94c6c2b2f6b49e06ed0394fe90350aa3308ebabe05",
+      "merkleTreeHook": "0xccd2cf66c5e2ca7ad0ecadfce1e8a8ec2e3f657d3c308bf6b5e4adba9b99a4b3",
       "name": "neutron",
       "nativeToken": {
         "decimals": 6,
@@ -87,7 +87,7 @@
       },
       "slip44": 118,
       "technicalStack": "other",
-      "validatorAnnounce": "0xb4703662fbe03bd9e67d65a31c8e20ebc11bd310621279863f0712ba77d98c78"
+      "validatorAnnounce": "0xb65fc5ac8f7a8f77acda3f7fc1a524bf48ed72966e1222ca48852de4c160ae7e"
     }
   },
   "defaultRpcConsensusType": "fallback"