Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
armanthepythonguy authored Feb 6, 2024
2 parents d6b51d7 + 0ff3e2b commit d22756a
Show file tree
Hide file tree
Showing 86 changed files with 1,512 additions and 584 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/agent-release-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
run: |
sudo apt-get update -qq
sudo apt-get install -qq crossbuild-essential-arm64 crossbuild-essential-armhf
# some additional configuration for cross-compilation on linux
cat >>~/.cargo/config <<EOF
[target.aarch64-unknown-linux-gnu]
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/monorepo-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
submodules: recursive

- name: Generate tag data
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/rust-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- name: Generate tag data
id: taggen
run: |
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
Expand All @@ -54,6 +56,8 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
submodules: recursive

- name: yarn-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/storage-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Checkout PR branch
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
ref: ${{ github.event.pull_request.head.sha || github.sha }}
submodules: recursive

- uses: actions/setup-node@v3
Expand Down
28 changes: 20 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:

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

- name: yarn-cache
Expand All @@ -54,6 +55,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
submodules: recursive
fetch-depth: 0

Expand All @@ -71,7 +73,7 @@ jobs:
path: |
./*
!./rust
key: ${{ github.sha }}
key: ${{ github.event.pull_request.head.sha || github.sha }}

- name: build
run: yarn build
Expand All @@ -82,6 +84,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
# check out full history
fetch-depth: 0

Expand Down Expand Up @@ -111,6 +114,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
submodules: recursive
fetch-depth: 0

Expand All @@ -123,7 +127,7 @@ jobs:
path: |
./*
!./rust
key: ${{ github.sha }}
key: ${{ github.event.pull_request.head.sha || github.sha }}

- name: Unit Tests
run: yarn test:ci
Expand All @@ -134,6 +138,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
submodules: recursive
fetch-depth: 0

Expand All @@ -151,7 +156,7 @@ jobs:
path: |
./*
!./rust
key: ${{ github.sha }}
key: ${{ github.event.pull_request.head.sha || github.sha }}

- name: Metadata Health Check
run: yarn workspace @hyperlane-xyz/sdk run test:metadata
Expand All @@ -166,6 +171,7 @@ jobs:

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

- name: foundry-install
Expand Down Expand Up @@ -205,7 +211,7 @@ jobs:
path: |
./*
!./rust
key: ${{ github.sha }}
key: ${{ github.event.pull_request.head.sha || github.sha }}

- name: cargo-cache
uses: actions/cache@v3
Expand Down Expand Up @@ -238,19 +244,24 @@ jobs:
needs: [yarn-build]
strategy:
matrix:
environment: [testnet4, mainnet3]
module: [core, igp, helloworld]
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
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}

- name: foundry-install
uses: onbjerg/foundry-toolchain@v1
Expand All @@ -261,7 +272,7 @@ jobs:
path: |
./*
!./rust
key: ${{ github.sha }}
key: ${{ github.event.pull_request.head.sha || github.sha }}

- name: Fork test ${{ matrix.environment }} ${{ matrix.module }} ${{ matrix.chain }} deployment
run: cd typescript/infra && ./fork.sh ${{ matrix.environment }} ${{ matrix.module }} ${{ matrix.chain }}
Expand All @@ -273,6 +284,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha || github.sha }}
fetch-depth: 0

- name: yarn-cache
Expand All @@ -289,7 +301,7 @@ jobs:
path: |
./*
!./rust
key: ${{ github.sha }}
key: ${{ github.event.pull_request.head.sha || github.sha }}

- name: foundry-install
uses: onbjerg/foundry-toolchain@v1
Expand Down
70 changes: 31 additions & 39 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ bech32 = "0.9.1"
elliptic-curve = "0.12.3"
getrandom = { version = "0.2", features = ["js"] }
hex = "0.4.3"
hpl-interface = "=0.0.6-rc3"
http = "*"
hyper = "0.14"
hyper-tls = "0.5.0"
hyperlane-cosmwasm-interface = "=0.0.6-rc6"
injective-protobuf = "0.2.2"
injective-std = "0.1.5"
itertools = "0.11.0"
itertools = "*"
jobserver = "=0.1.26"
jsonrpc-core = "18.0"
k256 = { version = "0.13.1", features = ["std", "ecdsa"] }
Expand Down
6 changes: 6 additions & 0 deletions rust/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,12 @@ cargo run --release --bin run-locally
This will automatically build the agents, start a local node, build and deploy the contracts, and run a relayer and
validator. By default, this test will run indefinitely, but can be stopped with `ctrl-c`.

To run the tests for a specific VM, use the `--features` flag.

```bash
cargo test --release --package run-locally --bin run-locally --features cosmos -- cosmos::test --nocapture
```

### Building Agent Docker Images

There exists a docker build for the agent binaries. These docker images are used for deploying the agents in a
Expand Down
2 changes: 1 addition & 1 deletion rust/agents/relayer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ tokio = { workspace = true, features = ["rt", "macros", "parking_lot"] }
tracing-futures.workspace = true
tracing.workspace = true

hyperlane-core = { path = "../../hyperlane-core", features = ["agent"] }
hyperlane-core = { path = "../../hyperlane-core", features = ["agent", "fallback-provider"] }
hyperlane-base = { path = "../../hyperlane-base" }
hyperlane-ethereum = { path = "../../chains/hyperlane-ethereum" }

Expand Down
2 changes: 1 addition & 1 deletion rust/agents/validator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ tokio = { workspace = true, features = ["rt", "macros", "parking_lot"] }
tracing-futures.workspace = true
tracing.workspace = true

hyperlane-core = { path = "../../hyperlane-core", features = ["agent"] }
hyperlane-core = { path = "../../hyperlane-core", features = ["agent", "fallback-provider"] }
hyperlane-base = { path = "../../hyperlane-base" }
hyperlane-ethereum = { path = "../../chains/hyperlane-ethereum" }
hyperlane-cosmos = { path = "../../chains/hyperlane-cosmos" }
Expand Down
Loading

0 comments on commit d22756a

Please sign in to comment.