Skip to content

Commit 4f496a0

Browse files
qdm12qdm12
committed
Merge branch 'master' into libevm
2 parents 08e92ea + 8b0ef32 commit 4f496a0

37 files changed

+552
-343
lines changed

‎.envrc

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# - Will execute on entry to the containing directory only if authorized with `direnv allow`
2+
# - Requires a recent version of direnv (https://direnv.net/)
3+
# - For quieter direnv output, set `export DIRENV_LOG_FORMAT=`
4+
5+
# Determine AVALANCHE_VERSION
6+
source ./scripts/versions.sh
7+
8+
# - Starts an avalanchego dev shell
9+
# - Requires nix (https://github.com/DeterminateSystems/nix-installer?tab=readme-ov-file#install-nix)
10+
use flake "github:ava-labs/avalanchego?ref=${AVALANCHE_VERSION}"

‎.github/dependabot.yml

+4
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ updates:
99
directory: "/" # Location of package manifests
1010
schedule:
1111
interval: "daily"
12+
- package-ecosystem: github-actions
13+
directory: "/"
14+
schedule:
15+
interval: weekly

‎.github/workflows/codeql-analysis.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@v2
47+
uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 #v3.28.13
4848
with:
4949
languages: ${{ matrix.language }}
5050
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
5555
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5656
# If this step fails, then you should remove it and run the build manually (see below)
5757
- name: Autobuild
58-
uses: github/codeql-action/autobuild@v2
58+
uses: github/codeql-action/autobuild@1b549b9259bda1cb5ddde3b41741a82a2d15a841 #v3.28.13
5959

6060
# ℹ️ Command-line programs to run using the OS shell.
6161
# 📚 https://git.io/JvXDl
@@ -69,4 +69,4 @@ jobs:
6969
# make release
7070

7171
- name: Perform CodeQL Analysis
72-
uses: github/codeql-action/analyze@v2
72+
uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 #v3.28.13

‎.github/workflows/publish_antithesis_images.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@v4
2020

2121
- name: Login to GAR
22-
uses: docker/login-action@v3
22+
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 #v3.4.0
2323
with:
2424
registry: ${{ env.REGISTRY }}
2525
username: _json_key

‎.github/workflows/publish_docker.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- uses: actions/checkout@v4
28-
- uses: docker/setup-qemu-action@v3
29-
- uses: docker/setup-buildx-action@v3
28+
- uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 #v3.6.0
29+
- uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 #v3.10.0
3030
- name: Build and publish images to DockerHub
3131
env:
3232
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}

‎.github/workflows/release.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,17 @@ jobs:
4242
echo cd4f08a75577145b8f05245a2975f7c81401d75e9535dcffbb879ee1deefcbf4 tarballs/MacOSX11.3.sdk.tar.xz | sha256sum -c -
4343
UNATTENDED=1 ./build.sh
4444
echo "$PWD/target/bin" >> "$GITHUB_PATH"
45+
- name: Git checkout workflow event ref for .goreleaser.yml only
46+
uses: actions/checkout@v4
47+
with:
48+
fetch-depth: 0
49+
path: goreleaser
4550
- name: Run GoReleaser
46-
uses: goreleaser/goreleaser-action@v3
51+
uses: goreleaser/goreleaser-action@90a3faa9d0182683851fbfa97ca1a2cb983bfca3 #v6.2.1
4752
with:
4853
distribution: goreleaser
4954
version: v2.5.1
50-
args: release --clean
55+
args: release --clean --config ../goreleaser/.goreleaser.yml
5156
workdir: ./subnet-evm/
5257
env:
5358
# https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret

‎.github/workflows/tests.yml

+18-19
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
go-version-file: "go.mod"
2424
- name: golangci-lint
25-
uses: golangci/golangci-lint-action@v3
25+
uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc #v3
2626
with:
2727
version: v1.63
2828
working-directory: .
@@ -38,6 +38,11 @@ jobs:
3838
run: |
3939
go mod tidy
4040
git diff --exit-code
41+
- name: Ensure consistent avalanchego version
42+
shell: bash
43+
run: |
44+
bash -x ./scripts/update_avalanchego_version.sh
45+
git diff --exit-code
4146
4247
unit_test:
4348
name: Golang Unit Tests (${{ matrix.os }})
@@ -152,18 +157,15 @@ jobs:
152157
shell: bash
153158
run: ./scripts/build.sh
154159
- name: Run Warp E2E Tests
155-
uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@v1.11.13
160+
uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@3a6bfac46f43ac2d7cc1e3fc8576ff6a8594bafa
156161
with:
157-
run: AVALANCHEGO_BUILD_PATH=/tmp/e2e-test/avalanchego ./scripts/run_ginkgo_warp.sh
158-
prometheus_id: ${{ secrets.PROMETHEUS_ID || '' }}
162+
run: ./scripts/run_ginkgo_warp.sh
163+
run_env: AVALANCHEGO_BUILD_PATH=/tmp/e2e-test/avalanchego
164+
artifact_prefix: warp
165+
prometheus_username: ${{ secrets.PROMETHEUS_ID || '' }}
159166
prometheus_password: ${{ secrets.PROMETHEUS_PASSWORD || '' }}
160-
loki_id: ${{ secrets.LOKI_ID || '' }}
167+
loki_username: ${{ secrets.LOKI_ID || '' }}
161168
loki_password: ${{ secrets.LOKI_PASSWORD || '' }}
162-
- name: Upload tmpnet network dir for warp testing
163-
uses: ava-labs/avalanchego/.github/actions/upload-tmpnet-artifact@v1-actions
164-
if: always()
165-
with:
166-
name: warp-tmpnet-data
167169
e2e_load:
168170
name: e2e load tests
169171
runs-on: ubuntu-latest
@@ -183,18 +185,15 @@ jobs:
183185
shell: bash
184186
run: ./scripts/build.sh
185187
- name: Run E2E Load Tests
186-
uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@v1.11.13
188+
uses: ava-labs/avalanchego/.github/actions/run-monitored-tmpnet-cmd@3a6bfac46f43ac2d7cc1e3fc8576ff6a8594bafa
187189
with:
188-
run: AVALANCHEGO_BUILD_PATH=/tmp/e2e-test/avalanchego ./scripts/run_ginkgo_load.sh
189-
prometheus_id: ${{ secrets.PROMETHEUS_ID || '' }}
190+
run: ./scripts/run_ginkgo_load.sh
191+
run_env: AVALANCHEGO_BUILD_PATH=/tmp/e2e-test/avalanchego
192+
artifact_prefix: load
193+
prometheus_username: ${{ secrets.PROMETHEUS_ID || '' }}
190194
prometheus_password: ${{ secrets.PROMETHEUS_PASSWORD || '' }}
191-
loki_id: ${{ secrets.LOKI_ID || '' }}
195+
loki_username: ${{ secrets.LOKI_ID || '' }}
192196
loki_password: ${{ secrets.LOKI_PASSWORD || '' }}
193-
- name: Upload tmpnet network dir for load testing
194-
uses: ava-labs/avalanchego/.github/actions/upload-tmpnet-artifact@v1-actions
195-
if: always()
196-
with:
197-
name: load-tmpnet-data
198197
test_build_image:
199198
name: Image build
200199
runs-on: ubuntu-latest

‎.github/workflows/trigger-antithesis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
name: Run Antithesis
3131
runs-on: ubuntu-latest
3232
steps:
33-
- uses: antithesishq/antithesis-trigger-action@v0.5
33+
- uses: antithesishq/antithesis-trigger-action@b7d0c9d1d9316bd4de73a44144c56636ea3a64ba #v0.8
3434
with:
3535
notebook_name: avalanche
3636
tenant: avalanche

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,5 @@ diffs/
5858

5959
# clone used for antithesis image builds
6060
avalanchego/
61+
62+
.direnv

‎.goreleaser.yml

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
version: 2
12
# ref. https://goreleaser.com/customization/build/
23
builds:
34
- id: subnet-evm
@@ -37,3 +38,8 @@ release:
3738
github:
3839
owner: ava-labs
3940
name: subnet-evm
41+
42+
git:
43+
# Avoid picking the wrong tag when there is an RC tag and a non-RC tag
44+
# pointing to the same commit.
45+
prerelease_suffix: "-rc"

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
ARG AVALANCHEGO_NODE_IMAGE="invalid-image"
55

66
# ============= Compilation Stage ================
7-
FROM --platform=$BUILDPLATFORM golang:1.23.6-bullseye AS builder
7+
FROM --platform=$BUILDPLATFORM golang:1.23.6-bookworm AS builder
88

99
WORKDIR /build
1010

‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ The Subnet EVM runs in a separate process from the main AvalancheGo process and
2121
[v0.7.0] [email protected] (Protocol Version: 38)
2222
[v0.7.1] [email protected] (Protocol Version: 39)
2323
[v0.7.2] [email protected]/1.13.0-fuji (Protocol Version: 39)
24+
[v0.7.3] [email protected]/1.13.0 (Protocol Version: 39)
2425
```
2526

2627
## API

‎bin/ginkgo

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
# Ensure the go command is run from the root of the repository so that its go.mod file is used
6+
REPO_ROOT=$(cd "$( dirname "${BASH_SOURCE[0]}" )"; cd .. && pwd )
7+
cd "${REPO_ROOT}"
8+
9+
# If an explicit version is not specified, go run uses the ginkgo version from go.mod
10+
go run github.com/onsi/ginkgo/v2/ginkgo "${@}"

‎bin/tmpnetctl

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
# Ensure the go command is run from the root of the repository
6+
REPO_ROOT=$(cd "$( dirname "${BASH_SOURCE[0]}" )"; cd .. && pwd )
7+
cd "${REPO_ROOT}"
8+
9+
# Set AVALANCHE_VERSION
10+
. ./scripts/versions.sh
11+
12+
echo "Running tmpnetctl @ ${AVALANCHE_VERSION}"
13+
go run github.com/ava-labs/avalanchego/tests/fixture/tmpnet/tmpnetctl@"${AVALANCHE_VERSION}" "${@}"

‎compatibility.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"rpcChainVMProtocolVersion": {
3+
"v0.7.3": 39,
34
"v0.7.2": 39,
45
"v0.7.1": 39,
56
"v0.7.0": 38

‎contracts/package-lock.json

+8-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

+11-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.6
55
require (
66
github.com/VictoriaMetrics/fastcache v1.12.1
77
github.com/antithesishq/antithesis-sdk-go v0.3.8
8-
github.com/ava-labs/avalanchego v1.12.3-rc.1.0.20250326132201-73294af08342
8+
github.com/ava-labs/avalanchego v1.13.1-0.20250327151600-3a6bfac46f43
99
github.com/ava-labs/libevm v1.13.14-0.2.0.rc.4
1010
github.com/davecgh/go-spew v1.1.1
1111
github.com/deckarep/golang-set/v2 v2.1.0
@@ -32,10 +32,10 @@ require (
3232
go.uber.org/goleak v1.3.0
3333
go.uber.org/mock v0.5.0
3434
go.uber.org/zap v1.26.0
35-
golang.org/x/crypto v0.32.0
35+
golang.org/x/crypto v0.35.0
3636
golang.org/x/exp v0.0.0-20241215155358-4a5509556b9e
3737
golang.org/x/mod v0.22.0
38-
golang.org/x/sync v0.10.0
38+
golang.org/x/sync v0.11.0
3939
golang.org/x/time v0.3.0
4040
golang.org/x/tools v0.29.0
4141
google.golang.org/protobuf v1.35.2
@@ -46,8 +46,8 @@ require (
4646
github.com/DataDog/zstd v1.5.2 // indirect
4747
github.com/Microsoft/go-winio v0.6.1 // indirect
4848
github.com/NYTimes/gziphandler v1.1.1 // indirect
49-
github.com/StephenButtolph/canoto v0.10.0 // indirect
50-
github.com/ava-labs/coreth v0.14.1-rc.3.0.20250326124329-8ee70dc0f37c // indirect
49+
github.com/StephenButtolph/canoto v0.15.0 // indirect
50+
github.com/ava-labs/coreth v0.15.0-rc.1.0.20250331083503-0d68be6b92be // indirect
5151
github.com/beorn7/perks v1.0.1 // indirect
5252
github.com/bits-and-blooms/bitset v1.10.0 // indirect
5353
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
@@ -101,6 +101,7 @@ require (
101101
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
102102
github.com/hashicorp/hcl v1.0.0 // indirect
103103
github.com/huin/goupnp v1.3.0 // indirect
104+
github.com/imdario/mergo v0.3.16 // indirect
104105
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
105106
github.com/josharian/intern v1.0.0 // indirect
106107
github.com/json-iterator/go v1.1.12 // indirect
@@ -140,7 +141,7 @@ require (
140141
github.com/spf13/jwalterweatherman v1.1.0 // indirect
141142
github.com/status-im/keycard-go v0.2.0 // indirect
142143
github.com/subosito/gotenv v1.3.0 // indirect
143-
github.com/supranational/blst v0.3.13 // indirect
144+
github.com/supranational/blst v0.3.14 // indirect
144145
github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect
145146
github.com/tklauser/go-sysconf v0.3.12 // indirect
146147
github.com/tklauser/numcpus v0.6.1 // indirect
@@ -155,11 +156,11 @@ require (
155156
go.opentelemetry.io/otel/trace v1.22.0 // indirect
156157
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
157158
go.uber.org/multierr v1.11.0 // indirect
158-
golang.org/x/net v0.34.0 // indirect
159+
golang.org/x/net v0.36.0 // indirect
159160
golang.org/x/oauth2 v0.21.0 // indirect
160-
golang.org/x/sys v0.29.0 // indirect
161-
golang.org/x/term v0.28.0 // indirect
162-
golang.org/x/text v0.21.0 // indirect
161+
golang.org/x/sys v0.30.0 // indirect
162+
golang.org/x/term v0.29.0 // indirect
163+
golang.org/x/text v0.22.0 // indirect
163164
gonum.org/v1/gonum v0.11.0 // indirect
164165
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
165166
google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed // indirect

0 commit comments

Comments
 (0)