Merge branch 'main' into jeff/evm-confirm

Author: kamiyaa

.changeset/long-adults-repeat.md

@@ -0,0 +1,6 @@
+---
+"@hyperlane-xyz/cli": patch
+"@hyperlane-xyz/sdk": patch
+---
+
+Restore foreignDeployment field behaviour to allow enrollment of unsupported chains during deployment

.github/workflows/rust.yml

@@ -18,7 +18,7 @@ concurrency:
 env:
   CARGO_TERM_COLOR: always
   RUST_BACKTRACE: full
-  MIN_LANDERCOVERAGE_PERCENTAGE: 18
+  MIN_LANDERCOVERAGE_PERCENTAGE: 19
   RUSTC_WRAPPER: sccache
 
 jobs:

.github/workflows/test.yml

@@ -393,9 +393,43 @@ jobs:
         env:
           CLI_E2E_TEST: ${{ matrix.test }}
 
+  cli-cross-chain-e2e-matrix:
+    runs-on: depot-ubuntu-latest
+    needs: [rust-only]
+    if: needs.rust-only.outputs.only_rust == 'false'
+    strategy:
+      fail-fast: false
+      matrix:
+        test:
+          # Warp Commands
+          - warp-apply
+          - warp-deploy
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+          submodules: recursive
+          fetch-depth: 0
+
+      - 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 cross chain e2e tests (${{ matrix.test }})
+        run: yarn --cwd typescript/cli test:cross-chain:e2e
+        env:
+          CLI_E2E_TEST: ${{ matrix.test }}
+
   cli-e2e:
     runs-on: ubuntu-latest
-    needs: [cli-evm-e2e-matrix, cli-cosmos-e2e-matrix]
+    needs:
+      [cli-evm-e2e-matrix, cli-cosmos-e2e-matrix, cli-cross-chain-e2e-matrix]
     if: always()
     steps:
       - uses: actions/checkout@v4
@@ -409,6 +443,11 @@ jobs:
         with:
           job_name: 'CLI CosmosNative E2E'
           result: ${{ needs.cli-cosmos-e2e-matrix.result }}
+      - name: Check CLI Cross Chain E2E status
+        uses: ./.github/actions/check-job-status
+        with:
+          job_name: 'CLI Cross Chain E2E'
+          result: ${{ needs.cli-cross-chain-e2e-matrix.result }}
 
   cosmos-sdk-e2e-run:
     runs-on: depot-ubuntu-latest

.registryrc

@@ -1 +1 @@
-186efa0e671f247a4e1468c56825561ded35756e
+03c3b95350583598b2f323b52d1335e64309095c

rust/main/chains/hyperlane-sealevel/src/provider.rs

@@ -100,7 +100,11 @@ pub trait SealevelProviderForLander: Send + Sync {
         commitment: CommitmentConfig,
     ) -> ChainResult<bool>;
 
-    /// Request account with finalized commitment level
+    /// Request account with processed commitment level
+    /// We use this method to identify if payload was or was not reverted
+    /// by checking if the account exists. That's why if the account
+    /// exits at the processed commitment level (as opposite to finalized),
+    /// it should be enough.
     async fn get_account(&self, account: Pubkey) -> ChainResult<Option<Account>>;
 }
 
@@ -321,7 +325,7 @@ impl SealevelProviderForLander for SealevelProvider {
 
     async fn get_account(&self, account: Pubkey) -> ChainResult<Option<Account>> {
         self.rpc_client()
-            .get_account_option_with_finalized_commitment(account)
+            .get_account_option_with_commitment(account, CommitmentConfig::processed())
             .await
     }
 }

rust/main/chains/hyperlane-sealevel/src/rpc/client.rs

@@ -73,10 +73,20 @@ impl SealevelRpcClient {
     pub async fn get_account_option_with_finalized_commitment(
         &self,
         pubkey: &Pubkey,
+    ) -> ChainResult<Option<Account>> {
+        self.get_account_option_with_commitment(pubkey, CommitmentConfig::finalized())
+            .await
+    }
+
+    /// get account option with the given commitment
+    pub async fn get_account_option_with_commitment(
+        &self,
+        pubkey: &Pubkey,
+        commitment: CommitmentConfig,
     ) -> ChainResult<Option<Account>> {
         let account = self
             .0
-            .get_account_with_commitment(pubkey, CommitmentConfig::finalized())
+            .get_account_with_commitment(pubkey, commitment)
             .await
             .map_err(ChainCommunicationError::from_other)?
             .value;

rust/main/chains/hyperlane-sealevel/src/rpc/fallback.rs

@@ -168,6 +168,21 @@ impl SealevelFallbackRpcClient {
             .await
     }
 
+    /// get account with finalized commitment
+    pub async fn get_account_with_finalized_commitment(
+        &self,
+        pubkey: Pubkey,
+    ) -> ChainResult<Account> {
+        self.fallback_provider
+            .call(move |client| {
+                let pubkey = pubkey;
+                let future =
+                    async move { client.get_account_with_finalized_commitment(&pubkey).await };
+                Box::pin(future)
+            })
+            .await
+    }
+
     /// get account option with finalized commitment
     pub async fn get_account_option_with_finalized_commitment(
         &self,
@@ -186,16 +201,20 @@ impl SealevelFallbackRpcClient {
             .await
     }
 
-    /// get account with finalized commitment
-    pub async fn get_account_with_finalized_commitment(
+    /// get account option with a commitment
+    pub async fn get_account_option_with_commitment(
         &self,
         pubkey: Pubkey,
-    ) -> ChainResult<Account> {
+        commitment: CommitmentConfig,
+    ) -> ChainResult<Option<Account>> {
         self.fallback_provider
             .call(move |client| {
                 let pubkey = pubkey;
-                let future =
-                    async move { client.get_account_with_finalized_commitment(&pubkey).await };
+                let future = async move {
+                    client
+                        .get_account_option_with_commitment(&pubkey, commitment)
+                        .await
+                };
                 Box::pin(future)
             })
             .await

rust/main/hyperlane-base/src/settings/parser/mod.rs

@@ -268,9 +268,9 @@ fn parse_chain(
     let submitter = match submitter {
         Some(submitter_type) => submitter_type,
         None => match connection.protocol() {
-            HyperlaneDomainProtocol::Ethereum | HyperlaneDomainProtocol::Radix => {
-                SubmitterType::Lander
-            }
+            HyperlaneDomainProtocol::Ethereum
+            | HyperlaneDomainProtocol::Radix
+            | HyperlaneDomainProtocol::Sealevel => SubmitterType::Lander,
             _ => Default::default(),
         },
     };

typescript/cli/package.json

@@ -43,6 +43,7 @@
     "prettier": "^3.5.3",
     "prom-client": "^14.0.1",
     "terminal-link": "^3.0.0",
+    "testcontainers": "11.7.0",
     "tsx": "^4.19.1",
     "typescript": "5.3.3",
     "yaml": "2.4.5",
@@ -62,6 +63,7 @@
     "prettier": "prettier --write ./src ./examples",
     "test:ci": "yarn mocha --config .mocharc.json",
     "test:ethereum:e2e": "./src/tests/ethereum/run-e2e-test.sh",
+    "test:cross-chain:e2e": "./src/tests/cross-chain/run-e2e-test.sh",
     "test:cosmosnative:e2e": "./src/tests/cosmosnative/run-e2e-test.sh",
     "version:update": "echo \"export const VERSION = '$npm_package_version';\" > src/version.ts",
     "prepack": "yarn bundle"

typescript/cli/src/deploy/warp.ts

@@ -373,7 +373,7 @@ export async function runWarpRouteApply(
   params: WarpApplyParams,
 ): Promise<void> {
   const { warpDeployConfig, warpCoreConfig, context } = params;
-  const { chainMetadata, skipConfirmation } = context;
+  const { chainMetadata, skipConfirmation, multiProvider } = context;
 
   WarpRouteDeployConfigSchema.parse(warpDeployConfig);
   WarpCoreConfigSchema.parse(warpCoreConfig);
@@ -394,10 +394,18 @@ export async function runWarpRouteApply(
   // temporarily configure deployer as owner so that warp update after extension
   // can leverage JSON RPC submitter on new chains
   const intermediateOwnerConfig = await promiseObjAll(
-    objMap(params.warpDeployConfig, async (chain, config) => ({
-      ...config,
-      owner: await multiProtocolSigner.getSignerAddress(chain),
-    })),
+    objMap(params.warpDeployConfig, async (chain, config) => {
+      const protocolType = multiProvider.getProtocol(chain);
+
+      if (!COMPATIBLE_PROTOCOLS.includes(protocolType)) {
+        return config;
+      }
+
+      return {
+        ...config,
+        owner: await multiProtocolSigner.getSignerAddress(chain),
+      };
+    }),
   );
 
   // Extend the warp route and get the updated configs
@@ -636,14 +644,20 @@ async function updateExistingWarpRoute(
   await promiseObjAll(
     objMap(expandedWarpDeployConfig, async (chain, config) => {
       await retryAsync(async () => {
+        const protocolType = multiProvider.getProtocol(chain);
+        if (!COMPATIBLE_PROTOCOLS.includes(protocolType)) {
+          logBlue(`Skipping non-compatible chain ${chain}`);
+          return;
+        }
+
         const deployedTokenRoute = deployedRoutersAddresses[chain];
         assert(deployedTokenRoute, `Missing artifacts for ${chain}.`);
         const configWithMailbox = {
           ...config,
           mailbox: registryAddresses[chain].mailbox,
         };
 
-        switch (multiProvider.getProtocol(chain)) {
+        switch (protocolType) {
           case ProtocolType.Ethereum: {
             const evmERC20WarpModule = new EvmERC20WarpModule(
               multiProvider,
@@ -683,10 +697,6 @@ async function updateExistingWarpRoute(
             updateTransactions[chain] = transactions;
             break;
           }
-          default: {
-            logBlue(`Skipping non-compatible chain ${chain}`);
-            return;
-          }
         }
       });
     }),