Skip to content

Commit 2136604

Browse files
ceyonurceyonur
authored
bump avalanchego to v1.12.2 (#1436)
* bump avalanchego to v1.12.2 * remove unneeded var * fix antithesis images * add cross-compile setup to dockerfile * use build_env.sh in Dockerfile * export variables * remove build_env.sh from Dockerfile * remove comment * revert
1 parent dc60ff7 commit 2136604

File tree

8 files changed

+13
-45
lines changed

8 files changed

+13
-45
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
ARG AVALANCHEGO_NODE_IMAGE
66

77
# ============= Compilation Stage ================
8-
FROM golang:1.22.8-bullseye AS builder
8+
FROM --platform=$BUILDPLATFORM golang:1.22.8-bullseye AS builder
99

1010
WORKDIR /build
1111

‎README.md

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,8 @@ The Subnet EVM runs in a separate process from the main AvalancheGo process and
1818
### AvalancheGo Compatibility
1919

2020
```text
21-
[v0.6.0] [email protected] (Protocol Version: 33)
22-
[v0.6.1] [email protected] (Protocol Version: 33)
23-
[v0.6.2] [email protected] (Protocol Version: 34)
24-
[v0.6.3] [email protected] (Protocol Version: 35)
25-
[v0.6.4] [email protected] (Protocol Version: 35)
26-
[v0.6.5] [email protected] (Protocol Version: 35)
27-
[v0.6.6] [email protected] (Protocol Version: 35)
28-
[v0.6.7] [email protected] (Protocol Version: 35)
29-
[v0.6.8] [email protected] (Protocol Version: 36)
30-
[v0.6.9] [email protected] (Protocol Version: 37)
31-
[v0.6.10] [email protected] (Protocol Version: 37)
32-
[v0.6.11] [email protected] (Protocol Version: 37)
33-
[v0.6.12] [email protected]/v1.12.0 (Protocol Version: 38)
3421
[v0.7.0] [email protected] (Protocol Version: 38)
35-
[v0.7.1] [email protected].0-v1.12.1 (Protocol Version: 38)
22+
[v0.7.1] [email protected].2 (Protocol Version: 39)
3623
```
3724

3825
## API

‎compatibility.json

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
11
{
22
"rpcChainVMProtocolVersion": {
3-
"v0.7.1": 38,
4-
"v0.7.0": 38,
5-
"v0.6.12": 38,
6-
"v0.6.11": 37,
7-
"v0.6.10": 37,
8-
"v0.6.9": 37,
9-
"v0.6.8": 36,
10-
"v0.6.7": 35,
11-
"v0.6.6": 35,
12-
"v0.6.5": 35,
13-
"v0.6.4": 35,
14-
"v0.6.3": 35,
15-
"v0.6.2": 34,
16-
"v0.6.1": 33,
17-
"v0.6.0": 33
3+
"v0.7.1": 39,
4+
"v0.7.0": 38
185
}
196
}

‎go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22.8
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.2-0.20250116172728-54d8b06b8625
8+
github.com/ava-labs/avalanchego v1.12.2
99
github.com/cespare/cp v0.1.0
1010
github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233
1111
github.com/davecgh/go-spew v1.1.1
@@ -57,7 +57,7 @@ require (
5757
require (
5858
github.com/DataDog/zstd v1.5.2 // indirect
5959
github.com/NYTimes/gziphandler v1.1.1 // indirect
60-
github.com/ava-labs/coreth v0.14.1-0.20241230191223-351149733d35 // indirect
60+
github.com/ava-labs/coreth v0.14.1-rc.1 // indirect
6161
github.com/beorn7/perks v1.0.1 // indirect
6262
github.com/bits-and-blooms/bitset v1.10.0 // indirect
6363
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
@@ -121,7 +121,6 @@ require (
121121
github.com/mr-tron/base58 v1.2.0 // indirect
122122
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
123123
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
124-
github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d // indirect
125124
github.com/opencontainers/go-digest v1.0.0 // indirect
126125
github.com/pelletier/go-toml v1.9.5 // indirect
127126
github.com/pelletier/go-toml/v2 v2.0.5 // indirect

‎go.sum

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ github.com/antithesishq/antithesis-sdk-go v0.3.8/go.mod h1:IUpT2DPAKh6i/YhSbt6Gl
6060
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
6161
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
6262
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
63-
github.com/ava-labs/avalanchego v1.12.2-0.20250116172728-54d8b06b8625 h1:sbmfwhpetCKI7Unzw9jJ+2HWLRFM7vq7th0pH2LclCQ=
64-
github.com/ava-labs/avalanchego v1.12.2-0.20250116172728-54d8b06b8625/go.mod h1:oK/C7ZGo5cAEayBKBoawh2EpOo3E9gD1rpd9NAM0RkQ=
65-
github.com/ava-labs/coreth v0.14.1-0.20241230191223-351149733d35 h1:qBNnMleaJ7yWjNiDdV7wIf/e/PxubB+Ww7Mfx4QN4p8=
66-
github.com/ava-labs/coreth v0.14.1-0.20241230191223-351149733d35/go.mod h1:nvQqJem4MuE0pU93aqBPsaEZx9NnXT0lI8d6rrQS5uY=
63+
github.com/ava-labs/avalanchego v1.12.2 h1:vZroUgB5xMMczDQnw9etDD1XhZsejFlKky+ZZv8wOKc=
64+
github.com/ava-labs/avalanchego v1.12.2/go.mod h1:uEDLbAUPcGCfDWW680rVfysEofUe/jWte5qQk0j5hMs=
65+
github.com/ava-labs/coreth v0.14.1-rc.1 h1:U72XlRm/fKyASmjThsWzfO/ZRvu1kaONFaX+KdJNxIc=
66+
github.com/ava-labs/coreth v0.14.1-rc.1/go.mod h1:lxDSXLcrszMo0N/PVJzfZ//H+bRwXF/KQWtpEYgXZqM=
6767
github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
6868
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
6969
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
@@ -474,8 +474,6 @@ github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5Vgl
474474
github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
475475
github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
476476
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
477-
github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d h1:AREM5mwr4u1ORQBMvzfzBgpsctsbQikCVpvC+tX285E=
478-
github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
479477
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
480478
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
481479
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=

‎scripts/build_antithesis_images.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ echo "Generating compose configuration"
5454
gen_antithesis_compose_config "${IMAGE_TAG}" "${SUBNET_EVM_PATH}/tests/antithesis/gencomposeconfig" \
5555
"${SUBNET_EVM_PATH}/build/antithesis" \
5656
"AVALANCHEGO_PATH=${AVALANCHEGO_CLONE_PATH}/build/avalanchego \
57-
AVALANCHEGO_PLUGIN_DIR=${DEFAULT_PLUGIN_DIR}"
57+
AVAGO_PLUGIN_DIR=${DEFAULT_PLUGIN_DIR}"
5858

5959
build_antithesis_images "${GO_VERSION}" "${IMAGE_PREFIX}" "antithesis-subnet-evm" "${IMAGE_TAG}" \
6060
"${AVALANCHEGO_IMAGE_TAG}" "${SUBNET_EVM_PATH}/tests/antithesis/Dockerfile" \

‎scripts/versions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
# shellcheck disable=SC2034
55

66
# Don't export them as they're used in the context of other calls
7-
AVALANCHE_VERSION=${AVALANCHE_VERSION:-'54d8b06b'}
7+
AVALANCHE_VERSION=${AVALANCHE_VERSION:-'v1.12.2'}
88
GINKGO_VERSION=${GINKGO_VERSION:-'v2.2.0'}

‎tests/antithesis/gencomposeconfig/main.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@ func main() {
3232
utils.NewTmpnetSubnet("subnet-evm", genesisPath, utils.DefaultChainConfig, network.Nodes...),
3333
}
3434

35-
// Path to the plugin dir on subnet-evm node images that will be run by docker compose.
36-
runtimePluginDir := "/avalanchego/build/plugins"
37-
38-
if err := antithesis.GenerateComposeConfig(network, baseImageName, runtimePluginDir); err != nil {
35+
if err := antithesis.GenerateComposeConfig(network, baseImageName); err != nil {
3936
log.Fatalf("failed to generate compose config: %v", err)
4037
}
4138
}

0 commit comments

Comments
 (0)