From b1954233070541edc28d5f8b09c2d40b28f63225 Mon Sep 17 00:00:00 2001 From: Aaron Buchwald Date: Fri, 9 Jul 2021 10:50:35 -0400 Subject: [PATCH 1/3] Bump avalanchego --- go.mod | 2 +- go.sum | 10 ++++++---- plugin/evm/vm_test.go | 5 +++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 27a6428f17..7b4fbb94f7 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/VictoriaMetrics/fastcache v1.5.7 - github.com/ava-labs/avalanchego v1.4.9-0.20210628213537-c82a6e8abf54 + github.com/ava-labs/avalanchego v1.4.10-rc.2.0.20210709143805-175525cb0570 github.com/btcsuite/btcd v0.21.0-beta // indirect github.com/cespare/cp v0.1.0 github.com/davecgh/go-spew v1.1.1 diff --git a/go.sum b/go.sum index e38599bf24..b68b46c68d 100644 --- a/go.sum +++ b/go.sum @@ -60,8 +60,8 @@ github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VT github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/ava-labs/avalanchego v1.4.9-0.20210628213537-c82a6e8abf54 h1:XOsaxJV8MVbr1mDxVBIGzX7l9fACe6KA54kfG3Xc0W8= -github.com/ava-labs/avalanchego v1.4.9-0.20210628213537-c82a6e8abf54/go.mod h1:YJeNvyrpE6PuIbLVVt+p0klHNupZYPJMs5pI1hcP4Po= +github.com/ava-labs/avalanchego v1.4.10-rc.2.0.20210709143805-175525cb0570 h1:DZm732nwjyi+eX+TMO//2lmERKe/H6FSvJ55LhG2Xuw= +github.com/ava-labs/avalanchego v1.4.10-rc.2.0.20210709143805-175525cb0570/go.mod h1:V9qJp9RYUApCmGASsfTlYt+/569tuDX8MrF4j3E+oT8= github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= github.com/aws/aws-sdk-go-v2/credentials v1.1.1/go.mod h1:mM2iIjwl7LULWtS6JCACyInboHirisUUdkBPoTHMOUo= @@ -348,6 +348,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/linxGnu/grocksdb v1.6.34 h1:fHNRbWepGN1zA4FFt/9LuiOPtSxDsr8mn4/RlU5+g1Q= +github.com/linxGnu/grocksdb v1.6.34/go.mod h1:/+iSQrn7Izt6kFhHBQvcE6FkklsKXa8hc35pFyFDrDw= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= @@ -678,7 +680,6 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -809,8 +810,9 @@ gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/plugin/evm/vm_test.go b/plugin/evm/vm_test.go index aba1f80911..b2e9b1e6eb 100644 --- a/plugin/evm/vm_test.go +++ b/plugin/evm/vm_test.go @@ -28,6 +28,7 @@ import ( "github.com/ava-labs/avalanchego/utils/formatting" "github.com/ava-labs/avalanchego/utils/logging" "github.com/ava-labs/avalanchego/utils/units" + "github.com/ava-labs/avalanchego/version" "github.com/ava-labs/avalanchego/vms/components/avax" "github.com/ava-labs/avalanchego/vms/components/chain" "github.com/ava-labs/avalanchego/vms/secp256k1fx" @@ -121,7 +122,7 @@ func setupGenesis(t *testing.T, genesisJSON string) (*VM, *snow.Context, manager genesisBytes := BuildGenesisTest(t, genesisJSON) ctx := NewContext() - baseDBManager := manager.NewDefaultMemDBManager() + baseDBManager := manager.NewMemDB(version.NewDefaultVersion(1, 4, 5)) m := &atomic.Memory{} m.Initialize(logging.NoLog{}, prefixdb.New([]byte{0}, baseDBManager.Current().Database)) @@ -131,7 +132,7 @@ func setupGenesis(t *testing.T, genesisJSON string) (*VM, *snow.Context, manager // The caller of this function is responsible for unlocking. ctx.Lock.Lock() - userKeystore, err := keystore.New(logging.NoLog{}, manager.NewDefaultMemDBManager()) + userKeystore, err := keystore.New(logging.NoLog{}, manager.NewMemDB(version.NewDefaultVersion(1, 4, 5))) if err != nil { t.Fatal(err) } From b37f852f47bcc92e7fa7c5c741c190611bdb20f1 Mon Sep 17 00:00:00 2001 From: Aaron Buchwald Date: Fri, 9 Jul 2021 11:01:18 -0400 Subject: [PATCH 2/3] Bump version to v0.5.5 --- scripts/versions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/versions.sh b/scripts/versions.sh index fccea5581c..f44cd8da5b 100644 --- a/scripts/versions.sh +++ b/scripts/versions.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Set up the versions to be used -coreth_version=${CORETH_VERSION:-'v0.5.4'} +coreth_version=${CORETH_VERSION:-'v0.5.5'} # Don't export them as they're used in the context of other calls avalanche_version=${AVALANCHE_VERSION:-'v1.4.10-rc.2'} From c9d7d096c7b3f7d8747be4e8ab66195e656f7a9e Mon Sep 17 00:00:00 2001 From: Aaron Buchwald Date: Fri, 9 Jul 2021 15:04:39 -0400 Subject: [PATCH 3/3] Bump avalanchego to v1.4.10-rc.3 --- go.mod | 2 +- go.sum | 4 ++-- scripts/versions.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 7b4fbb94f7..a8cc29958e 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/VictoriaMetrics/fastcache v1.5.7 - github.com/ava-labs/avalanchego v1.4.10-rc.2.0.20210709143805-175525cb0570 + github.com/ava-labs/avalanchego v1.4.10-rc.3 github.com/btcsuite/btcd v0.21.0-beta // indirect github.com/cespare/cp v0.1.0 github.com/davecgh/go-spew v1.1.1 diff --git a/go.sum b/go.sum index b68b46c68d..7ab3cad5d1 100644 --- a/go.sum +++ b/go.sum @@ -60,8 +60,8 @@ github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VT github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/ava-labs/avalanchego v1.4.10-rc.2.0.20210709143805-175525cb0570 h1:DZm732nwjyi+eX+TMO//2lmERKe/H6FSvJ55LhG2Xuw= -github.com/ava-labs/avalanchego v1.4.10-rc.2.0.20210709143805-175525cb0570/go.mod h1:V9qJp9RYUApCmGASsfTlYt+/569tuDX8MrF4j3E+oT8= +github.com/ava-labs/avalanchego v1.4.10-rc.3 h1:X0kij4Qi/uUwcLl7ZoaQ2+qgMM+mx+VWVEtIWPM2kxE= +github.com/ava-labs/avalanchego v1.4.10-rc.3/go.mod h1:V9qJp9RYUApCmGASsfTlYt+/569tuDX8MrF4j3E+oT8= github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= github.com/aws/aws-sdk-go-v2/credentials v1.1.1/go.mod h1:mM2iIjwl7LULWtS6JCACyInboHirisUUdkBPoTHMOUo= diff --git a/scripts/versions.sh b/scripts/versions.sh index f44cd8da5b..d5fb03dab0 100644 --- a/scripts/versions.sh +++ b/scripts/versions.sh @@ -3,4 +3,4 @@ # Set up the versions to be used coreth_version=${CORETH_VERSION:-'v0.5.5'} # Don't export them as they're used in the context of other calls -avalanche_version=${AVALANCHE_VERSION:-'v1.4.10-rc.2'} +avalanche_version=${AVALANCHE_VERSION:-'v1.4.10-rc.3'}