diff --git a/README.md b/README.md index a066e716b5..a1d11466c2 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,7 @@ The Subnet EVM runs in a separate process from the main AvalancheGo process and [v0.5.9] AvalancheGo@v1.10.15-v1.10.17 (Protocol Version: 30) [v0.5.10] AvalancheGo@v1.10.15-v1.10.17 (Protocol Version: 30) [v0.5.11] AvalancheGo@v1.10.18-v1.10.19 (Protocol Version: 31) +[v0.6.0] AvalancheGo@v1.11.0 (Protocol Version: 33) ``` ## API diff --git a/compatibility.json b/compatibility.json index 614720cee6..ec3ba80162 100644 --- a/compatibility.json +++ b/compatibility.json @@ -1,5 +1,6 @@ { "rpcChainVMProtocolVersion": { + "v0.6.0": 33, "v0.5.11": 31, "v0.5.10": 30, "v0.5.9": 30, diff --git a/go.mod b/go.mod index 68fd4668ea..10bc70232f 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/VictoriaMetrics/fastcache v1.10.0 - github.com/ava-labs/avalanche-network-runner v1.7.4-rc.0 - github.com/ava-labs/avalanchego v1.11.0-rc.2 + github.com/ava-labs/avalanche-network-runner v1.7.6 + github.com/ava-labs/avalanchego v1.11.0 github.com/cespare/cp v0.1.0 github.com/davecgh/go-spew v1.1.1 github.com/deckarep/golang-set/v2 v2.1.0 @@ -55,7 +55,7 @@ require ( github.com/DataDog/zstd v1.5.2 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect - github.com/ava-labs/coreth v0.12.11-rc.3.0.20240207021717-15431782181b // indirect + github.com/ava-labs/coreth v0.13.0-rc.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/btcsuite/btcd/btcutil v1.1.3 // indirect diff --git a/go.sum b/go.sum index 8e54365bf2..b2bc008426 100644 --- a/go.sum +++ b/go.sum @@ -60,12 +60,12 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/ava-labs/avalanche-network-runner v1.7.4-rc.0 h1:xNbCMNqenaDr0bb35j27sqwa+C8t8BgRz51vXd6q0QM= -github.com/ava-labs/avalanche-network-runner v1.7.4-rc.0/go.mod h1:B7Ynk/avkCk49CCIWbM4j1UrPlqIi0IHCPAB2MZNvLw= -github.com/ava-labs/avalanchego v1.11.0-rc.2 h1:yIqPoTHCfuF5uav6yiQCgGC+lrVBLCtd4ZLIH9LpDpQ= -github.com/ava-labs/avalanchego v1.11.0-rc.2/go.mod h1:PZUfF751H3p3P4HK+sCI8glzEa3WJ2GgdVH6SQGkA5g= -github.com/ava-labs/coreth v0.12.11-rc.3.0.20240207021717-15431782181b h1:CG09kjMyp0+5iusoZZVyOc1tL1HtuiJ8cL/5QipQUD8= -github.com/ava-labs/coreth v0.12.11-rc.3.0.20240207021717-15431782181b/go.mod h1:ofm30knZFS5q+y3YS+p2jLa+3ZpgzW5OkM8He5MwZxs= +github.com/ava-labs/avalanche-network-runner v1.7.6 h1:2yXa2Zq099t900ffpn0RG9D5dca98fs3l+/hF7AumIY= +github.com/ava-labs/avalanche-network-runner v1.7.6/go.mod h1:+Br4mCjreTMtnDiUDNXJba500fnchMk0Ygu5qWVj6A4= +github.com/ava-labs/avalanchego v1.11.0 h1:rXo27MRy7uFaY8Eo16N0wHYeEJ2TlsOXuMzbXVfSg9Y= +github.com/ava-labs/avalanchego v1.11.0/go.mod h1:+UpgT8X2fNN93+iE100efkZL7ePfBRfRdmpJ/i3YnyY= +github.com/ava-labs/coreth v0.13.0-rc.0 h1:V2l3qj2ek3geKDJAnF2M94mYJK8kg2kePixujfJ0bmk= +github.com/ava-labs/coreth v0.13.0-rc.0/go.mod h1:eUMbBLDhlZASJjcbf0gIcD2GMn2rRRCUxC8MXLt5QQk= 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/peer/network_test.go b/peer/network_test.go index c011c339f9..be6a1e27b1 100644 --- a/peer/network_test.go +++ b/peer/network_test.go @@ -941,6 +941,14 @@ func (t testAppSender) SendAppGossip(_ context.Context, message []byte) error { return t.sendAppGossipFn(message) } +func (t testAppSender) SendAppError(ctx context.Context, nodeID ids.NodeID, requestID uint32, errorCode int32, errorMessage string) error { + panic("not implemented") +} + +func (t testAppSender) SendCrossChainAppError(ctx context.Context, chainID ids.ID, requestID uint32, errorCode int32, errorMessage string) error { + panic("not implemented") +} + type HelloRequest struct { Message string `serialize:"true"` } diff --git a/plugin/evm/version.go b/plugin/evm/version.go index 5ecba7d5d7..6463ae4699 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 Subnet EVM - Version string = "v0.5.11" + Version string = "v0.6.0" ) func init() { diff --git a/scripts/versions.sh b/scripts/versions.sh index 1aad8bf7b5..07bbd3e3a1 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:-'v1.11.0-rc.2'} +AVALANCHE_VERSION=${AVALANCHE_VERSION:-'v1.11.0'} GINKGO_VERSION=${GINKGO_VERSION:-'v2.2.0'} # This won't be used, but it's here to make code syncs easier