Merge branch 'main' into noah/dr-eoa

.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

@@ -346,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

.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/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/relayer.rs

@@ -365,7 +365,7 @@ impl Relayer {
                 .sync("dispatched_messages", cursor)
                 .await
         })
-        .instrument(info_span!("ContractSync"))
+        .instrument(info_span!("MessageSync"))
     }
 
     async fn run_interchain_gas_payment_sync(
@@ -380,7 +380,7 @@ impl Relayer {
             .clone();
         let cursor = contract_sync.cursor(index_settings).await;
         tokio::spawn(async move { contract_sync.clone().sync("gas_payments", cursor).await })
-            .instrument(info_span!("ContractSync"))
+            .instrument(info_span!("IgpSync"))
     }
 
     async fn run_merkle_tree_hook_syncs(
@@ -391,7 +391,7 @@ impl Relayer {
         let contract_sync = self.merkle_tree_hook_syncs.get(origin).unwrap().clone();
         let cursor = contract_sync.cursor(index_settings).await;
         tokio::spawn(async move { contract_sync.clone().sync("merkle_tree_hook", cursor).await })
-            .instrument(info_span!("ContractSync"))
+            .instrument(info_span!("MerkleTreeHookSync"))
     }
 
     fn run_message_processor(

solidity/.gitignore

@@ -14,3 +14,4 @@ forge-cache
 docs
 flattened/
 buildArtifact.json
+fixtures/

solidity/README.md

@@ -6,14 +6,30 @@ Hyperlane Core contains the contracts and typechain artifacts for the Hyperlane
 
 ```bash
 # Install with NPM
-npm install @hyperlane-xyz/utils
+npm install @hyperlane-xyz/core
 
 # Or with Yarn
-yarn add @hyperlane-xyz/utils
+yarn add @hyperlane-xyz/core
 ```
 
 Note, this package uses [ESM Modules](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c#pure-esm-package)
 
+## Build
+
+```bash
+yarn build
+```
+
+## Test
+
+```bash
+yarn test
+```
+
+### Fixtures
+
+Some forge tests may generate fixtures in the [fixtures](./fixtures/) directory. This allows [SDK](../typescript/sdk) tests to leverage forge fuzzing. These are git ignored and should not be committed.
+
 ## License
 
 Apache 2.0