diff --git a/README.md b/README.md index 186ff7dc14..d9ed5e5d9f 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ The Subnet EVM runs in a separate process from the main AvalancheGo process and [v0.6.9] AvalancheGo@v1.11.11-v1.11.12 (Protocol Version: 37) [v0.6.10] AvalancheGo@v1.11.11-v1.11.12 (Protocol Version: 37) [v0.6.11] AvalancheGo@v1.11.11-v1.11.12 (Protocol Version: 37) +[v0.6.12] AvalancheGo@v1.11.13 (Protocol Version: 38) ``` ## API diff --git a/compatibility.json b/compatibility.json index 0a169e4e2f..f735a579fa 100644 --- a/compatibility.json +++ b/compatibility.json @@ -1,5 +1,6 @@ { "rpcChainVMProtocolVersion": { + "v0.6.12": 38, "v0.6.11": 37, "v0.6.10": 37, "v0.6.9": 37, diff --git a/go.mod b/go.mod index 203611e4b5..7426edd516 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.8 require ( github.com/VictoriaMetrics/fastcache v1.12.1 github.com/antithesishq/antithesis-sdk-go v0.3.8 - github.com/ava-labs/avalanchego v1.11.13-0.20241113171850-4c199890fadb + github.com/ava-labs/avalanchego v1.11.13-rc.1 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 @@ -54,7 +54,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 // indirect + github.com/ava-labs/coreth v0.13.9-rc.1 // 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 index d06ba20439..fc29608ae3 100644 --- a/go.sum +++ b/go.sum @@ -60,10 +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/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/ava-labs/avalanchego v1.11.13-0.20241113171850-4c199890fadb h1:ujIv6zAKQpZtlalLGSt9cx2AREJmYcv0wMmXGRAH6/g= -github.com/ava-labs/avalanchego v1.11.13-0.20241113171850-4c199890fadb/go.mod h1:86tO6F1FT8emclUwdQ2WCwAtAerqjm5A4IbV6XxNUyM= -github.com/ava-labs/coreth v0.13.8 h1:f14X3KgwHl9LwzfxlN6S4bbn5VA2rhEsNnHaRLSTo/8= -github.com/ava-labs/coreth v0.13.8/go.mod h1:t3BSv/eQv0AlDPMfEDCMMoD/jq1RkUsbFzQAFg5qBcE= +github.com/ava-labs/avalanchego v1.11.13-rc.1 h1:lHAkvMo98y/4xvsRKZ4GUTEj0yPnRbGC4U68rC06/rs= +github.com/ava-labs/avalanchego v1.11.13-rc.1/go.mod h1:yhD5dpZyStIVbxQ550EDi5w5SL7DQ/xGE6TIxosb7U0= +github.com/ava-labs/coreth v0.13.9-rc.1 h1:qIICpC/OZGYUP37QnLgIqqwGmxnLwLpZaUlqJNI85vU= +github.com/ava-labs/coreth v0.13.9-rc.1/go.mod h1:7aMsRIo/3GBE44qWZMjnfqdqfcfZ5yShTTm2LObLaYo= 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/validators/manager.go b/plugin/evm/validators/manager.go index 188b423424..be58ee4d2e 100644 --- a/plugin/evm/validators/manager.go +++ b/plugin/evm/validators/manager.go @@ -145,7 +145,7 @@ func loadValidators(validatorState stateinterfaces.State, newValidators map[ids. Weight: newVdr.Weight, StartTimestamp: newVdr.StartTime, IsActive: newVdr.IsActive, - IsL1Validator: newVdr.IsSoV, + IsL1Validator: newVdr.IsL1Validator, } if currentValidationIDs.Contains(newVID) { if err := validatorState.UpdateValidator(currentVdr); err != nil { diff --git a/plugin/evm/validators/manager_test.go b/plugin/evm/validators/manager_test.go index 85e7988857..e73fcca26c 100644 --- a/plugin/evm/validators/manager_test.go +++ b/plugin/evm/validators/manager_test.go @@ -188,7 +188,7 @@ func TestLoadNewValidators(t *testing.T) { Weight: validator.Weight, StartTimestamp: validator.StartTime, IsActive: validator.IsActive, - IsL1Validator: validator.IsSoV, + IsL1Validator: validator.IsL1Validator, }) require.NoError(err) } @@ -214,7 +214,7 @@ func TestLoadNewValidators(t *testing.T) { require.Equal(validator.Weight, v.Weight) require.Equal(validator.StartTime, v.StartTimestamp) require.Equal(validator.IsActive, v.IsActive) - require.Equal(validator.IsSoV, v.IsL1Validator) + require.Equal(validator.IsL1Validator, v.IsL1Validator) } }) } diff --git a/plugin/evm/validators/state/state_test.go b/plugin/evm/validators/state/state_test.go index 4039c48604..852a654109 100644 --- a/plugin/evm/validators/state/state_test.go +++ b/plugin/evm/validators/state/state_test.go @@ -97,7 +97,7 @@ func TestState(t *testing.T) { vdr.StartTimestamp = vdr.StartTimestamp + 100 require.ErrorIs(state.UpdateValidator(vdr), ErrImmutableField) - // set SoV should fail + // set IsL1Validator should fail vdr.IsL1Validator = false require.ErrorIs(state.UpdateValidator(vdr), ErrImmutableField) @@ -221,7 +221,7 @@ func TestParseValidator(t *testing.T) { 0x00, 0x00, 0x00, 0x00, 0x00, 0x5B, 0x8D, 0x80, // status 0x01, - // is SoV + // IsL1Validator 0x01, }, expected: &validatorData{ diff --git a/plugin/evm/version.go b/plugin/evm/version.go index 4ab2b39409..619db5485a 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.6.11" + Version string = "v0.6.12" ) func init() { diff --git a/scripts/versions.sh b/scripts/versions.sh index 4c045d5632..197c0b978d 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:-'4c199890'} +AVALANCHE_VERSION=${AVALANCHE_VERSION:-'v1.11.13-rc.1'} GINKGO_VERSION=${GINKGO_VERSION:-'v2.2.0'} # This won't be used, but it's here to make code syncs easier diff --git a/tests/warp/warp_test.go b/tests/warp/warp_test.go index 57567ae451..0960dac989 100644 --- a/tests/warp/warp_test.go +++ b/tests/warp/warp_test.go @@ -31,6 +31,7 @@ import ( "github.com/ava-labs/avalanchego/tests/fixture/tmpnet" "github.com/ava-labs/avalanchego/utils/constants" "github.com/ava-labs/avalanchego/vms/platformvm" + "github.com/ava-labs/avalanchego/vms/platformvm/api" avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp" "github.com/ava-labs/avalanchego/vms/platformvm/warp/payload" @@ -402,9 +403,9 @@ func (w *warpTest) aggregateSignaturesViaAPI() { // If the destination turns out to be the Primary Network as well, then this is a no-op. var validators map[ids.NodeID]*validators.GetValidatorOutput if w.sendingSubnet.SubnetID == constants.PrimaryNetworkID { - validators, err = pChainClient.GetValidatorsAt(ctx, w.receivingSubnet.SubnetID, pChainHeight) + validators, err = pChainClient.GetValidatorsAt(ctx, w.receivingSubnet.SubnetID, api.Height(pChainHeight)) } else { - validators, err = pChainClient.GetValidatorsAt(ctx, w.sendingSubnet.SubnetID, pChainHeight) + validators, err = pChainClient.GetValidatorsAt(ctx, w.sendingSubnet.SubnetID, api.Height(pChainHeight)) } require.NoError(err) require.NotZero(len(validators))