Merge branch 'main' of github.com:hyperlane-xyz/hyperlane-monorepo in…

…to xeno/update-warp-remote-router-schema
hyperlane-xyz · Dec 4, 2024 · fe5fde4 · fe5fde4
2 parents 3ab922f + 323f0f1
commit fe5fde4
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 24 deletions.
diff --git a/rust/main/agents/scraper/src/db/payment.rs b/rust/main/agents/scraper/src/db/payment.rs
@@ -1,7 +1,7 @@
 use eyre::{eyre, Result};
 use itertools::Itertools;
 use sea_orm::{prelude::*, ActiveValue::*, Insert, QuerySelect};
-use tracing::{debug, instrument, trace};
+use tracing::{debug, instrument};
 
 use hyperlane_core::{address_to_bytes, h256_to_bytes, InterchainGasPayment, LogMeta, H256};
 use migration::OnConflict;
@@ -12,6 +12,7 @@ use crate::db::ScraperDb;
 
 use super::generated::gas_payment;
 
+#[derive(Debug)]
 pub struct StorablePayment<'a> {
     pub payment: &'a InterchainGasPayment,
     pub sequence: Option<i64>,
@@ -26,13 +27,14 @@ impl ScraperDb {
         &self,
         domain: u32,
         interchain_gas_paymaster: &H256,
-        payments: impl Iterator<Item = StorablePayment<'_>>,
+        payments: &[StorablePayment<'_>],
     ) -> Result<u64> {
         let latest_id_before = self.latest_payment_id(domain).await?;
         let interchain_gas_paymaster = address_to_bytes(interchain_gas_paymaster);
 
         // we have a race condition where a message may not have been scraped yet even
         let models = payments
+            .iter()
             .map(|storable| gas_payment::ActiveModel {
                 id: NotSet,
                 time_created: Set(date_time::now()),
@@ -49,7 +51,7 @@ impl ScraperDb {
             })
             .collect_vec();
 
-        trace!(?models, "Writing gas payments to database");
+        debug!(?models, "Writing gas payments to database");
 
         if models.is_empty() {
             debug!("Wrote zero new gas payments to database");

diff --git a/rust/main/agents/scraper/src/store/payments.rs b/rust/main/agents/scraper/src/store/payments.rs
@@ -2,6 +2,8 @@ use std::collections::HashMap;
 
 use async_trait::async_trait;
 use eyre::Result;
+use itertools::Itertools;
+use tracing::debug;
 
 use hyperlane_core::{HyperlaneLogStore, Indexed, InterchainGasPayment, LogMeta, H512};
 
@@ -42,14 +44,22 @@ impl HyperlaneLogStore<InterchainGasPayment> for HyperlaneDbStore {
                 sequence,
                 meta,
                 txn_id,
-            });
+            })
+            .collect_vec();
+
+        debug!(
+            domain = self.domain.id(),
+            interchain_gas_paymaster_address = ?self.interchain_gas_paymaster_address,
+            ?storable,
+            "storable payments",
+        );
 
         let stored = self
             .db
             .store_payments(
                 self.domain.id(),
                 &self.interchain_gas_paymaster_address,
-                storable,
+                &storable,
             )
             .await?;
         Ok(stored as u32)

diff --git a/typescript/cli/src/commands/core.ts b/typescript/cli/src/commands/core.ts
@@ -184,30 +184,19 @@ export const read: CommandModuleWithContext<{
       type: 'string',
       description: 'Mailbox address used to derive the core config',
     },
-    interchainAccountRouter: {
-      type: 'string',
-      description: 'InterchainAccountRouter address used to derive its config',
-    },
     config: outputFileCommandOption(
       DEFAULT_CORE_DEPLOYMENT_CONFIG_PATH,
       false,
       'The path to output a Core Config JSON or YAML file.',
     ),
   },
-  handler: async ({
-    context,
-    chain,
-    mailbox,
-    config: configFilePath,
-    interchainAccountRouter,
-  }) => {
+  handler: async ({ context, chain, mailbox, config: configFilePath }) => {
     logCommandHeader('Hyperlane Core Read');
 
     const coreConfig = await executeCoreRead({
       context,
       chain,
       mailbox,
-      interchainAccountRouter,
     });
 
     writeYamlOrJson(configFilePath, coreConfig, 'yaml');

diff --git a/typescript/cli/src/read/core.ts b/typescript/cli/src/read/core.ts
@@ -8,12 +8,10 @@ export async function executeCoreRead({
   context,
   chain,
   mailbox,
-  interchainAccountRouter,
 }: {
   context: CommandContext;
   chain: ChainName;
   mailbox?: Address;
-  interchainAccountRouter?: Address;
 }): Promise<CoreConfig> {
   const addresses = await context.registry.getChainAddresses(chain);
   if (!mailbox) {
@@ -25,13 +23,12 @@ export async function executeCoreRead({
     );
   }
 
-  if (!interchainAccountRouter) {
-    interchainAccountRouter = addresses?.interchainAccountRouter;
-  }
-
   const evmCoreReader = new EvmCoreReader(context.multiProvider, chain);
   try {
-    return evmCoreReader.deriveCoreConfig({ mailbox, interchainAccountRouter });
+    return evmCoreReader.deriveCoreConfig({
+      mailbox,
+      interchainAccountRouter: addresses?.interchainAccountRouter,
+    });
   } catch (e: any) {
     errorRed(
       `❌ Failed to read core config for mailbox ${mailbox} on ${chain}:`,