From cf859c143a1bf7525dfc1b61e71543340cd5baba Mon Sep 17 00:00:00 2001 From: sukantoraymond Date: Thu, 6 Apr 2023 13:49:45 -0400 Subject: [PATCH 1/4] update avalanche go v1.19.16 --- go.mod | 5 ++--- go.sum | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 47c3e1e3..edc43eac 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/ava-labs/avalanche-network-runner go 1.19 require ( - github.com/ava-labs/avalanchego v1.9.10 - github.com/ava-labs/coreth v0.11.8-rc.3 + github.com/ava-labs/avalanchego v1.9.16 + github.com/ava-labs/coreth v0.11.9-rc.0 github.com/ethereum/go-ethereum v1.10.26 github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 github.com/onsi/ginkgo/v2 v2.7.0 @@ -111,7 +111,6 @@ require ( go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect - golang.org/x/exp v0.0.0-20220426173459-3bcf042a4bf5 // indirect golang.org/x/net v0.7.0 // indirect golang.org/x/sys v0.5.0 // indirect golang.org/x/term v0.5.0 // indirect diff --git a/go.sum b/go.sum index 0cdafb9d..5e6c14ba 100644 --- a/go.sum +++ b/go.sum @@ -57,8 +57,11 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/ava-labs/avalanchego v1.9.10 h1:IQYUruncY3yuKLwfbGXGslydTJQcjzLMtZuW8g5wQOY= github.com/ava-labs/avalanchego v1.9.10/go.mod h1:nNc+4JCIJMaEt2xRmeMVAUyQwDIap7RvnMrfWD2Tpo8= +github.com/ava-labs/avalanchego v1.9.16 h1:JarxIn7gy4V9f1dBgUxubRRO6CrqY2MprOLGqEmk+Vg= +github.com/ava-labs/avalanchego v1.9.16/go.mod h1:Unm7ruhAvLSRP+7gIfwyHNf+wEehWLsFhY9yp10nDbw= github.com/ava-labs/coreth v0.11.8-rc.3 h1:pS+OTFPc9edcFuCJIQGn5TdyAZncT9Hhs9jCcmm7+PM= github.com/ava-labs/coreth v0.11.8-rc.3/go.mod h1:pc44yvJD4jTPIwkPI64pUXyJDvQ/UAqkbmhXOx78PXA= +github.com/ava-labs/coreth v0.11.9-rc.0/go.mod h1:y41I9mWK04s8oObvQeYjkdoidtPhkPqV8prRPN6zrd4= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= From 7816b4532c23ffcd251dbc78f07694ec4e211610 Mon Sep 17 00:00:00 2001 From: sukantoraymond Date: Thu, 6 Apr 2023 13:55:58 -0400 Subject: [PATCH 2/4] update avalanche go v1.19.16 --- go.sum | 1 + 1 file changed, 1 insertion(+) diff --git a/go.sum b/go.sum index 5e6c14ba..f8aa81ca 100644 --- a/go.sum +++ b/go.sum @@ -61,6 +61,7 @@ github.com/ava-labs/avalanchego v1.9.16 h1:JarxIn7gy4V9f1dBgUxubRRO6CrqY2MprOLGq github.com/ava-labs/avalanchego v1.9.16/go.mod h1:Unm7ruhAvLSRP+7gIfwyHNf+wEehWLsFhY9yp10nDbw= github.com/ava-labs/coreth v0.11.8-rc.3 h1:pS+OTFPc9edcFuCJIQGn5TdyAZncT9Hhs9jCcmm7+PM= github.com/ava-labs/coreth v0.11.8-rc.3/go.mod h1:pc44yvJD4jTPIwkPI64pUXyJDvQ/UAqkbmhXOx78PXA= +github.com/ava-labs/coreth v0.11.9-rc.0 h1:7oK5DWtvDEMKEaduw/34r5kdwUssRsFszCl1FFUvvPc= github.com/ava-labs/coreth v0.11.9-rc.0/go.mod h1:y41I9mWK04s8oObvQeYjkdoidtPhkPqV8prRPN6zrd4= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= From 75cb84aca31a3a9ed8af8f2ee485797b376ac54e Mon Sep 17 00:00:00 2001 From: sukantoraymond Date: Thu, 6 Apr 2023 14:01:21 -0400 Subject: [PATCH 3/4] update avalanche go v1.19.16 --- .idea/workspace.xml | 116 ++++++++++++++++++++++++++++++++++++++++++ local/node_test.go | 3 +- tests/e2e/e2e_test.go | 3 +- 3 files changed, 118 insertions(+), 4 deletions(-) create mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..a750f788 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1680552311375 + + + + + + + + + + true + + + + + + file://$PROJECT_DIR$/local/blockchain.go + 478 + + + + + \ No newline at end of file diff --git a/local/node_test.go b/local/node_test.go index d4cb946d..c5e66d68 100644 --- a/local/node_test.go +++ b/local/node_test.go @@ -15,7 +15,6 @@ import ( "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/message" "github.com/ava-labs/avalanchego/network/peer" - "github.com/ava-labs/avalanchego/proto/pb/p2p" "github.com/ava-labs/avalanchego/staking" "github.com/ava-labs/avalanchego/utils/constants" "github.com/ava-labs/avalanchego/utils/ips" @@ -232,7 +231,7 @@ func TestAttachPeer(t *testing.T) { requestID := uint32(42) chainID := constants.PlatformChainID // create the Chits message - msg, err := mc.Chits(chainID, requestID, []ids.ID{}, containerIDs, p2p.EngineType_ENGINE_TYPE_AVALANCHE) + msg, err := mc.Chits(chainID, requestID, []ids.ID{}, containerIDs) require.NoError(err) // send chits to [node] ok := p.Send(context.Background(), msg) diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index fe76cc22..2a017c91 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -24,7 +24,6 @@ import ( "github.com/ava-labs/avalanchego/api/admin" "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/avalanchego/message" - "github.com/ava-labs/avalanchego/proto/pb/p2p" avago_constants "github.com/ava-labs/avalanchego/utils/constants" "github.com/ava-labs/avalanchego/utils/logging" ginkgo "github.com/onsi/ginkgo/v2" @@ -478,7 +477,7 @@ var _ = ginkgo.Describe("[Start/Remove/Restart/Add/Stop]", func() { } requestID := uint32(42) chainID := avago_constants.PlatformChainID - msg, err := mc.Chits(chainID, requestID, []ids.ID{}, containerIDs, p2p.EngineType_ENGINE_TYPE_AVALANCHE) + msg, err := mc.Chits(chainID, requestID, []ids.ID{}, containerIDs) gomega.Ω(err).Should(gomega.BeNil()) ctx, cancel = context.WithTimeout(context.Background(), 15*time.Second) From 4022c841e5340315799156cb86727899f7528703 Mon Sep 17 00:00:00 2001 From: sukantoraymond Date: Thu, 6 Apr 2023 15:14:41 -0400 Subject: [PATCH 4/4] update e2e --- .idea/workspace.xml | 116 ------------------------------------------- scripts/tests.e2e.sh | 6 +-- 2 files changed, 3 insertions(+), 119 deletions(-) delete mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index a750f788..00000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1680552311375 - - - - - - - - - - true - - - - - - file://$PROJECT_DIR$/local/blockchain.go - 478 - - - - - \ No newline at end of file diff --git a/scripts/tests.e2e.sh b/scripts/tests.e2e.sh index bd6396bf..6c5681a0 100755 --- a/scripts/tests.e2e.sh +++ b/scripts/tests.e2e.sh @@ -9,9 +9,9 @@ if ! [[ "$0" =~ scripts/tests.e2e.sh ]]; then exit 255 fi -DEFAULT_VERSION_1=1.9.7 -DEFAULT_VERSION_2=1.9.6 -DEFAULT_SUBNET_EVM_VERSION=0.4.8 +DEFAULT_VERSION_1=1.9.16 +DEFAULT_VERSION_2=1.9.15 +DEFAULT_SUBNET_EVM_VERSION=0.4.12 if [ $# == 0 ]; then VERSION_1=$DEFAULT_VERSION_1