Bump avago rc (#1330)

* bump avago to rc * go mod tidy * update versions
ava-labs · Sep 4, 2024 · 9f9532a · 9f9532a
1 parent a929cb3
commit 9f9532a
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 87 deletions.
diff --git a/README.md b/README.md
@@ -18,44 +18,6 @@ The Subnet EVM runs in a separate process from the main AvalancheGo process and
 ### AvalancheGo Compatibility
 
 ```text
-[v0.1.0] AvalancheGo@v1.7.0-v1.7.4 (Protocol Version: 9)
-[v0.1.1-v0.1.2] AvalancheGo@v1.7.5-v1.7.6 (Protocol Version: 10)
-[v0.2.0] AvalancheGo@v1.7.7-v1.7.9 (Protocol Version: 11)
-[v0.2.1] AvalancheGo@v1.7.10 (Protocol Version: 12)
-[v0.2.2] AvalancheGo@v1.7.11-v1.7.12 (Protocol Version: 14)
-[v0.2.3] AvalancheGo@v1.7.13-v1.7.16 (Protocol Version: 15)
-[v0.2.4] AvalancheGo@v1.7.13-v1.7.16 (Protocol Version: 15)
-[v0.2.5] AvalancheGo@v1.7.13-v1.7.16 (Protocol Version: 15)
-[v0.2.6] AvalancheGo@v1.7.13-v1.7.16 (Protocol Version: 15)
-[v0.2.7] AvalancheGo@v1.7.13-v1.7.16 (Protocol Version: 15)
-[v0.2.8] AvalancheGo@v1.7.13-v1.7.18 (Protocol Version: 15)
-[v0.2.9] AvalancheGo@v1.7.13-v1.7.18 (Protocol Version: 15)
-[v0.3.0] AvalancheGo@v1.8.0-v1.8.6 (Protocol Version: 16)
-[v0.4.0] AvalancheGo@v1.9.0 (Protocol Version: 17)
-[v0.4.1] AvalancheGo@v1.9.1 (Protocol Version: 18)
-[v0.4.2] AvalancheGo@v1.9.1 (Protocol Version: 18)
-[v0.4.3] AvalancheGo@v1.9.2-v1.9.3 (Protocol Version: 19)
-[v0.4.4] AvalancheGo@v1.9.2-v1.9.3 (Protocol Version: 19)
-[v0.4.5] AvalancheGo@v1.9.4 (Protocol Version: 20)
-[v0.4.6] AvalancheGo@v1.9.4 (Protocol Version: 20)
-[v0.4.7] AvalancheGo@v1.9.5 (Protocol Version: 21)
-[v0.4.8] AvalancheGo@v1.9.6-v1.9.8 (Protocol Version: 22)
-[v0.4.9] AvalancheGo@v1.9.9 (Protocol Version: 23)
-[v0.4.10] AvalancheGo@v1.9.9 (Protocol Version: 23)
-[v0.4.11] AvalancheGo@v1.9.10-v1.9.16 (Protocol Version: 24)
-[v0.4.12] AvalancheGo@v1.9.10-v1.9.16 (Protocol Version: 24)
-[v0.5.0] AvalancheGo@v1.10.0 (Protocol Version: 25)
-[v0.5.1] AvalancheGo@v1.10.1-v1.10.4 (Protocol Version: 26)
-[v0.5.2] AvalancheGo@v1.10.1-v1.10.4 (Protocol Version: 26)
-[v0.5.3] AvalancheGo@v1.10.5-v1.10.8 (Protocol Version: 27)
-[v0.5.4] AvalancheGo@v1.10.9-v1.10.12 (Protocol Version: 28)
-[v0.5.5] AvalancheGo@v1.10.9-v1.10.12 (Protocol Version: 28)
-[v0.5.6] AvalancheGo@v1.10.9-v1.10.12 (Protocol Version: 28)
-[v0.5.7] AvalancheGo@v1.10.13-v1.10.14 (Protocol Version: 29)
-[v0.5.8] AvalancheGo@v1.10.13-v1.10.14 (Protocol Version: 29)
-[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-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)
@@ -65,6 +27,7 @@ The Subnet EVM runs in a separate process from the main AvalancheGo process and
 [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 (Protocol Version: 37)
 ```
 
 ## API

diff --git a/compatibility.json b/compatibility.json
@@ -1,5 +1,6 @@
 {
   "rpcChainVMProtocolVersion": {
+    "v0.6.9": 37,
     "v0.6.8": 36,
     "v0.6.7": 35,
     "v0.6.6": 35,
@@ -8,45 +9,6 @@
     "v0.6.3": 35,
     "v0.6.2": 34,
     "v0.6.1": 33,
-    "v0.6.0": 33,
-    "v0.5.11": 31,
-    "v0.5.10": 30,
-    "v0.5.9": 30,
-    "v0.5.8": 29,
-    "v0.5.7": 29,
-    "v0.5.6": 28,
-    "v0.5.5": 28,
-    "v0.5.4": 28,
-    "v0.5.3": 27,
-    "v0.5.2": 26,
-    "v0.5.1": 26,
-    "v0.5.0": 25,
-    "v0.4.12": 24,
-    "v0.4.11": 24,
-    "v0.4.10": 23,
-    "v0.4.9": 23,
-    "v0.4.8": 22,
-    "v0.4.7": 21,
-    "v0.4.6": 20,
-    "v0.4.5": 20,
-    "v0.4.4": 19,
-    "v0.4.3": 19,
-    "v0.4.2": 18,
-    "v0.4.1": 18,
-    "v0.4.0": 17,
-    "v0.3.0": 16,
-    "v0.2.9": 15,
-    "v0.2.8": 15,
-    "v0.2.7": 15,
-    "v0.2.6": 15,
-    "v0.2.5": 15,
-    "v0.2.4": 15,
-    "v0.2.3": 15,
-    "v0.2.2": 14,
-    "v0.2.1": 12,
-    "v0.2.0": 11,
-    "v0.1.2": 10,
-    "v0.1.1": 10,
-    "v0.1.0": 9
+    "v0.6.0": 33
   }
 }
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.21.12
 require (
 	github.com/VictoriaMetrics/fastcache v1.12.1
 	github.com/antithesishq/antithesis-sdk-go v0.3.8
-	github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240827194054-0117ab96791c
+	github.com/ava-labs/avalanchego v1.11.11
 	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
@@ -55,7 +55,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.13.8-fixed-genesis-upgrade.0.20240813194342-7635a96aa180 // indirect
+	github.com/ava-labs/coreth v0.13.8-fixed-genesis-upgrade.0.20240815193440-a96bc921e732 // 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

diff --git a/go.sum b/go.sum
@@ -58,10 +58,10 @@ 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-monitoring-url.0.20240827194054-0117ab96791c h1:WAbq2clkTkoxELkCePFe7sqwOvD32SZPzoWtciUmzQI=
-github.com/ava-labs/avalanchego v1.11.11-monitoring-url.0.20240827194054-0117ab96791c/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/ava-labs/avalanchego v1.11.11 h1:MIQq8xRavRj4ZXHA4G+aMiymig7SOScGOG1SApmMvBc=
+github.com/ava-labs/avalanchego v1.11.11/go.mod h1:yFx3V31Jy9NFa8GZlgGnwiVf8KGjeF2+Uc99l9Scd/8=
+github.com/ava-labs/coreth v0.13.8-fixed-genesis-upgrade.0.20240815193440-a96bc921e732 h1:wlhGJbmb7s3bU2QWtxKjscGjfHknQiq+cVhhUjONsB8=
+github.com/ava-labs/coreth v0.13.8-fixed-genesis-upgrade.0.20240815193440-a96bc921e732/go.mod h1:RkQLaQ961Xe/sUb3ycn4Qi18vPPuEetTqDf2eDcquAs=
 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/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.6.8"
+	Version string = "v0.6.9"
 )
 
 func init() {

diff --git a/scripts/known_flakes.txt b/scripts/known_flakes.txt
@@ -7,4 +7,6 @@ TestResyncNewRootAfterDeletes
 TestTransactionSkipIndexing
 TestVMShutdownWhileSyncing
 TestWalletNotifications
-TestWebsocketLargeRead
+TestWebsocketLargeRead
+TestChainIndexerWithChildren
+TestWalletNotifications
diff --git 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:-'0117ab96'}
+AVALANCHE_VERSION=${AVALANCHE_VERSION:-'v1.11.11'}
 GINKGO_VERSION=${GINKGO_VERSION:-'v2.2.0'}
 
 # This won't be used, but it's here to make code syncs easier