Skip to content

Commit

Permalink
Merge branch 'main' into cli-2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
cmcewen committed Jun 17, 2024
2 parents ec5d43c + acaa22c commit 70c4c28
Show file tree
Hide file tree
Showing 136 changed files with 3,178 additions and 992 deletions.
6 changes: 6 additions & 0 deletions .changeset/mean-impalas-leave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@hyperlane-xyz/core': patch
'@hyperlane-xyz/helloworld': patch
---

fix: `TokenRouter.transferRemote` with hook overrides
5 changes: 5 additions & 0 deletions .changeset/olive-geckos-behave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@hyperlane-xyz/sdk': patch
---

Do not consider xERC20 a collateral standard to fix fungibility checking logic while maintaining mint limit checking
20 changes: 0 additions & 20 deletions .changeset/pre.json

This file was deleted.

6 changes: 6 additions & 0 deletions .changeset/sixty-ducks-brush.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@hyperlane-xyz/cli': patch
'@hyperlane-xyz/sdk': patch
---

Support priorityFee fetching from RPC and some better logging
4 changes: 2 additions & 2 deletions .github/workflows/agent-release-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
runs-on: ${{ matrix.OS }}
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: ubuntu setup
if: ${{ matrix.OS == 'larger-runner' }}
run: |
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
run: chmod ug+x,-w relayer scraper validator
working-directory: rust/target/${{ matrix.TARGET }}/release
- name: upload binaries
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.TARGET }}-${{ needs.prepare.outputs.tag_sha }}-${{ needs.prepare.outputs.tag_date }}
path: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/monorepo-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: needs.check-env.outputs.gcloud-service-key == 'true'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
submodules: recursive
Expand All @@ -48,7 +48,7 @@ jobs:
echo "TAG_SHA=$(echo '${{ github.sha }}' | cut -b 1-7)" >> $GITHUB_OUTPUT
- name: Docker meta
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5
with:
# list of Docker images to use as base name for tags
images: |
Expand All @@ -59,15 +59,15 @@ jobs:
type=ref,event=pr
type=raw,value=${{ steps.taggen.outputs.TAG_SHA }}-${{ steps.taggen.outputs.TAG_DATE }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to GCR
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: gcr.io
username: _json_key
password: ${{ secrets.GCLOUD_SERVICE_KEY }}
- name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: ./
file: ./Dockerfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# check out full history
fetch-depth: 0
submodules: recursive

- name: Setup Node.js 18.x
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.x

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/rust-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
if: needs.check-env.outputs.gcloud-service-key == 'true'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- name: Generate tag data
Expand All @@ -43,7 +43,7 @@ jobs:
echo "TAG_SHA=$(echo '${{ github.sha }}' | cut -b 1-7)" >> $GITHUB_OUTPUT
- name: Docker meta
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5
with:
# list of Docker images to use as base name for tags
images: |
Expand All @@ -54,15 +54,15 @@ jobs:
type=ref,event=pr
type=raw,value=${{ steps.taggen.outputs.TAG_SHA }}-${{ steps.taggen.outputs.TAG_DATE }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to GCR
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: gcr.io
username: _json_key
password: ${{ secrets.GCLOUD_SERVICE_KEY }}
- name: Build and push
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: ./rust
file: ./rust/Dockerfile
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/rust-skipped.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ env:
jobs:
test-rs:
runs-on: ubuntu-latest

steps:
- run: 'echo "No test required" '

lint-rs:
runs-on: ubuntu-latest

steps:
- run: 'echo "No lint required" '
13 changes: 7 additions & 6 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
paths:
- 'rust/**'
- .github/workflows/rust.yml
- '!*.md'
# Support for merge queues
merge_group:
# Allows you to run this workflow manually from the Actions tab
Expand All @@ -28,7 +29,7 @@ jobs:
runs-on: larger-runner

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- uses: actions-rs/toolchain@v1
Expand All @@ -38,8 +39,8 @@ jobs:
- name: rust cache
uses: Swatinem/rust-cache@v2
with:
prefix-key: "v2-rust"
shared-key: "test"
prefix-key: 'v2-rust'
shared-key: 'test'
workspaces: |
./rust
- name: Free disk space
Expand All @@ -56,7 +57,7 @@ jobs:
runs-on: larger-runner

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- uses: actions-rs/toolchain@v1
Expand All @@ -68,8 +69,8 @@ jobs:
- name: rust cache
uses: Swatinem/rust-cache@v2
with:
prefix-key: "v2-rust"
shared-key: "lint"
prefix-key: 'v2-rust'
shared-key: 'lint'
workspaces: |
./rust
- name: Free disk space
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
submodules: recursive

- name: yarn-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
**/node_modules
Expand All @@ -35,13 +35,13 @@ jobs:
run: yarn install

- name: foundry-install
uses: onbjerg/foundry-toolchain@v1
uses: foundry-rs/foundry-toolchain@v1

- name: forge-build
run: cd solidity && forge build --build-info

- name: Static analysis
uses: crytic/slither-action@v0.3.0
uses: crytic/slither-action@v0.4.0
id: slither
with:
target: 'solidity/'
Expand All @@ -51,6 +51,6 @@ jobs:
ignore-compile: true

- name: Upload SARIF file
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: ${{ steps.slither.outputs.sarif }}
8 changes: 4 additions & 4 deletions .github/workflows/storage-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ jobs:
steps:
# Checkout the PR branch
- name: Checkout PR branch
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
submodules: recursive

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18

- name: yarn-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
**/node_modules
Expand All @@ -35,7 +35,7 @@ jobs:
run: yarn install

- name: foundry-install
uses: onbjerg/foundry-toolchain@v1
uses: foundry-rs/foundry-toolchain@v1

# Run the command on PR branch
- name: Run command on PR branch
Expand Down
109 changes: 109 additions & 0 deletions .github/workflows/test-skipped.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
name: test

on:
push:
branches: [main]
pull_request:
branches:
- '*'
paths:
- '*.md'
- '!**/*'
merge_group:

concurrency:
group: e2e-${{ github.ref }}
cancel-in-progress: ${{ github.ref_name != 'main' }}

jobs:
yarn-install:
runs-on: ubuntu-latest
steps:
- name: Instant pass
run: echo "yarn-install job passed"

yarn-build:
runs-on: ubuntu-latest
steps:
- name: Instant pass
run: echo "yarn-build job passed"

checkout-registry:
runs-on: ubuntu-latest
steps:
- name: Instant pass
run: echo "checkout-registry job passed"

lint-prettier:
runs-on: ubuntu-latest
steps:
- name: Instant pass
run: echo "lint-prettier job passed"

yarn-test:
runs-on: ubuntu-latest
steps:
- name: Instant pass
run: echo "yarn-test job passed"

agent-configs:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
environment: [mainnet3, testnet4]
steps:
- name: Instant pass
run: echo "agent-configs job passed"

e2e-matrix:
runs-on: ubuntu-latest
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'main') || github.event_name == 'merge_group'
strategy:
matrix:
e2e-type: [cosmwasm, non-cosmwasm]
steps:
- name: Instant pass
run: echo "e2e-matrix job passed"

e2e:
runs-on: ubuntu-latest
if: always()
steps:
- name: Instant pass
run: echo "e2e job passed"

cli-e2e:
runs-on: ubuntu-latest
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.base_ref == 'main') || github.event_name == 'merge_group'
strategy:
matrix:
include:
- test-type: preset_hook_enabled
- test-type: configure_hook_enabled
- test-type: pi_with_core_chain
steps:
- name: Instant pass
run: echo "cli-e2e job passed"

env-test:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
environment: [mainnet3]
chain: [ethereum, arbitrum, optimism, inevm, viction]
module: [core, igp]
include:
- environment: testnet4
chain: sepolia
module: core
steps:
- name: Instant pass
run: echo "env-test job passed"

coverage:
runs-on: ubuntu-latest
steps:
- name: Instant pass
run: echo "coverage job passed"
Loading

0 comments on commit 70c4c28

Please sign in to comment.