diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml index c4865745..ed0d7062 100644 --- a/.github/workflows/build-test-release.yml +++ b/.github/workflows/build-test-release.yml @@ -28,7 +28,7 @@ jobs: run: scripts/tests.integration.sh - name: Run e2e tests shell: bash - run: E2E=true scripts/run.sh 1.8.0 + run: E2E=true scripts/run.sh 1.9.0 env: E2E: true - name: Run GoReleaser for cross-platform builds diff --git a/README.md b/README.md index b531869b..f01ecf06 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,8 @@ this to its logical conclusion). [v0.0.5] AvalancheGo@v1.7.11-v1.7.12 [v0.0.6] AvalancheGo@v1.7.13-v1.7.18 [v0.0.7] AvalancheGo@v1.7.13-v1.7.18 -[v0.0.8] AvalancheGo@v1.8.0-v1.8.1 +[v0.0.8] AvalancheGo@v1.8.0-v1.8.6 +[v0.0.9] AvalancheGo@v1.9.0 ``` ## Introduction diff --git a/go.mod b/go.mod index a8c51fe3..47928c7e 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module github.com/ava-labs/spacesvm go 1.18 require ( - github.com/ava-labs/avalanche-network-runner-sdk v0.1.0 - github.com/ava-labs/avalanchego v1.8.0 - github.com/ethereum/go-ethereum v1.10.23 + github.com/ava-labs/avalanche-network-runner-sdk v0.2.0 + github.com/ava-labs/avalanchego v1.9.0 + github.com/ethereum/go-ethereum v1.10.25 github.com/fatih/color v1.13.0 github.com/golang/mock v1.6.0 github.com/gorilla/rpc v1.2.0 @@ -13,6 +13,7 @@ require ( github.com/onsi/ginkgo/v2 v2.1.4 github.com/onsi/gomega v1.19.0 github.com/spf13/cobra v1.3.0 + github.com/stretchr/testify v1.7.2 sigs.k8s.io/yaml v1.3.0 ) @@ -45,7 +46,6 @@ require ( github.com/prometheus/procfs v0.7.3 // indirect github.com/shirou/gopsutil v3.21.11+incompatible // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/stretchr/testify v1.7.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect github.com/tklauser/go-sysconf v0.3.5 // indirect github.com/tklauser/numcpus v0.2.2 // indirect diff --git a/go.sum b/go.sum index 79e27329..df3f2832 100644 --- a/go.sum +++ b/go.sum @@ -62,10 +62,10 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/ava-labs/avalanche-network-runner-sdk v0.1.0 h1:m35SkmT7OO0cxrnqHCtQ0v8BHsDw8EZmo+yjH0DTqIs= -github.com/ava-labs/avalanche-network-runner-sdk v0.1.0/go.mod h1:1oDcmKg7Ed2QN3uxl6r5FqMsZMSAsGVBtI4ra0ewW/A= -github.com/ava-labs/avalanchego v1.8.0 h1:rQrK6YzIMqjaZ9YQbL1TcbUwzFdTeMXGqzynEB+w8bE= -github.com/ava-labs/avalanchego v1.8.0/go.mod h1:KzMGQZ77xkTVxkxl/zGH3aIGjaHnGbuPTycxkcjngIc= +github.com/ava-labs/avalanche-network-runner-sdk v0.2.0 h1:YNvM0oFlb7A825kGe0XwwZuvIXTKF1BsuvxJdRLhIaI= +github.com/ava-labs/avalanche-network-runner-sdk v0.2.0/go.mod h1:bEBRVZnGeRiNdDJAFUj+gA/TPzNDbpY/WzgDAHHwJb8= +github.com/ava-labs/avalanchego v1.9.0 h1:9H6LZMVH9aSUJXviyBxn9owX8Dgs4azN7ojRsqLQpq0= +github.com/ava-labs/avalanchego v1.9.0/go.mod h1:F0VZ+ukCllfz8VT79wZQlcRsTh1sbCCi5iWIhbLG8BQ= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -121,8 +121,8 @@ github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPO github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= -github.com/ethereum/go-ethereum v1.10.23 h1:Xk8XAT4/UuqcjMLIMF+7imjkg32kfVFKoeyQDaO2yWM= -github.com/ethereum/go-ethereum v1.10.23/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= +github.com/ethereum/go-ethereum v1.10.25 h1:5dFrKJDnYf8L6/5o42abCE6a9yJm9cs4EJVRyYMr55s= +github.com/ethereum/go-ethereum v1.10.25/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index ea1769f0..64ef7e60 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -16,6 +16,7 @@ import ( "time" runner_sdk "github.com/ava-labs/avalanche-network-runner-sdk" + "github.com/ava-labs/avalanche-network-runner-sdk/rpcpb" "github.com/ava-labs/avalanchego/ids" "github.com/ava-labs/spacesvm/chain" "github.com/ava-labs/spacesvm/client" @@ -153,9 +154,13 @@ var _ = ginkgo.BeforeSuite(func() { ctx, execPath, runner_sdk.WithPluginDir(pluginDir), - runner_sdk.WithCustomVMs(map[string]string{ - vmName: vmGenesisPath, - })) + runner_sdk.WithBlockchainSpecs( + []*rpcpb.BlockchainSpec{ + { + VmName: vmName, + Genesis: vmGenesisPath, + }, + })) cancel() gomega.Expect(err).Should(gomega.BeNil()) outf("{{green}}successfully started:{{/}} %+v\n", resp.ClusterInfo.NodeNames) @@ -195,9 +200,9 @@ done: // all logs are stored under root data dir logsDir = resp.GetClusterInfo().GetRootDataDir() - for _, v := range resp.ClusterInfo.CustomVms { + for _, v := range resp.ClusterInfo.CustomChains { if v.VmId == vmID.String() { - blockchainID = v.BlockchainId + blockchainID = v.ChainId outf("{{blue}}spacesvm is ready:{{/}} %+v\n", v) break done } diff --git a/version/version.go b/version/version.go index 0bafc8b4..0f945725 100644 --- a/version/version.go +++ b/version/version.go @@ -9,5 +9,5 @@ import "github.com/ava-labs/avalanchego/version" var Version = &version.Semantic{ Major: 0, Minor: 0, - Patch: 8, + Patch: 9, }