Merge branch 'xeno/core-deploy-apply-admin-proxy-ownership-fixes' of …

…github.com:hyperlane-xyz/hyperlane-monorepo into xeno/ica-router-management-update

.changeset/empty-needles-cough.md

@@ -0,0 +1,7 @@
+---
+'@hyperlane-xyz/utils': major
+'@hyperlane-xyz/sdk': major
+---
+
+Upgrade Viem to 2.2 and Solana Web3 to 1.9
+Rename `chainMetadataToWagmiChain` to `chainMetadataToViemChain`

.changeset/hip-mugs-fold.md

@@ -0,0 +1,5 @@
+---
+'@hyperlane-xyz/sdk': minor
+---
+
+Deploy to alephzeroevmtestnet, update deployment for arcadiatestnet2.

.changeset/lazy-carpets-nail.md

@@ -0,0 +1,7 @@
+---
+'@hyperlane-xyz/cli': minor
+'@hyperlane-xyz/sdk': minor
+'@hyperlane-xyz/core': minor
+---
+
+Add storage based multisig ISM types

.changeset/healthy-boats-lie.md → .changeset/shy-taxis-suffer.md

@@ -2,4 +2,4 @@
 '@hyperlane-xyz/utils': patch
 ---
 
-fix median utils func + add test
+Added a mustGet helper

.github/actions/yarn-build-with-cache/action.yml

@@ -16,7 +16,7 @@ runs:
         path: |
           **/node_modules
           .yarn
-        key: ${{ runner.os }}-yarn-cache-${{ hashFiles('./yarn.lock') }}
+        key: ${{ runner.os }}-yarn-4.5.1-cache-${{ hashFiles('./yarn.lock') }}
 
     # Typically, the cache will be hit, but if there's a network error when
     # restoring the cache, let's run the install step ourselves.

.github/workflows/static-analysis.yml

@@ -29,9 +29,9 @@ jobs:
           path: |
             **/node_modules
             .yarn
-          key: ${{ runner.os }}-yarn-cache-${{ hashFiles('./yarn.lock') }}
+          key: ${{ runner.os }}-yarn-4.5.1-cache-${{ hashFiles('./yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-yarn-cache-
+            ${{ runner.os }}-yarn-4.5.1.-cache-
 
       - name: yarn-install
         run: yarn install

.github/workflows/storage-analysis.yml

@@ -29,9 +29,9 @@ jobs:
           path: |
             **/node_modules
             .yarn
-          key: ${{ runner.os }}-yarn-cache-${{ hashFiles('./yarn.lock') }}
+          key: ${{ runner.os }}-yarn-4.5.1-cache-${{ hashFiles('./yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-yarn-cache-
+            ${{ runner.os }}-yarn-4.5.1-cache-
 
       - name: yarn-install
         run: yarn install

.github/workflows/test.yml

@@ -40,9 +40,9 @@ jobs:
           path: |
             **/node_modules
             .yarn
-          key: ${{ runner.os }}-yarn-cache-${{ hashFiles('./yarn.lock') }}
+          key: ${{ runner.os }}-yarn-4.5.1-cache-${{ hashFiles('./yarn.lock') }}
           restore-keys: |
-            ${{ runner.os }}-yarn-cache-
+            ${{ runner.os }}-yarn-4.5.1-cache-
 
       - name: yarn-install
         run: |
@@ -70,7 +70,7 @@ jobs:
           path: |
             **/node_modules
             .yarn
-          key: ${{ runner.os }}-yarn-cache-${{ hashFiles('./yarn.lock') }}
+          key: ${{ runner.os }}-yarn-4.5.1-cache-${{ hashFiles('./yarn.lock') }}
           fail-on-cache-miss: true
 
       - name: lint

.registryrc

@@ -1 +1 @@
-302be4817c063629cec70c0b02322b250df71122
+4e52093acfe3dc75a35771905f3a7757b368ac50

.yarnrc.yml

@@ -10,4 +10,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
     spec: "https://mskelton.dev/yarn-outdated/v3"
 
-yarnPath: .yarn/releases/yarn-4.0.2.cjs
+yarnPath: .yarn/releases/yarn-4.5.1.cjs

Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /hyperlane-monorepo
 
 RUN apk add --update --no-cache git g++ make py3-pip jq
 
-RUN yarn set version 4.0.2
+RUN yarn set version 4.5.1
 
 # Copy package.json and friends
 COPY package.json yarn.lock .yarnrc.yml ./

package.json

@@ -17,7 +17,7 @@
   "dependencies": {
     "@changesets/cli": "^2.26.2"
   },
-  "packageManager": "yarn@4.0.2",
+  "packageManager": "yarn@4.5.1",
   "private": true,
   "scripts": {
     "agent-configs": "yarn --cwd typescript/infra/ update-agent-config:mainnet3 && yarn --cwd typescript/infra/ update-agent-config:testnet4 && yarn prettier",

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

@@ -12,11 +12,12 @@ use hyperlane_base::{
     broadcast::BroadcastMpscSender,
     db::{HyperlaneRocksDB, DB},
     metrics::{AgentMetrics, MetricsUpdater},
-    settings::ChainConf,
+    settings::{ChainConf, IndexSettings},
     AgentMetadata, BaseAgent, ChainMetrics, ContractSyncMetrics, ContractSyncer, CoreMetrics,
     HyperlaneAgentCore, SyncOptions,
 };
 use hyperlane_core::{
+    rpc_clients::call_and_retry_n_times, ChainCommunicationError, ContractSyncCursor,
     HyperlaneDomain, HyperlaneMessage, InterchainGasPayment, MerkleTreeInsertion, QueueOperation,
     H512, U256,
 };
@@ -50,6 +51,9 @@ use crate::{
 };
 use crate::{processor::Processor, server::ENDPOINT_MESSAGES_QUEUE_SIZE};
 
+const CURSOR_BUILDING_ERROR: &str = "Error building cursor for origin";
+const CURSOR_INSTANTIATION_ATTEMPTS: usize = 10;
+
 #[derive(Debug, Hash, PartialEq, Eq, Copy, Clone)]
 struct ContextKey {
     origin: u32,
@@ -354,6 +358,7 @@ impl BaseAgent for Relayer {
         }
 
         for origin in &self.origin_chains {
+            self.chain_metrics.set_critical_error(origin.name(), false);
             let maybe_broadcaster = self
                 .message_syncs
                 .get(origin)
@@ -412,17 +417,51 @@ impl BaseAgent for Relayer {
 }
 
 impl Relayer {
+    fn record_critical_error(
+        &self,
+        origin: &HyperlaneDomain,
+        err: ChainCommunicationError,
+        message: &str,
+    ) {
+        error!(?err, origin=?origin, "{message}");
+        self.chain_metrics.set_critical_error(origin.name(), true);
+    }
+
+    async fn instantiate_cursor_with_retries<T: 'static>(
+        contract_sync: Arc<dyn ContractSyncer<T>>,
+        index_settings: IndexSettings,
+    ) -> Result<Box<dyn ContractSyncCursor<T>>, ChainCommunicationError> {
+        call_and_retry_n_times(
+            || {
+                let contract_sync = contract_sync.clone();
+                let index_settings = index_settings.clone();
+                Box::pin(async move {
+                    let cursor = contract_sync.cursor(index_settings).await?;
+                    Ok(cursor)
+                })
+            },
+            CURSOR_INSTANTIATION_ATTEMPTS,
+        )
+        .await
+    }
+
     async fn run_message_sync(
         &self,
         origin: &HyperlaneDomain,
         task_monitor: TaskMonitor,
     ) -> Instrumented<JoinHandle<()>> {
         let index_settings = self.as_ref().settings.chains[origin.name()].index_settings();
         let contract_sync = self.message_syncs.get(origin).unwrap().clone();
-        let cursor = contract_sync
-            .cursor(index_settings)
-            .await
-            .unwrap_or_else(|err| panic!("Error getting cursor for origin {origin}: {err}"));
+        let cursor_instantiation_result =
+            Self::instantiate_cursor_with_retries(contract_sync.clone(), index_settings.clone())
+                .await;
+        let cursor = match cursor_instantiation_result {
+            Ok(cursor) => cursor,
+            Err(err) => {
+                self.record_critical_error(origin, err, CURSOR_BUILDING_ERROR);
+                return tokio::spawn(async {}).instrument(info_span!("MessageSync"));
+            }
+        };
         tokio::spawn(TaskMonitor::instrument(&task_monitor, async move {
             contract_sync
                 .clone()
@@ -444,10 +483,16 @@ impl Relayer {
             .get(origin)
             .unwrap()
             .clone();
-        let cursor = contract_sync
-            .cursor(index_settings)
-            .await
-            .unwrap_or_else(|err| panic!("Error getting cursor for origin {origin}: {err}"));
+        let cursor_instantiation_result =
+            Self::instantiate_cursor_with_retries(contract_sync.clone(), index_settings.clone())
+                .await;
+        let cursor = match cursor_instantiation_result {
+            Ok(cursor) => cursor,
+            Err(err) => {
+                self.record_critical_error(origin, err, CURSOR_BUILDING_ERROR);
+                return tokio::spawn(async {}).instrument(info_span!("IgpSync"));
+            }
+        };
         tokio::spawn(TaskMonitor::instrument(&task_monitor, async move {
             contract_sync
                 .clone()
@@ -468,10 +513,16 @@ impl Relayer {
     ) -> Instrumented<JoinHandle<()>> {
         let index_settings = self.as_ref().settings.chains[origin.name()].index.clone();
         let contract_sync = self.merkle_tree_hook_syncs.get(origin).unwrap().clone();
-        let cursor = contract_sync
-            .cursor(index_settings)
-            .await
-            .unwrap_or_else(|err| panic!("Error getting cursor for origin {origin}: {err}"));
+        let cursor_instantiation_result =
+            Self::instantiate_cursor_with_retries(contract_sync.clone(), index_settings.clone())
+                .await;
+        let cursor = match cursor_instantiation_result {
+            Ok(cursor) => cursor,
+            Err(err) => {
+                self.record_critical_error(origin, err, CURSOR_BUILDING_ERROR);
+                return tokio::spawn(async {}).instrument(info_span!("MerkleTreeHookSync"));
+            }
+        };
         tokio::spawn(TaskMonitor::instrument(&task_monitor, async move {
             contract_sync
                 .clone()