sync upstream v0.6.1 (0c3802c)

hubble-exchange · Feb 24, 2024 · 182fd14 · 182fd14
2 parents ced68df + 0c3802c
commit 182fd14
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -70,7 +70,8 @@ The Subnet EVM runs in a separate process from the main AvalancheGo process and
 [v0.5.9] [email protected] (Protocol Version: 30)
 [v0.5.10] [email protected] (Protocol Version: 30)
 [v0.5.11] [email protected] (Protocol Version: 31)
-[v0.6.0] [email protected] (Protocol Version: 33)
+[v0.6.0] [email protected] (Protocol Version: 33)
+[v0.6.1] [email protected] (Protocol Version: 33)
 ```
 
 ## API

diff --git a/compatibility.json b/compatibility.json
@@ -1,5 +1,6 @@
 {
   "rpcChainVMProtocolVersion": {
+    "v0.6.1": 33,
     "v0.6.0": 33,
     "v0.5.11": 31,
     "v0.5.10": 30,

diff --git a/core/genesis.go b/core/genesis.go
@@ -243,7 +243,7 @@ func SetupGenesisBlock(
 		if compatErr != nil && ((height != 0 && compatErr.RewindToBlock != 0) || (timestamp != 0 && compatErr.RewindToTime != 0)) {
 			storedData, _ := storedcfg.ToWithUpgradesJSON().MarshalJSON()
 			newData, _ := newcfg.ToWithUpgradesJSON().MarshalJSON()
-			log.Error("found mismatch between config on database vs. new config", "storedConfig", string(storedData), "newConfig", string(newData))
+			log.Error("found mismatch between config on database vs. new config", "storedConfig", string(storedData), "newConfig", string(newData), "err", compatErr)
 			return newcfg, stored, compatErr
 		}
 	}

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.21
 require (
 	github.com/VictoriaMetrics/fastcache v1.10.0
 	github.com/ava-labs/avalanche-network-runner v1.7.6
-	github.com/ava-labs/avalanchego v1.11.0
+	github.com/ava-labs/avalanchego v1.11.1
 	github.com/cespare/cp v0.1.0
 	github.com/davecgh/go-spew v1.1.1
 	github.com/deckarep/golang-set/v2 v2.1.0

diff --git a/go.sum b/go.sum
@@ -62,8 +62,8 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 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/avalanchego v1.11.1 h1:NSelfZ/Di8uGCsRoFK32HOR262eHlpUFmAu8pbfg0Jo=
+github.com/ava-labs/avalanchego v1.11.1/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=

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.0"
+	Version string = "v0.6.1"
 )
 
 func init() {

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:-'v1.11.0'}
+AVALANCHE_VERSION=${AVALANCHE_VERSION:-'v1.11.1'}
 GINKGO_VERSION=${GINKGO_VERSION:-'v2.2.0'}
 
 # This won't be used, but it's here to make code syncs easier