Merge upstream (up to 11c1b188f)

.changeset/bright-kangaroos-do.md

@@ -0,0 +1,5 @@
+---
+"@hyperlane-xyz/infra": patch
+---
+
+Fix: Corrected logger usage by avoiding destructured debug method calls

.changeset/gentle-toes-admire.md

@@ -0,0 +1,5 @@
+---
+"@hyperlane-xyz/sdk": minor
+---
+
+Add fallback logic to the `EvmEventLogsReader` to use the rpc when the block explorer api request fails

.changeset/modern-dogs-kneel.md

@@ -0,0 +1,5 @@
+---
+"@hyperlane-xyz/sdk": minor
+---
+
+Add the getPendingScheduledOperations and getPendingOperationIds methods on the EvmTimelockReader class and export getTimelockExecutableTransactionFromBatch from sdk

.changeset/modern-snakes-flash.md

@@ -0,0 +1,5 @@
+---
+"@hyperlane-xyz/utils": patch
+---
+
+Ignore dynamic import in webpack builds

.github/CODEOWNERS

@@ -5,7 +5,7 @@ solidity/ @yorhodes @ltyu @larryob
 starknet/ @yorhodes @troykessler
 
 ## Agents
-rust/ @ameten @kamiyaa
+rust/ @ameten @kamiyaa @yjamin
 
 ## SDK
 typescript/utils @yorhodes @ltyu @paulbalaji @xaroz @xeno097 @antigremlin

.github/workflows/test.yml

@@ -284,16 +284,13 @@ jobs:
           job_name: 'CLI Install Test'
           result: ${{ needs.cli-install-test-run.result }}
 
-  cli-e2e-matrix:
+  cli-evm-e2e-matrix:
     runs-on: depot-ubuntu-latest
     needs: [rust-only]
     if: needs.rust-only.outputs.only_rust == 'false'
     strategy:
       fail-fast: false
       matrix:
-        protocol:
-          - ethereum
-          - cosmosnative
         test:
           # Core Commands
           - core-apply
@@ -304,19 +301,63 @@ jobs:
           # Other commands
           - relay
           # Warp Commands
+          - warp-apply-1
+          - warp-apply-2
           - warp-apply-submitters
-          - warp-apply
           - warp-bridge-1
           - warp-bridge-2
-          - warp-check
+          - warp-check-1
+          - warp-check-2
+          - warp-check-3
           - warp-deploy
           - warp-extend-basic
           - warp-extend-config
           - warp-extend-recovery
           - warp-init
           - warp-read
-          - warp-send
           - warp-rebalancer
+          - warp-send
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: foundry-install
+        uses: foundry-rs/foundry-toolchain@v1
+
+      - name: install-hyperlane-cli
+        id: install-hyperlane-cli
+        uses: ./.github/actions/install-cli
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+          cache-provider: github
+
+      - name: Checkout registry
+        uses: ./.github/actions/checkout-registry
+
+      - name: CLI ethereum e2e tests (${{ matrix.test }})
+        run: yarn --cwd typescript/cli test:ethereum:e2e
+        env:
+          CLI_E2E_TEST: ${{ matrix.test }}
+
+  cli-cosmos-e2e-matrix:
+    runs-on: depot-ubuntu-latest
+    needs: [rust-only]
+    if: needs.rust-only.outputs.only_rust == 'false'
+    strategy:
+      fail-fast: false
+      matrix:
+        test:
+          # Core Commands
+          - core-apply
+          - core-check
+          - core-deploy
+          - core-read
+          # Warp Commands
+          - warp-deploy
+          - warp-read
     steps:
       - uses: actions/checkout@v4
         with:
@@ -337,22 +378,27 @@ jobs:
       - name: Checkout registry
         uses: ./.github/actions/checkout-registry
 
-      - name: CLI ${{ matrix.protocol }} e2e tests (${{ matrix.test }})
-        run: yarn --cwd typescript/cli test:${{ matrix.protocol }}:e2e
+      - name: CLI cosmosnative e2e tests (${{ matrix.test }})
+        run: yarn --cwd typescript/cli test:cosmosnative:e2e
         env:
           CLI_E2E_TEST: ${{ matrix.test }}
 
   cli-e2e:
     runs-on: ubuntu-latest
-    needs: [cli-e2e-matrix]
+    needs: [cli-evm-e2e-matrix, cli-cosmos-e2e-matrix]
     if: always()
     steps:
       - uses: actions/checkout@v4
-      - name: Check cli-e2e matrix status
+      - name: Check CLI EVM E2E status
+        uses: ./.github/actions/check-job-status
+        with:
+          job_name: 'CLI EVM E2E'
+          result: ${{ needs.cli-evm-e2e-matrix.result }}
+      - name: Check CLI CosmosNative E2E status
         uses: ./.github/actions/check-job-status
         with:
-          job_name: 'CLI E2E'
-          result: ${{ needs.cli-e2e-matrix.result }}
+          job_name: 'CLI CosmosNative E2E'
+          result: ${{ needs.cli-cosmos-e2e-matrix.result }}
 
   cosmos-sdk-e2e-run:
     runs-on: depot-ubuntu-latest

.gitignore

@@ -34,3 +34,6 @@ yarn-error.log
 tsconfig.editor.json
 
 .aider.*
+# yalc
+yalc.lock
+.yalc

rust/main/Cargo.toml

@@ -224,6 +224,13 @@ overflow-checks = true
 [profile.release.package.hyperlane-sealevel-validator-announce]
 overflow-checks = true
 
+[workspace.dependencies.cometbft]
+git = "https://github.com/hyperlane-xyz/cometbft-rs"
+tag = "2025-08-07"
+
+[workspace.dependencies.cometbft-rpc]
+git = "https://github.com/hyperlane-xyz/cometbft-rs"
+tag = "2025-08-07"
 
 [workspace.dependencies.ethers]
 features = []

rust/main/agents/relayer/src/msg/message_processor.rs

@@ -163,7 +163,10 @@ impl MessageProcessor {
 
         let entrypoint = self.payload_dispatcher_entrypoint.take().map(Arc::new);
 
-        let prepare_task = self.create_classic_prepare_task();
+        let prepare_task = match &entrypoint {
+            None => self.create_classic_prepare_task(),
+            Some(entrypoint) => self.create_lander_prepare_task(entrypoint.clone()),
+        };
 
         let submit_task = match &entrypoint {
             None => self.create_classic_submit_task(),

rust/main/agents/scraper/src/agent.rs

@@ -5,7 +5,7 @@ use derive_more::AsRef;
 use futures::future::try_join_all;
 use hyperlane_core::{Delivery, HyperlaneDomain, HyperlaneMessage, InterchainGasPayment, H512};
 use tokio::{sync::mpsc::Receiver as MpscReceiver, task::JoinHandle};
-use tracing::{info, info_span, trace, Instrument};
+use tracing::{info, info_span, instrument, trace, Instrument};
 
 use hyperlane_base::{
     broadcast::BroadcastMpscSender, metrics::AgentMetrics, settings::IndexSettings, AgentMetadata,
@@ -148,6 +148,7 @@ impl BaseAgent for Scraper {
 impl Scraper {
     /// Sync contract data and other blockchain with the current chain state.
     /// This will spawn long-running contract sync tasks
+    #[instrument(fields(domain=%scraper.domain.name()), skip_all)]
     async fn scrape(&self, scraper: &ChainScraper) -> eyre::Result<JoinHandle<()>> {
         let store = scraper.store.clone();
         let index_settings = scraper.index_settings.clone();
@@ -198,6 +199,7 @@ impl Scraper {
         ))
     }
 
+    #[instrument(fields(domain=%domain.name()), skip_all)]
     async fn build_chain_scraper(
         domain: &HyperlaneDomain,
         settings: &ScraperSettings,

rust/main/chains/hyperlane-cosmos/Cargo.toml

@@ -12,6 +12,8 @@ version = { workspace = true }
 async-trait = { workspace = true }
 base64 = { workspace = true }
 bech32 = { workspace = true }
+cometbft = { workspace = true, features = ["secp256k1"] }
+cometbft-rpc = { workspace = true, features = ["http-client","secp256k1"] }
 cosmrs = { workspace = true, features = ["cosmwasm", "tokio", "grpc", "rpc"] }
 cosmwasm-std = { workspace = true }
 crypto = { path = "../../utils/crypto" }
@@ -33,8 +35,6 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 sha2 = { workspace = true }
 sha256 = { workspace = true }
-tendermint = { workspace = true, features = ["rust-crypto", "secp256k1"] }
-tendermint-rpc = { workspace = true }
 time = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }

rust/main/chains/hyperlane-cosmos/src/error.rs

@@ -41,9 +41,12 @@ pub enum HyperlaneCosmosError {
     /// Tonic codegen error
     #[error("{0}")]
     TonicGenError(#[from] tonic::codegen::StdError),
-    /// Tendermint RPC Error
+    /// Cometbft Error
     #[error(transparent)]
-    TendermintError(#[from] Box<tendermint_rpc::error::Error>),
+    CometbftError(#[from] Box<cometbft::error::Error>),
+    /// Cometbft RPC Error
+    #[error(transparent)]
+    CometbftRpcError(#[from] Box<cometbft_rpc::Error>),
     /// Prost error
     #[error("{0}")]
     Prost(#[from] prost::DecodeError),
@@ -87,3 +90,9 @@ impl From<PublicKeyError> for HyperlaneCosmosError {
         HyperlaneCosmosError::PublicKeyError(value.to_string())
     }
 }
+
+impl From<cometbft_rpc::Error> for HyperlaneCosmosError {
+    fn from(value: cometbft_rpc::Error) -> Self {
+        HyperlaneCosmosError::CometbftRpcError(Box::new(value))
+    }
+}

rust/main/chains/hyperlane-cosmos/src/interchain_gas.rs

@@ -2,8 +2,8 @@ use std::ops::RangeInclusive;
 
 use async_trait::async_trait;
 use base64::{engine::general_purpose::STANDARD as BASE64, Engine};
+use cometbft::abci::EventAttribute;
 use once_cell::sync::Lazy;
-use tendermint::abci::EventAttribute;
 use tracing::instrument;
 
 use hyperlane_core::{