diff --git a/.golangci.yml b/.golangci.yml
index 130b2e4a5a..31c41897e1 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -6,6 +6,10 @@ run:
# default is true. Enables skipping of directories:
# vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
skip-dirs-use-default: true
+ # Include non-test files tagged as test-only.
+ # Context: https://github.com/ava-labs/avalanchego/pull/3173
+ build-tags:
+ - test
linters:
disable-all: true
diff --git a/RELEASES.md b/RELEASES.md
index 7399b122eb..87d912d3f5 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -1,5 +1,12 @@
# Release Notes
+## [v0.13.7](https://github.com/ava-labs/coreth/releases/tag/v0.13.7)
+- Add EUpgrade base definitions
+- Remove Block Status
+- Fix and improve "GetBlockIDAtHeight"
+- Bump golang version requirement to 1.21.12
+- Bump AvalancheGo to v1.11.10-prerelease
+
## [v0.13.6](https://github.com/ava-labs/coreth/releases/tag/v0.13.6)
- rpc: truncate call error data logs
- logging: remove path prefix (up to coreth@version/) from logged file names.
diff --git a/core/state/test_statedb.go b/core/state/test_statedb.go
index c34fdec80d..41c6345594 100644
--- a/core/state/test_statedb.go
+++ b/core/state/test_statedb.go
@@ -1,6 +1,8 @@
// (c) 2023, Ava Labs, Inc. All rights reserved.
// See the file LICENSE for licensing terms.
+//go:build test
+
package state
import (
diff --git a/core/test_blockchain.go b/core/test_blockchain.go
index 7c0807b829..8d47358361 100644
--- a/core/test_blockchain.go
+++ b/core/test_blockchain.go
@@ -1,6 +1,8 @@
// (c) 2020-2021, Ava Labs, Inc. All rights reserved.
// See the file LICENSE for licensing terms.
+//go:build test
+
package core
import (
diff --git a/go.mod b/go.mod
index 59d0309b73..6b67463c7b 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.10-status-removal
+ github.com/ava-labs/avalanchego v1.11.10-prerelease
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 4c06b61c1d..12b0fb5d68 100644
--- a/go.sum
+++ b/go.sum
@@ -54,8 +54,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.10-status-removal h1:XHF4iFteHTJo+7SnB9bxIwPmMmDf7gqS5wUS/uuZsxc=
-github.com/ava-labs/avalanchego v1.11.10-status-removal/go.mod h1:NlSe4PE40EWD9rBLoNQrEvhABjcOyrV5McUpD3Q6h3Y=
+github.com/ava-labs/avalanchego v1.11.10-prerelease h1:QUhVqvxrwDmsTvXXnKoePe5WU3Eh8GXB/QE2R2xHa0c=
+github.com/ava-labs/avalanchego v1.11.10-prerelease/go.mod h1:ryRFbHr7sKmez4792NxzJS7AGiE+vd0Tez+qs2kmezE=
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/internal/blocktest/test_hash.go b/internal/blocktest/test_hash.go
index 014e9ff4b0..03abe694cb 100644
--- a/internal/blocktest/test_hash.go
+++ b/internal/blocktest/test_hash.go
@@ -30,6 +30,8 @@
// standalone go program. It provides an API that mirrors the standard library
// testing API.
+//go:build test
+
package blocktest
import (
diff --git a/plugin/evm/test_tx.go b/plugin/evm/test_tx.go
index c057c874ad..766c97ef0b 100644
--- a/plugin/evm/test_tx.go
+++ b/plugin/evm/test_tx.go
@@ -1,6 +1,8 @@
// (c) 2020-2021, Ava Labs, Inc. All rights reserved.
// See the file LICENSE for licensing terms.
+//go:build test
+
package evm
import (
diff --git a/plugin/evm/version.go b/plugin/evm/version.go
index 3b96a9a08d..3b6fd52823 100644
--- a/plugin/evm/version.go
+++ b/plugin/evm/version.go
@@ -11,7 +11,7 @@ var (
// GitCommit is set by the build script
GitCommit string
// Version is the version of Coreth
- Version string = "v0.13.6"
+ Version string = "v0.13.7"
)
func init() {
diff --git a/precompile/testutils/test_config.go b/precompile/testutils/test_config.go
index aee07c4a51..47787337d0 100644
--- a/precompile/testutils/test_config.go
+++ b/precompile/testutils/test_config.go
@@ -1,6 +1,8 @@
// (c) 2023, Ava Labs, Inc. All rights reserved.
// See the file LICENSE for licensing terms.
+//go:build test
+
package testutils
import (
diff --git a/precompile/testutils/test_precompile.go b/precompile/testutils/test_precompile.go
index a0bc279ff9..e58e6c691b 100644
--- a/precompile/testutils/test_precompile.go
+++ b/precompile/testutils/test_precompile.go
@@ -1,6 +1,8 @@
// (c) 2023, Ava Labs, Inc. All rights reserved.
// See the file LICENSE for licensing terms.
+//go:build test
+
package testutils
import (
diff --git a/precompile/testutils/test_predicate.go b/precompile/testutils/test_predicate.go
index 0b28075984..6e8fdad432 100644
--- a/precompile/testutils/test_predicate.go
+++ b/precompile/testutils/test_predicate.go
@@ -1,6 +1,8 @@
// (c) 2023, Ava Labs, Inc. All rights reserved.
// See the file LICENSE for licensing terms.
+//go:build test
+
package testutils
import (
diff --git a/scripts/build_test.sh b/scripts/build_test.sh
index c62dc95789..07d35dd45b 100755
--- a/scripts/build_test.sh
+++ b/scripts/build_test.sh
@@ -15,4 +15,4 @@ source "$CORETH_PATH"/scripts/constants.sh
# We pass in the arguments to this script directly to enable easily passing parameters such as enabling race detection,
# parallelism, and test coverage.
-go test -shuffle=on -race -timeout="${TIMEOUT:-600s}" -coverprofile=coverage.out -covermode=atomic ./... "$@"
+go test -tags test -shuffle=on -race -timeout="${TIMEOUT:-600s}" -coverprofile=coverage.out -covermode=atomic ./... "$@"
diff --git a/scripts/versions.sh b/scripts/versions.sh
index 89315d6c3c..6d6d53d2db 100644
--- a/scripts/versions.sh
+++ b/scripts/versions.sh
@@ -6,4 +6,4 @@
set -euo pipefail
# Don't export them as they're used in the context of other calls
-AVALANCHE_VERSION=${AVALANCHE_VERSION:-'v1.11.10-status-removal'}
+AVALANCHE_VERSION=${AVALANCHE_VERSION:-'v1.11.10-prerelease'}
diff --git a/sync/handlers/test_providers.go b/sync/handlers/test_providers.go
index 81dafbfd00..594bd6a6c8 100644
--- a/sync/handlers/test_providers.go
+++ b/sync/handlers/test_providers.go
@@ -1,6 +1,8 @@
// (c) 2021-2022, Ava Labs, Inc. All rights reserved.
// See the file LICENSE for licensing terms.
+//go:build test
+
package handlers
import (
diff --git a/sync/statesync/test_sync.go b/sync/statesync/test_sync.go
index 418eb675fd..a9d0dd2ac8 100644
--- a/sync/statesync/test_sync.go
+++ b/sync/statesync/test_sync.go
@@ -1,6 +1,8 @@
// (c) 2021-2022, Ava Labs, Inc. All rights reserved.
// See the file LICENSE for licensing terms.
+//go:build test
+
package statesync
import (
diff --git a/sync/syncutils/test_trie.go b/sync/syncutils/test_trie.go
index ea1b7eff04..47347e36f8 100644
--- a/sync/syncutils/test_trie.go
+++ b/sync/syncutils/test_trie.go
@@ -1,6 +1,8 @@
// (c) 2021-2022, Ava Labs, Inc. All rights reserved.
// See the file LICENSE for licensing terms.
+//go:build test
+
package syncutils
import (
diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go
index 5af235bc5a..0b229610c6 100644
--- a/tests/rlp_test_util.go
+++ b/tests/rlp_test_util.go
@@ -24,6 +24,8 @@
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see .
+//go:build test
+
package tests
import (
diff --git a/tests/state_test_util.go b/tests/state_test_util.go
index 29e934efe5..cefb55fd80 100644
--- a/tests/state_test_util.go
+++ b/tests/state_test_util.go
@@ -24,6 +24,8 @@
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see .
+//go:build test
+
package tests
import (
diff --git a/warp/warptest/block_client.go b/warp/warptest/block_client.go
index 6b7354d7fb..c21dd702d6 100644
--- a/warp/warptest/block_client.go
+++ b/warp/warptest/block_client.go
@@ -1,6 +1,8 @@
// (c) 2024, Ava Labs, Inc. All rights reserved.
// See the file LICENSE for licensing terms.
+//go:build test
+
// warptest exposes common functionality for testing the warp package.
package warptest