Merge branch 'main' into ts-metadata-builders-build

.changeset/green-ads-live.md

@@ -0,0 +1,5 @@
+---
+'@hyperlane-xyz/cli': minor
+---
+
+Default to home directory for local registry

.changeset/lemon-horses-swim.md

@@ -0,0 +1,5 @@
+---
+'@hyperlane-xyz/cli': patch
+---
+
+Improve defaults in chain config command

.changeset/sour-bats-sort.md

@@ -0,0 +1,6 @@
+---
+'@hyperlane-xyz/utils': minor
+'@hyperlane-xyz/sdk': minor
+---
+
+Implement aggregation and multisig ISM metadata encoding

.gitattributes

@@ -1,2 +1,4 @@
 typescript/sdk/src/cw-types/*.types.ts linguist-generated=true
 rust/chains/hyperlane-ethereum/abis/*.abi.json linguist-generated=true
+solidity/contracts/interfaces/avs/*.sol linguist-vendored=true
+solidity/contracts/avs/ECDSA*.sol linguist-vendored=true

.github/workflows/test.yml

@@ -5,7 +5,8 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: [main]
+    branches:
+      - '*' # run against all branches
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
@@ -175,6 +176,7 @@ jobs:
 
   e2e-matrix:
     runs-on: larger-runner
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'main')
     needs: [yarn-build]
     strategy:
       matrix:
@@ -264,6 +266,7 @@ jobs:
 
   cli-e2e:
     runs-on: larger-runner
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'main')
     needs: [yarn-build]
     strategy:
       matrix:
@@ -343,9 +346,6 @@ jobs:
           - environment: testnet4
             chain: sepolia
             module: core
-          - environment: mainnet3
-            chain: inevm
-            module: warp
 
     steps:
       - uses: actions/checkout@v3

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "solidity/lib/forge-std"]
 	path = solidity/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "solidity/lib/fx-portal"]
+	path = solidity/lib/fx-portal
+	url = https://github.com/0xPolygon/fx-portal

.husky/pre-commit

@@ -3,6 +3,8 @@
 
 yarn lint-staged
 
+echo "📝 If you haven't yet, please add a changeset for your changes via 'yarn changeset'"
+
 # if any *.rs files have changed
 if git diff --staged --exit-code --name-only | grep -q -E ".*\.rs$"; then
     echo "Running cargo fmt pre-commit hook"

.nvmrc

@@ -0,0 +1 @@
+v20

README.md

@@ -46,6 +46,25 @@ foundryup
 
 Check out the [Foundry Book](https://book.getfoundry.sh/getting-started/installation) for more information.
 
+### Node
+
+This repository targets v20 of node. We recommend using [nvm](https://github.com/nvm-sh/nvm) to manage your node version.
+
+To install nvm
+
+```bash
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
+```
+
+To install version 20
+
+```bash
+nvm install 20
+nvm use 20
+```
+
+You should change versions automatically with the `.nvmrc` file.
+
 ### Workspaces
 
 This monorepo uses [Yarn Workspaces](https://yarnpkg.com/features/workspaces). Installing dependencies, building, testing, and running prettier for all packages can be done from the root directory of the repository.

package.json

@@ -25,7 +25,7 @@
     "prettier": "yarn workspaces foreach --since --parallel run prettier",
     "lint": "yarn workspaces foreach --all --parallel run lint",
     "test": "yarn workspaces foreach --all --parallel run test",
-    "test:ci": "yarn workspaces foreach --all --parallel run test:ci",
+    "test:ci": "yarn workspaces foreach --all --topological run test:ci",
     "coverage": "yarn workspaces foreach --all --parallel run coverage",
     "version:prepare": "yarn changeset version && yarn workspaces foreach --all --parallel run version:update && yarn install --no-immutable",
     "version:check": "yarn changeset status",

rust/Cargo.toml

@@ -193,27 +193,27 @@ cosmwasm-schema = "1.2.7"
 [workspace.dependencies.ethers]
 features = []
 git = "https://github.com/hyperlane-xyz/ethers-rs"
-tag = "2023-11-29-02"
+tag = "2024-04-25"
 
 [workspace.dependencies.ethers-contract]
 features = ["legacy"]
 git = "https://github.com/hyperlane-xyz/ethers-rs"
-tag = "2023-11-29-02"
+tag = "2024-04-25"
 
 [workspace.dependencies.ethers-core]
 features = []
 git = "https://github.com/hyperlane-xyz/ethers-rs"
-tag = "2023-11-29-02"
+tag = "2024-04-25"
 
 [workspace.dependencies.ethers-providers]
 features = []
 git = "https://github.com/hyperlane-xyz/ethers-rs"
-tag = "2023-11-29-02"
+tag = "2024-04-25"
 
 [workspace.dependencies.ethers-signers]
 features = ["aws"]
 git = "https://github.com/hyperlane-xyz/ethers-rs"
-tag = "2023-11-29-02"
+tag = "2024-04-25"
 
 [patch.crates-io.curve25519-dalek]
 branch = "v3.2.2-relax-zeroize"

rust/agents/relayer/Cargo.toml

@@ -31,7 +31,7 @@ serde.workspace = true
 serde_json.workspace = true
 strum.workspace = true
 thiserror.workspace = true
-tokio = { workspace = true, features = ["rt", "macros", "parking_lot"] }
+tokio = { workspace = true, features = ["rt", "macros", "parking_lot", "rt-multi-thread"] }
 tracing-futures.workspace = true
 tracing.workspace = true
 

rust/agents/relayer/src/main.rs

@@ -21,7 +21,7 @@ mod relayer;
 mod server;
 mod settings;
 
-#[tokio::main(flavor = "current_thread")]
+#[tokio::main(flavor = "multi_thread", worker_threads = 20)]
 async fn main() -> Result<()> {
     agent_main::<Relayer>().await
 }

rust/agents/relayer/src/msg/metadata/aggregation.rs

@@ -117,7 +117,7 @@ impl AggregationIsmMetadataBuilder {
 
 #[async_trait]
 impl MetadataBuilder for AggregationIsmMetadataBuilder {
-    #[instrument(err, skip(self))]
+    #[instrument(err, skip(self), ret)]
     async fn build(
         &self,
         ism_address: H256,