Add core protocol version to GetNetworkResponse struct

clients/stellarcore/client.go

@@ -90,7 +90,8 @@ type GenSorobanConfig struct {
 }
 
 func GenSorobanConfigUpgradeTxAndKey(
-	config GenSorobanConfig, upgradeConfig xdr.ConfigUpgradeSet) ([]xdr.TransactionEnvelope, xdr.ConfigUpgradeSetKey, error) {
+	config GenSorobanConfig, upgradeConfig xdr.ConfigUpgradeSet,
+) ([]xdr.TransactionEnvelope, xdr.ConfigUpgradeSetKey, error) {
 	upgradeConfigB64, err := xdr.MarshalBase64(upgradeConfig)
 	if err != nil {
 		return nil, xdr.ConfigUpgradeSetKey{}, err
@@ -99,7 +100,7 @@ func GenSorobanConfigUpgradeTxAndKey(
 	cmd := exec.Command("docker", "pull", config.StellarCoreImage)
 	_, err = cmd.Output()
 	if err != nil {
-		return nil, xdr.ConfigUpgradeSetKey{}, err
+		return nil, xdr.ConfigUpgradeSetKey{}, fmt.Errorf("docker pull failed (is docker running?): %v", err)
 	}
 
 	cmd = exec.Command("docker",
@@ -116,7 +117,7 @@ func GenSorobanConfigUpgradeTxAndKey(
 	cmd.Stdin = strings.NewReader(inputStr)
 	out, err := cmd.Output()
 	if err != nil {
-		return nil, xdr.ConfigUpgradeSetKey{}, err
+		return nil, xdr.ConfigUpgradeSetKey{}, fmt.Errorf("docker run failed: %v", err)
 	}
 	lines := strings.Split(string(out), "\n")
 	if len(lines) < 9 {
@@ -129,7 +130,7 @@ func GenSorobanConfigUpgradeTxAndKey(
 	for i, txB64 := range txsB64 {
 		err = xdr.SafeUnmarshalBase64(txB64, &txs[i])
 		if err != nil {
-			return nil, xdr.ConfigUpgradeSetKey{}, err
+			return nil, xdr.ConfigUpgradeSetKey{}, fmt.Errorf("failed to unmarshal transaction envelope: %v", err)
 		}
 	}
 	var key xdr.ConfigUpgradeSetKey
@@ -199,7 +200,7 @@ func (c *Client) Info(ctx context.Context) (resp *proto.InfoResponse, err error)
 	}
 	defer drainReponse(hresp, true, &err) //nolint:errcheck
 
-	if !(hresp.StatusCode >= 200 && hresp.StatusCode < 300) {
+	if hresp.StatusCode < 200 || hresp.StatusCode >= 300 {
 		err = errors.New("http request failed with non-200 status code")
 		return
 	}
@@ -220,7 +221,6 @@ func (c *Client) SetCursor(ctx context.Context, id string, cursor int32) (err er
 		"id":     []string{id},
 		"cursor": []string{fmt.Sprintf("%d", cursor)},
 	})
-
 	if err != nil {
 		return errors.Wrap(err, "failed to create request")
 	}
@@ -300,7 +300,6 @@ func (c *Client) SubmitTransaction(ctx context.Context, envelope string) (resp *
 func (c *Client) WaitForNetworkSync(ctx context.Context) error {
 	for {
 		info, err := c.Info(ctx)
-
 		if err != nil {
 			return errors.Wrap(err, "info request failed")
 		}

clients/stellarcore/main_test.go

@@ -9,7 +9,6 @@ func ExampleClient_Info() {
 	client := &Client{URL: "http://localhost:11626"}
 
 	info, err := client.Info(context.Background())
-
 	if err != nil {
 		panic(err)
 	}

protocols/rpc/get_network.go

@@ -5,7 +5,8 @@ const GetNetworkMethodName = "getNetwork"
 type GetNetworkRequest struct{}
 
 type GetNetworkResponse struct {
-	FriendbotURL    string `json:"friendbotUrl,omitempty"`
-	Passphrase      string `json:"passphrase"`
-	ProtocolVersion int    `json:"protocolVersion"`
+	FriendbotURL                 string `json:"friendbotUrl,omitempty"`
+	Passphrase                   string `json:"passphrase"`
+	ProtocolVersion              int    `json:"protocolVersion"`
+	CoreSupportedProtocolVersion int    `json:"coreSupportedProtocolVersion"`
 }

protocols/stellarcore/info_response.go

@@ -9,8 +9,6 @@ type InfoResponse struct {
 		ProtocolVersion int        `json:"protocol_version"`
 		State           string     `json:"state"`
 		Ledger          LedgerInfo `json:"ledger"`
-
-		// TODO: all the other fields
 	}
 }
 
@@ -27,8 +25,7 @@ type LedgerInfo struct {
 	Version      int    `json:"version"`
 }
 
-// IsSynced returns a boolean indicating whether stellarcore is synced with the
-// network.
+// bool indicating whether stellarcore is synced with the network.
 func (resp *InfoResponse) IsSynced() bool {
 	return resp.Info.State == "Synced!"
 }