From 2136604f81f6cf690726e6da1c47165a298b5047 Mon Sep 17 00:00:00 2001 From: Ceyhun Onur Date: Thu, 30 Jan 2025 00:39:20 +0300 Subject: [PATCH] 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 --- Dockerfile | 2 +- README.md | 15 +-------------- compatibility.json | 17 ++--------------- go.mod | 5 ++--- go.sum | 10 ++++------ scripts/build_antithesis_images.sh | 2 +- scripts/versions.sh | 2 +- tests/antithesis/gencomposeconfig/main.go | 5 +---- 8 files changed, 13 insertions(+), 45 deletions(-) diff --git a/Dockerfile b/Dockerfile index 047144d21a..c4e2f97757 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG AVALANCHEGO_NODE_IMAGE # ============= Compilation Stage ================ -FROM golang:1.22.8-bullseye AS builder +FROM --platform=$BUILDPLATFORM golang:1.22.8-bullseye AS builder WORKDIR /build diff --git a/README.md b/README.md index 9b22a32acc..5b1d910030 100644 --- a/README.md +++ b/README.md @@ -18,21 +18,8 @@ The Subnet EVM runs in a separate process from the main AvalancheGo process and ### AvalancheGo Compatibility ```text -[v0.6.0] AvalancheGo@v1.11.0-v1.11.1 (Protocol Version: 33) -[v0.6.1] AvalancheGo@v1.11.0-v1.11.1 (Protocol Version: 33) -[v0.6.2] AvalancheGo@v1.11.2 (Protocol Version: 34) -[v0.6.3] AvalancheGo@v1.11.3-v1.11.9 (Protocol Version: 35) -[v0.6.4] AvalancheGo@v1.11.3-v1.11.9 (Protocol Version: 35) -[v0.6.5] AvalancheGo@v1.11.3-v1.11.9 (Protocol Version: 35) -[v0.6.6] AvalancheGo@v1.11.3-v1.11.9 (Protocol Version: 35) -[v0.6.7] AvalancheGo@v1.11.3-v1.11.9 (Protocol Version: 35) -[v0.6.8] AvalancheGo@v1.11.10 (Protocol Version: 36) -[v0.6.9] AvalancheGo@v1.11.11-v1.11.12 (Protocol Version: 37) -[v0.6.10] AvalancheGo@v1.11.11-v1.11.12 (Protocol Version: 37) -[v0.6.11] AvalancheGo@v1.11.11-v1.11.12 (Protocol Version: 37) -[v0.6.12] AvalancheGo@v1.11.13/v1.12.0 (Protocol Version: 38) [v0.7.0] AvalancheGo@v1.12.0-v1.12.1 (Protocol Version: 38) -[v0.7.1] AvalancheGo@v1.12.0-v1.12.1 (Protocol Version: 38) +[v0.7.1] AvalancheGo@v1.12.2 (Protocol Version: 39) ``` ## API diff --git a/compatibility.json b/compatibility.json index 435fda56ee..c3090f5746 100644 --- a/compatibility.json +++ b/compatibility.json @@ -1,19 +1,6 @@ { "rpcChainVMProtocolVersion": { - "v0.7.1": 38, - "v0.7.0": 38, - "v0.6.12": 38, - "v0.6.11": 37, - "v0.6.10": 37, - "v0.6.9": 37, - "v0.6.8": 36, - "v0.6.7": 35, - "v0.6.6": 35, - "v0.6.5": 35, - "v0.6.4": 35, - "v0.6.3": 35, - "v0.6.2": 34, - "v0.6.1": 33, - "v0.6.0": 33 + "v0.7.1": 39, + "v0.7.0": 38 } } \ No newline at end of file diff --git a/go.mod b/go.mod index 51f5f085c2..13197720b3 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.8 require ( github.com/VictoriaMetrics/fastcache v1.12.1 github.com/antithesishq/antithesis-sdk-go v0.3.8 - github.com/ava-labs/avalanchego v1.12.2-0.20250116172728-54d8b06b8625 + github.com/ava-labs/avalanchego v1.12.2 github.com/cespare/cp v0.1.0 github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 github.com/davecgh/go-spew v1.1.1 @@ -57,7 +57,7 @@ require ( require ( github.com/DataDog/zstd v1.5.2 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect - github.com/ava-labs/coreth v0.14.1-0.20241230191223-351149733d35 // indirect + github.com/ava-labs/coreth v0.14.1-rc.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bits-and-blooms/bitset v1.10.0 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect @@ -121,7 +121,6 @@ require ( github.com/mr-tron/base58 v1.2.0 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect - github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.5 // indirect diff --git a/go.sum b/go.sum index 49e81af762..cb8666e5e8 100644 --- a/go.sum +++ b/go.sum @@ -60,10 +60,10 @@ github.com/antithesishq/antithesis-sdk-go v0.3.8/go.mod h1:IUpT2DPAKh6i/YhSbt6Gl github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/ava-labs/avalanchego v1.12.2-0.20250116172728-54d8b06b8625 h1:sbmfwhpetCKI7Unzw9jJ+2HWLRFM7vq7th0pH2LclCQ= -github.com/ava-labs/avalanchego v1.12.2-0.20250116172728-54d8b06b8625/go.mod h1:oK/C7ZGo5cAEayBKBoawh2EpOo3E9gD1rpd9NAM0RkQ= -github.com/ava-labs/coreth v0.14.1-0.20241230191223-351149733d35 h1:qBNnMleaJ7yWjNiDdV7wIf/e/PxubB+Ww7Mfx4QN4p8= -github.com/ava-labs/coreth v0.14.1-0.20241230191223-351149733d35/go.mod h1:nvQqJem4MuE0pU93aqBPsaEZx9NnXT0lI8d6rrQS5uY= +github.com/ava-labs/avalanchego v1.12.2 h1:vZroUgB5xMMczDQnw9etDD1XhZsejFlKky+ZZv8wOKc= +github.com/ava-labs/avalanchego v1.12.2/go.mod h1:uEDLbAUPcGCfDWW680rVfysEofUe/jWte5qQk0j5hMs= +github.com/ava-labs/coreth v0.14.1-rc.1 h1:U72XlRm/fKyASmjThsWzfO/ZRvu1kaONFaX+KdJNxIc= +github.com/ava-labs/coreth v0.14.1-rc.1/go.mod h1:lxDSXLcrszMo0N/PVJzfZ//H+bRwXF/KQWtpEYgXZqM= github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= 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 github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d h1:AREM5mwr4u1ORQBMvzfzBgpsctsbQikCVpvC+tX285E= -github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= diff --git a/scripts/build_antithesis_images.sh b/scripts/build_antithesis_images.sh index 13bad83552..b195af6785 100755 --- a/scripts/build_antithesis_images.sh +++ b/scripts/build_antithesis_images.sh @@ -54,7 +54,7 @@ echo "Generating compose configuration" gen_antithesis_compose_config "${IMAGE_TAG}" "${SUBNET_EVM_PATH}/tests/antithesis/gencomposeconfig" \ "${SUBNET_EVM_PATH}/build/antithesis" \ "AVALANCHEGO_PATH=${AVALANCHEGO_CLONE_PATH}/build/avalanchego \ - AVALANCHEGO_PLUGIN_DIR=${DEFAULT_PLUGIN_DIR}" + AVAGO_PLUGIN_DIR=${DEFAULT_PLUGIN_DIR}" build_antithesis_images "${GO_VERSION}" "${IMAGE_PREFIX}" "antithesis-subnet-evm" "${IMAGE_TAG}" \ "${AVALANCHEGO_IMAGE_TAG}" "${SUBNET_EVM_PATH}/tests/antithesis/Dockerfile" \ diff --git a/scripts/versions.sh b/scripts/versions.sh index 0b985012de..2f0a46f660 100644 --- a/scripts/versions.sh +++ b/scripts/versions.sh @@ -4,5 +4,5 @@ # shellcheck disable=SC2034 # Don't export them as they're used in the context of other calls -AVALANCHE_VERSION=${AVALANCHE_VERSION:-'54d8b06b'} +AVALANCHE_VERSION=${AVALANCHE_VERSION:-'v1.12.2'} GINKGO_VERSION=${GINKGO_VERSION:-'v2.2.0'} diff --git a/tests/antithesis/gencomposeconfig/main.go b/tests/antithesis/gencomposeconfig/main.go index 40cbf0037d..adc01df71f 100644 --- a/tests/antithesis/gencomposeconfig/main.go +++ b/tests/antithesis/gencomposeconfig/main.go @@ -32,10 +32,7 @@ func main() { utils.NewTmpnetSubnet("subnet-evm", genesisPath, utils.DefaultChainConfig, network.Nodes...), } - // Path to the plugin dir on subnet-evm node images that will be run by docker compose. - runtimePluginDir := "/avalanchego/build/plugins" - - if err := antithesis.GenerateComposeConfig(network, baseImageName, runtimePluginDir); err != nil { + if err := antithesis.GenerateComposeConfig(network, baseImageName); err != nil { log.Fatalf("failed to generate compose config: %v", err) } }