Merge branch 'hyperlane-xyz:main' into main

.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

.codespell/.codespellrc

@@ -0,0 +1,5 @@
+[codespell]
+skip = .git,node_modules,yarn.lock,Cargo.lock,./typescript/helloworld
+count =
+quiet-level = 3
+ignore-words = ./.codespell/ignore.txt

.codespell/ignore.txt

@@ -0,0 +1,7 @@
+crate
+receipient
+received
+receivedFrom
+ser
+readded
+re-use

.codespell/requirements.txt

@@ -0,0 +1 @@
+codespell==2.2.6

.eslintignore

@@ -1,3 +1,4 @@
 node_modules
 dist
-coverage
+coverage
+*.cts

.eslintrc

@@ -11,7 +11,7 @@
     "sourceType": "module",
     "project": "./tsconfig.json"
   },
-  "plugins": ["@typescript-eslint"],
+  "plugins": ["@typescript-eslint","jest"],
   "extends": [
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
@@ -47,6 +47,11 @@
         },
         "extendDefaults": true
       }
-    ]
+    ],
+    "jest/no-disabled-tests": "warn",
+    "jest/no-focused-tests": "error",
+    "jest/no-identical-title": "error",
+    "jest/prefer-to-have-length": "warn",
+    "jest/valid-expect": "error"
   }
 }

.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/CODEOWNERS

@@ -1,14 +1,14 @@
 # File extension owners
 
-*.sol @yorhodes @tkporter @aroralanuk
-*.ts @yorhodes @jmrossy @nambrot
+*.sol @yorhodes @tkporter @aroralanuk @nbayindirli
+*.ts @yorhodes @jmrossy @nambrot @nbayindirli
 *.rs @tkporter @daniel-savu
 *.md @Skunkchain @nambrot @avious00
 
 # Package owners
 
 ## Contracts
-solidity/ @yorhodes @tkporter @aroralanuk
+solidity/ @yorhodes @tkporter @aroralanuk @nbayindirli
 
 ## Agents
 rust/ @tkporter @daniel-savu
@@ -17,13 +17,13 @@ rust/ @tkporter @daniel-savu
 typescript/sdk @yorhodes @jmrossy
 
 ## Token
-typescript/token @yorhodes @jmrossy @tkporter @aroralanuk
+typescript/token @yorhodes @jmrossy @tkporter @aroralanuk @nbayindirli
 
 ## Hello World
 typescript/helloworld @yorhodes @nambrot
 
 ## CLI
-typescript/cli @jmrossy @yorhodes @aroralanuk
+typescript/cli @jmrossy @yorhodes @aroralanuk @nbayindirli
 
 ## Infra
 typescript/infra @tkporter @nambrot

.github/workflows/codespell.yml

@@ -0,0 +1,35 @@
+# A Github action that using codespell to check spelling.
+# see .codespell/* for configs
+# https://github.com/codespell-project/codespell
+
+name: codespell
+
+on:
+  # Triggers the workflow on push or pull request against main
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  codespell:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4
+
+      - name: pip cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          restore-keys: ${{ runner.os }}-pip-
+
+      - name: Install prerequisites
+        run: sudo pip install -r ./.codespell/requirements.txt
+
+      - name: Spell check
+        run: codespell --config=./.codespell/.codespellrc

.github/workflows/release.yml

@@ -31,7 +31,7 @@ jobs:
           node-version: 18.x
 
       - name: Install Dependencies
-        run: yarn
+        run: yarn install --immutable
 
       - name: Create Release PR or Publish to NPM
         id: changesets

.github/workflows/static-analysis.yml

@@ -1,12 +1,17 @@
 name: static-analysis
 
 on:
-  # Triggers the workflow on pull request against main
-  pull_request:
+  push:
+  # Triggers the workflow on push to main
     branches: [main]
     paths:
       - 'solidity/**'
       - '.github/workflows/static-analysis.yml'
+  # Triggers the workflow on pull request
+  pull_request:
+    paths:
+      - 'solidity/**'
+      - '.github/workflows/static-analysis.yml'
 
 jobs:
   slither:

.github/workflows/storage-analysis.yml

@@ -55,13 +55,4 @@ jobs:
 
       # Compare outputs
       - name: Compare outputs
-        continue-on-error: true # diff exits with 1 if files differ
-        run: diff --unified solidity/base-storage solidity/HEAD-storage > layout.diff
-
-      - name: Comment PR with layout diff
-        uses: yorhodes/[email protected]
-        with:
-          header: Storage Layout Diff
-          filePath: layout.diff
-          mdLanguage: diff
-          comment_tag: storagelayoutdiff
+        run: diff --unified solidity/base-storage solidity/HEAD-storage

.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:
 
@@ -14,9 +15,11 @@ concurrency:
   cancel-in-progress: ${{ github.ref_name != 'main' }}
 
 env:
-  DEBUG: 'hyperlane:*'
+  LOG_LEVEL: DEBUG
+  LOG_FORMAT: PRETTY
   CARGO_TERM_COLOR: always
   RUST_BACKTRACE: full
+  REGISTRY_URI: ../../node_modules/@hyperlane-xyz/registry/dist
 
 jobs:
   yarn-install:
@@ -132,14 +135,17 @@ jobs:
       - name: Unit Tests
         run: yarn test:ci
 
-  metadata-check:
+  agent-configs:
     runs-on: ubuntu-latest
     needs: [yarn-build]
+    strategy:
+      fail-fast: false
+      matrix:
+        environment: [mainnet3, testnet4]
     steps:
       - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
-          submodules: recursive
           fetch-depth: 0
 
       - name: yarn-cache
@@ -158,12 +164,23 @@ jobs:
             !./rust
           key: ${{ github.event.pull_request.head.sha || github.sha }}
 
-      - name: Metadata Health Check
-        run: DEBUG=hyperlane yarn workspace @hyperlane-xyz/sdk run test:metadata
+      - name: Generate ${{ matrix.environment }} agent config
+        run: |
+          cd typescript/infra
+          yarn tsx ./scripts/agents/update-agent-config.ts -e ${{ matrix.environment }}
+          CHANGES=$(git status -s)
+          if [[ ! -z $CHANGES ]]; then
+            echo "Changes found in agent config: $CHANGES"
+            exit 1
+          fi
 
-  e2e:
+  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:
+        e2e-type: [cosmwasm, non-cosmwasm]
     steps:
       - uses: actions/setup-node@v3
         with:
@@ -220,30 +237,43 @@ jobs:
             ~/.cargo
           key: ${{ runner.os }}-cargo-cache-${{ hashFiles('./rust/Cargo.lock') }}
 
-      - name: agent build
-        run: cargo build --release --bin run-locally
-        working-directory: ./rust
-
       - name: agent tests with CosmWasm
-        run: RUST_BACKTRACE=1 cargo test --release --package run-locally --bin run-locally --features cosmos -- cosmos::test --nocapture
+        run: cargo test --release --package run-locally --bin run-locally --features cosmos -- cosmos::test --nocapture
+        if: matrix.e2e-type == 'cosmwasm'
         working-directory: ./rust
+        env:
+          RUST_BACKTRACE: 'full'
 
       - name: agent tests excluding CosmWasm
-        run: ./target/release/run-locally
+        run: cargo run --release --bin run-locally
+        if: matrix.e2e-type == 'non-cosmwasm'
         working-directory: ./rust
         env:
           E2E_CI_MODE: 'true'
           E2E_CI_TIMEOUT_SEC: '600'
           E2E_KATHY_MESSAGES: '20'
+          RUST_BACKTRACE: 'full'
+
+  e2e:
+    runs-on: ubuntu-latest
+    needs: [e2e-matrix]
+    if: always() # This ensures that the job runs even if the e2e jobs fail
+    steps:
+      - name: Report Matrix Result
+        run: |
+          echo "All e2e-matrix jobs have completed."
+          # You can add additional commands here to report the result as needed
 
   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:
         include:
-          - hook: preset_hook_enabled
-          - hook: configure_hook_enabled
+          - test-type: preset_hook_enabled
+          - test-type: configure_hook_enabled
+          - test-type: pi_with_core_chain
     steps:
       - uses: actions/setup-node@v3
         with:
@@ -300,32 +330,22 @@ jobs:
             ~/.cargo
           key: ${{ runner.os }}-cargo-cache-${{ hashFiles('./rust/Cargo.lock') }}
 
-      - name: cli e2e tests with preset hook config
-        run: ./typescript/cli/ci-test.sh false
-        if: matrix.hook == 'preset_hook_enabled'
-
-      - name: cli e2e tests with configured hook config
-        run: ./typescript/cli/ci-test.sh true
-        if: matrix.hook == 'configure_hook_enabled'
+      - name: cli e2e tests
+        run: ./typescript/cli/ci-test.sh ${{ matrix.test-type }}
 
   env-test:
     runs-on: ubuntu-latest
     needs: [yarn-build]
     strategy:
+      fail-fast: false
       matrix:
+        environment: [mainnet3]
+        chain: [ethereum, arbitrum, optimism, inevm, viction]
+        module: [core, igp]
         include:
           - environment: testnet4
             chain: sepolia
             module: core
-          - environment: mainnet3
-            chain: arbitrum
-            module: core
-          - environment: mainnet3
-            chain: inevm
-            module: core
-          - environment: mainnet3
-            chain: viction
-            module: core
 
     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

.prettierrc

@@ -17,5 +17,6 @@
   "importOrder": ["^@hyperlane-xyz/(.*)$", "^../(.*)$", "^./(.*)$"],
   "importOrderSeparation": true,
   "importOrderSortSpecifiers": true,
+  "importOrderParserPlugins": ["importAssertions", "typescript", "jsx"],
   "plugins": ["prettier-plugin-solidity", "@trivago/prettier-plugin-sort-imports"]
 }