From 47eb0a49af2bded80e67320d99fc77048ca7b98f Mon Sep 17 00:00:00 2001 From: Maru Newby Date: Tue, 27 Aug 2024 19:05:06 -0700 Subject: [PATCH 1/2] [antithesis] Update antithesis image build for nested module compatibility --- Dockerfile | 2 +- avalanche/go.mod | 2 +- avalanche/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- scripts/build_antithesis_images.sh | 2 +- scripts/build_antithesis_workload.sh | 4 +++- scripts/versions.sh | 2 +- 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2b08a3d49c..9903ef89f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN [ -d ./build ] && rm -rf ./build/* || true ARG SUBNET_EVM_COMMIT ARG CURRENT_BRANCH -RUN export SUBNET_EVM_COMMIT=$SUBNET_EVM_COMMIT && export CURRENT_BRANCH=$CURRENT_BRANCH && ./scripts/build.sh build/subnet-evm +RUN export SUBNET_EVM_COMMIT=$SUBNET_EVM_COMMIT && export CURRENT_BRANCH=$CURRENT_BRANCH && ./scripts/build.sh /build/build/subnet-evm # ============= Cleanup Stage ================ FROM $AVALANCHEGO_NODE_IMAGE AS builtImage diff --git a/avalanche/go.mod b/avalanche/go.mod index faf298ddf8..6082544b0a 100644 --- a/avalanche/go.mod +++ b/avalanche/go.mod @@ -4,7 +4,7 @@ go 1.21.12 require ( github.com/antithesishq/antithesis-sdk-go v0.3.8 - github.com/ava-labs/avalanchego v1.11.11-0.20240821175119-35c66e33f0dc + github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828021418-51e54a5e3295 github.com/ava-labs/subnet-evm v0.0.0 github.com/ethereum/go-ethereum v1.13.8 github.com/go-cmd/cmd v1.4.1 diff --git a/avalanche/go.sum b/avalanche/go.sum index b737fa7fe2..7f97c045df 100644 --- a/avalanche/go.sum +++ b/avalanche/go.sum @@ -58,8 +58,8 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax github.com/antithesishq/antithesis-sdk-go v0.3.8 h1:OvGoHxIcOXFJLyn9IJQ5DzByZ3YVAWNBc394ObzDRb8= github.com/antithesishq/antithesis-sdk-go v0.3.8/go.mod h1:IUpT2DPAKh6i/YhSbt6Gl3v2yvUZjmKncl7U91fup7E= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/ava-labs/avalanchego v1.11.11-0.20240821175119-35c66e33f0dc h1:cUz1N+LJIeQAR0Z6zTBiuZ7s8GqIE5QQbRWs423VFRA= -github.com/ava-labs/avalanchego v1.11.11-0.20240821175119-35c66e33f0dc/go.mod h1:UkyrRDXK2E15Lq2abyae2Pt+JsWvgsg1pe0/AtoMyAM= +github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828021418-51e54a5e3295 h1:oHspqsdwUGkmSGqL9ATVNRyJ6fD3M/HpT6DtC063Rpo= +github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828021418-51e54a5e3295/go.mod h1:UkyrRDXK2E15Lq2abyae2Pt+JsWvgsg1pe0/AtoMyAM= github.com/ava-labs/coreth v0.13.8-fixed-genesis-upgrade.0.20240813194342-7635a96aa180 h1:6aIHp7wbyGVYdhHVQUbG7BEcbCMEQ5SYopPPJyipyvk= github.com/ava-labs/coreth v0.13.8-fixed-genesis-upgrade.0.20240813194342-7635a96aa180/go.mod h1:/wNBVq7J7wlC2Kbov7kk6LV5xZvau7VF9zwTVOeyAjY= github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= diff --git a/go.mod b/go.mod index e650ae1fcb..706e4f3d0d 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21.12 require ( github.com/VictoriaMetrics/fastcache v1.12.1 - github.com/ava-labs/avalanchego v1.11.11-0.20240821175119-35c66e33f0dc + github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828021418-51e54a5e3295 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 diff --git a/go.sum b/go.sum index 42c2cb0be2..7cc99816fb 100644 --- a/go.sum +++ b/go.sum @@ -53,8 +53,8 @@ github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8= github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/ava-labs/avalanchego v1.11.11-0.20240821175119-35c66e33f0dc h1:cUz1N+LJIeQAR0Z6zTBiuZ7s8GqIE5QQbRWs423VFRA= -github.com/ava-labs/avalanchego v1.11.11-0.20240821175119-35c66e33f0dc/go.mod h1:UkyrRDXK2E15Lq2abyae2Pt+JsWvgsg1pe0/AtoMyAM= +github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828021418-51e54a5e3295 h1:oHspqsdwUGkmSGqL9ATVNRyJ6fD3M/HpT6DtC063Rpo= +github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828021418-51e54a5e3295/go.mod h1:UkyrRDXK2E15Lq2abyae2Pt+JsWvgsg1pe0/AtoMyAM= 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= diff --git a/scripts/build_antithesis_images.sh b/scripts/build_antithesis_images.sh index c91e044b11..d6941fba10 100755 --- a/scripts/build_antithesis_images.sh +++ b/scripts/build_antithesis_images.sh @@ -60,7 +60,7 @@ GO_VERSION="$(go list -m -f '{{.GoVersion}}')" # shellcheck source=/dev/null source "${AVALANCHEGO_CLONE_PATH}"/scripts/lib_build_antithesis_images.sh -build_antithesis_builder_image "${GO_VERSION}" "antithesis-subnet-evm-builder:${IMAGE_TAG}" "${AVALANCHEGO_CLONE_PATH}" "${SUBNET_EVM_PATH}" +build_antithesis_builder_image "${GO_VERSION}" "antithesis-subnet-evm-builder:${IMAGE_TAG}" "${AVALANCHEGO_CLONE_PATH}" "${SUBNET_EVM_PATH}" "avalanche" # Ensure avalanchego and subnet-evm binaries are available to create an initial db state that includes subnets. pushd "${AVALANCHEGO_CLONE_PATH}" && ./scripts/build.sh && popd diff --git a/scripts/build_antithesis_workload.sh b/scripts/build_antithesis_workload.sh index 942e91c0ac..7f4ba94b76 100755 --- a/scripts/build_antithesis_workload.sh +++ b/scripts/build_antithesis_workload.sh @@ -8,4 +8,6 @@ SUBNET_EVM_PATH=$( cd "$( dirname "${BASH_SOURCE[0]}" )"; cd .. && pwd ) source "$SUBNET_EVM_PATH"/scripts/constants.sh echo "Building Workload..." -go build -o "$SUBNET_EVM_PATH/build/workload" "$SUBNET_EVM_PATH/tests/antithesis/"*.go +pushd "$SUBNET_EVM_PATH/avalanche" > /dev/null + go build -o "$SUBNET_EVM_PATH/build/workload" "$SUBNET_EVM_PATH/avalanche/tests/antithesis/"*.go +popd > /dev/null diff --git a/scripts/versions.sh b/scripts/versions.sh index 7b7959c2d3..d04dfd9bdb 100644 --- a/scripts/versions.sh +++ b/scripts/versions.sh @@ -4,7 +4,7 @@ # shellcheck disable=SC2034 # Don't export them as they're used in the context of other calls -AVALANCHE_VERSION=${AVALANCHE_VERSION:-'35c66e33f'} +AVALANCHE_VERSION=${AVALANCHE_VERSION:-'51e54a5e3'} GINKGO_VERSION=${GINKGO_VERSION:-'v2.2.0'} # This won't be used, but it's here to make code syncs easier From 27b6ff8f19a645ba226391b04cba6a939df4e66f Mon Sep 17 00:00:00 2001 From: Maru Newby Date: Tue, 27 Aug 2024 20:12:39 -0700 Subject: [PATCH 2/2] fixup: Bump avalanchego version --- avalanche/go.mod | 2 +- avalanche/go.sum | 4 ++++ go.mod | 2 +- go.sum | 4 ++++ scripts/versions.sh | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/avalanche/go.mod b/avalanche/go.mod index 6082544b0a..fe51933045 100644 --- a/avalanche/go.mod +++ b/avalanche/go.mod @@ -4,7 +4,7 @@ go 1.21.12 require ( github.com/antithesishq/antithesis-sdk-go v0.3.8 - github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828021418-51e54a5e3295 + github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828031614-04782bcc3b78 github.com/ava-labs/subnet-evm v0.0.0 github.com/ethereum/go-ethereum v1.13.8 github.com/go-cmd/cmd v1.4.1 diff --git a/avalanche/go.sum b/avalanche/go.sum index 7f97c045df..37a449f63b 100644 --- a/avalanche/go.sum +++ b/avalanche/go.sum @@ -60,6 +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/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828021418-51e54a5e3295 h1:oHspqsdwUGkmSGqL9ATVNRyJ6fD3M/HpT6DtC063Rpo= github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828021418-51e54a5e3295/go.mod h1:UkyrRDXK2E15Lq2abyae2Pt+JsWvgsg1pe0/AtoMyAM= +github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828030814-3e3a7551e38c h1:bKalifop7TITx3xFLi8f9QMbsnG3WmTITV3CMybqleI= +github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828030814-3e3a7551e38c/go.mod h1:UkyrRDXK2E15Lq2abyae2Pt+JsWvgsg1pe0/AtoMyAM= +github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828031614-04782bcc3b78 h1:Xuu7OdiljT+tVzziGlGLM9nYGkZsiSKkuZUsosTvYYs= +github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828031614-04782bcc3b78/go.mod h1:UkyrRDXK2E15Lq2abyae2Pt+JsWvgsg1pe0/AtoMyAM= github.com/ava-labs/coreth v0.13.8-fixed-genesis-upgrade.0.20240813194342-7635a96aa180 h1:6aIHp7wbyGVYdhHVQUbG7BEcbCMEQ5SYopPPJyipyvk= github.com/ava-labs/coreth v0.13.8-fixed-genesis-upgrade.0.20240813194342-7635a96aa180/go.mod h1:/wNBVq7J7wlC2Kbov7kk6LV5xZvau7VF9zwTVOeyAjY= github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= diff --git a/go.mod b/go.mod index 706e4f3d0d..f41f045855 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21.12 require ( github.com/VictoriaMetrics/fastcache v1.12.1 - github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828021418-51e54a5e3295 + github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828031614-04782bcc3b78 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 diff --git a/go.sum b/go.sum index 7cc99816fb..0d985d774d 100644 --- a/go.sum +++ b/go.sum @@ -55,6 +55,10 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828021418-51e54a5e3295 h1:oHspqsdwUGkmSGqL9ATVNRyJ6fD3M/HpT6DtC063Rpo= github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828021418-51e54a5e3295/go.mod h1:UkyrRDXK2E15Lq2abyae2Pt+JsWvgsg1pe0/AtoMyAM= +github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828030814-3e3a7551e38c h1:bKalifop7TITx3xFLi8f9QMbsnG3WmTITV3CMybqleI= +github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828030814-3e3a7551e38c/go.mod h1:UkyrRDXK2E15Lq2abyae2Pt+JsWvgsg1pe0/AtoMyAM= +github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828031614-04782bcc3b78 h1:Xuu7OdiljT+tVzziGlGLM9nYGkZsiSKkuZUsosTvYYs= +github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240828031614-04782bcc3b78/go.mod h1:UkyrRDXK2E15Lq2abyae2Pt+JsWvgsg1pe0/AtoMyAM= 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= diff --git a/scripts/versions.sh b/scripts/versions.sh index d04dfd9bdb..c08b06fd0a 100644 --- a/scripts/versions.sh +++ b/scripts/versions.sh @@ -4,7 +4,7 @@ # shellcheck disable=SC2034 # Don't export them as they're used in the context of other calls -AVALANCHE_VERSION=${AVALANCHE_VERSION:-'51e54a5e3'} +AVALANCHE_VERSION=${AVALANCHE_VERSION:-'04782bcc3'} GINKGO_VERSION=${GINKGO_VERSION:-'v2.2.0'} # This won't be used, but it's here to make code syncs easier