Merge pull request #494 from vegaprotocol/release/v0.13.x

Release version 0.13.0

.github/workflows/release-binaries.yml

@@ -195,7 +195,7 @@ jobs:
   release-windows:
     needs: check-version
     name: Release on Windows ${{ matrix.arch }}
-    runs-on: windows-latest
+    runs-on: windows-2019
     strategy:
       matrix:
         arch:

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## Unreleased (0.13.0)
+## Unreleased (0.14.0)
 
 ### 🚨 Breaking changes
 - [](https://github.com/vegaprotocol/vegawallet/pull/) -
@@ -18,6 +18,14 @@
 - [](https://github.com/vegaprotocol/vegawallet/pull/) -
 
 
+## 0.13.0
+
+### 🛠  Improvements
+- [484](https://github.com/vegaprotocol/vegawallet/pull/484) - Add JSON structure tags to handler requests, to match responses format
+
+### 🐛 Fixes
+- [487](https://github.com/vegaprotocol/vegawallet/pull/487) - Update to work with changes in `protos`
+
 ## 0.12.0
 
 ### 🚨 Breaking changes
@@ -51,6 +59,7 @@
 - [449](https://github.com/vegaprotocol/vegawallet/pull/449) - Don't use unicode glyphs on windows
 - [444](https://github.com/vegaprotocol/vegawallet/pull/444) - Fail gracefully when trying to get password input on msys
 - [455](https://github.com/vegaprotocol/vegawallet/pull/455) - New Liquidity Provisioning commands removed requirement for Id field
+- [485](https://github.com/vegaprotocol/vegawallet/pull/485) - Update Windows VM version to fix code signing
 
 ## 0.11.0
 

cmd/command_send_test.go

@@ -1,6 +1,7 @@
 package cmd_test
 
 import (
+	"encoding/json"
 	"testing"
 
 	"code.vegaprotocol.io/protos/vega"
@@ -72,7 +73,10 @@ func testSendCommandFlagsValidFlagsSucceeds(t *testing.T) {
 	// then
 	require.NoError(t, err)
 	require.NotNil(t, req)
-	assert.Equal(t, expectedReq, req)
+
+	expectedJSON, _ := json.Marshal(expectedReq)
+	actualJSON, _ := json.Marshal(req)
+	assert.Equal(t, expectedJSON, actualJSON)
 }
 
 func testSendCommandFlagsMissingWalletFails(t *testing.T) {

cmd/command_sign_test.go

@@ -1,6 +1,7 @@
 package cmd_test
 
 import (
+	"encoding/json"
 	"testing"
 
 	"code.vegaprotocol.io/protos/vega"
@@ -63,7 +64,10 @@ func testSignCommandFlagsValidFlagsSucceeds(t *testing.T) {
 	// then
 	require.NoError(t, err)
 	require.NotNil(t, req)
-	assert.Equal(t, expectedReq, req)
+
+	expectedJSON, _ := json.Marshal(expectedReq)
+	actualJSON, _ := json.Marshal(req)
+	assert.Equal(t, expectedJSON, actualJSON)
 }
 
 func testSignCommandFlagsMissingWalletFails(t *testing.T) {

cmd/network_describe.go

@@ -99,7 +99,7 @@ func PrintDescribeNetworkResponse(w io.Writer, resp *network.DescribeNetworkResp
 	p := printer.NewInteractivePrinter(w)
 	p.NextLine().Text("Network").NextLine()
 	p.Text("  Name:         ").WarningText(resp.Name).NextLine()
-	p.Text("  Address:      ").WarningText(resp.Host).Text(":").WarningText(fmt.Sprint(resp.Port)).NextLine()
+	p.Text("  Address:      ").WarningText(resp.Host).WarningText(":").WarningText(fmt.Sprint(resp.Port)).NextLine()
 	p.Text("  Token expiry: ").WarningText(resp.TokenExpiry).NextLine()
 	p.Text("  Level:        ").WarningText(resp.Level)
 	p.NextSection()
@@ -127,6 +127,6 @@ func PrintDescribeNetworkResponse(w io.Writer, resp *network.DescribeNetworkResp
 	p.NextLine()
 
 	p.Text("Console").NextLine()
-	p.Text("  Address: ").WarningText(resp.Console.URL).Text(":").WarningText(fmt.Sprint(resp.Console.LocalPort))
+	p.Text("  Address: ").WarningText(resp.Console.URL).WarningText(":").WarningText(fmt.Sprint(resp.Console.LocalPort))
 	p.NextSection()
 }

cmd/tx_send_test.go

@@ -1,6 +1,7 @@
 package cmd_test
 
 import (
+	"encoding/json"
 	"testing"
 
 	commandspb "code.vegaprotocol.io/protos/vega/commands/v1"
@@ -58,7 +59,9 @@ func testSendTxFlagsValidFlagsSucceeds(t *testing.T) {
 	// then
 	require.NoError(t, err)
 	require.NotNil(t, req)
-	assert.Equal(t, expectedReq, req)
+	expectedJSON, _ := json.Marshal(expectedReq)
+	actualJSON, _ := json.Marshal(req)
+	assert.Equal(t, expectedJSON, actualJSON)
 }
 
 func testSendTxFlagsMissingLogLevelFails(t *testing.T) {

commands/commands.go

@@ -37,8 +37,8 @@ func CheckSubmitTransactionRequest(req *walletpb.SubmitTransactionRequest) comma
 		cmdErr = commands.CheckLiquidityProvisionSubmission(cmd.LiquidityProvisionSubmission)
 	case *walletpb.SubmitTransactionRequest_ProposalSubmission:
 		cmdErr = commands.CheckProposalSubmission(cmd.ProposalSubmission)
-	case *walletpb.SubmitTransactionRequest_NodeRegistration:
-		cmdErr = commands.CheckNodeRegistration(cmd.NodeRegistration)
+	case *walletpb.SubmitTransactionRequest_AnnounceNode:
+		cmdErr = commands.CheckAnnounceNode(cmd.AnnounceNode)
 	case *walletpb.SubmitTransactionRequest_NodeVote:
 		cmdErr = commands.CheckNodeVote(cmd.NodeVote)
 	case *walletpb.SubmitTransactionRequest_NodeSignature:
@@ -102,9 +102,9 @@ func wrapRequestCommandIntoInputData(data *commandspb.InputData, req *walletpb.S
 		data.Command = &commandspb.InputData_ProposalSubmission{
 			ProposalSubmission: req.GetProposalSubmission(),
 		}
-	case *walletpb.SubmitTransactionRequest_NodeRegistration:
-		data.Command = &commandspb.InputData_NodeRegistration{
-			NodeRegistration: req.GetNodeRegistration(),
+	case *walletpb.SubmitTransactionRequest_AnnounceNode:
+		data.Command = &commandspb.InputData_AnnounceNode{
+			AnnounceNode: req.GetAnnounceNode(),
 		}
 	case *walletpb.SubmitTransactionRequest_NodeVote:
 		data.Command = &commandspb.InputData_NodeVote{

go.mod

@@ -3,13 +3,13 @@ module code.vegaprotocol.io/vegawallet
 go 1.17
 
 require (
-	code.vegaprotocol.io/protos v0.48.0
+	code.vegaprotocol.io/protos v0.49.0
 	code.vegaprotocol.io/shared v0.0.0-20220202150846-b6aba31dcdb0
 	github.com/blang/semver/v4 v4.0.0
 	github.com/cenkalti/backoff/v4 v4.0.2
 	github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1
-	github.com/golang/mock v1.4.3
-	github.com/golang/protobuf v1.4.3
+	github.com/golang/mock v1.4.4
+	github.com/golang/protobuf v1.5.2
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/muesli/termenv v0.9.0
 	github.com/oasisprotocol/curve25519-voi v0.0.0-20210716083614-f38f8e8b0b84
@@ -22,14 +22,14 @@ require (
 	go.uber.org/zap v1.20.0
 	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
 	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
-	google.golang.org/grpc v1.38.0
+	google.golang.org/grpc v1.43.0
 )
 
 require (
 	github.com/BurntSushi/toml v1.0.0 // indirect
 	github.com/adrg/xdg v0.3.3 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.3 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
@@ -42,7 +42,7 @@ require (
 	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
 	golang.org/x/net v0.0.0-20210610132358-84b48f89b13b // indirect
 	golang.org/x/text v0.3.6 // indirect
-	google.golang.org/genproto v0.0.0-20201119123407-9b1e624d6bc4 // indirect
-	google.golang.org/protobuf v1.26.0-rc.1 // indirect
+	google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )