API: Add types for ledgercore.StateDelta.

client/v2/algod/getLedgerStateDelta.go

@@ -5,18 +5,27 @@ import (
 	"fmt"
 
 	"github.com/algorand/go-algorand-sdk/v2/client/v2/common"
-	"github.com/algorand/go-algorand-sdk/v2/client/v2/common/models"
+	"github.com/algorand/go-algorand-sdk/v2/types"
 )
 
+// GetLedgerStateDeltaParams contains all of the query parameters for url serialization.
+type GetLedgerStateDeltaParams struct {
+
+	// Format configures whether the response object is JSON or MessagePack encoded.
+	Format string `url:"format,omitempty"`
+}
+
 // GetLedgerStateDelta get ledger deltas for a round.
 type GetLedgerStateDelta struct {
 	c *Client
 
 	round uint64
+
+	p GetLedgerStateDeltaParams
 }
 
 // Do performs the HTTP request
-func (s *GetLedgerStateDelta) Do(ctx context.Context, headers ...*common.Header) (response models.LedgerStateDelta, err error) {
-	err = s.c.get(ctx, &response, fmt.Sprintf("/v2/deltas/%s", common.EscapeParams(s.round)...), nil, headers)
+func (s *GetLedgerStateDelta) Do(ctx context.Context, headers ...*common.Header) (response types.LedgerStateDelta, err error) {
+	err = s.c.get(ctx, &response, fmt.Sprintf("/v2/deltas/%s", common.EscapeParams(s.round)...), s.p, headers)
 	return
 }

client/v2/algod/rawTransaction.go

@@ -8,7 +8,8 @@ import (
 	"github.com/algorand/go-algorand-sdk/v2/client/v2/common/models"
 )
 
-// SendRawTransaction broadcasts a raw transaction to the network.
+// SendRawTransaction broadcasts a raw transaction or transaction group to the
+// network.
 type SendRawTransaction struct {
 	c *Client
 

client/v2/common/models/node_status_response.go

@@ -66,4 +66,28 @@ type NodeStatusResponse struct {
 
 	// TimeSinceLastRound timeSinceLastRound in nanoseconds
 	TimeSinceLastRound uint64 `json:"time-since-last-round"`
+
+	// UpgradeDelay upgrade delay
+	UpgradeDelay uint64 `json:"upgrade-delay,omitempty"`
+
+	// UpgradeNextProtocolVoteBefore next protocol round
+	UpgradeNextProtocolVoteBefore uint64 `json:"upgrade-next-protocol-vote-before,omitempty"`
+
+	// UpgradeNoVotes no votes cast for consensus upgrade
+	UpgradeNoVotes uint64 `json:"upgrade-no-votes,omitempty"`
+
+	// UpgradeNodeVote this node's upgrade vote
+	UpgradeNodeVote bool `json:"upgrade-node-vote,omitempty"`
+
+	// UpgradeVoteRounds total voting ounds for current upgrade
+	UpgradeVoteRounds uint64 `json:"upgrade-vote-rounds,omitempty"`
+
+	// UpgradeVotes total votes cast for consensus upgrade
+	UpgradeVotes uint64 `json:"upgrade-votes,omitempty"`
+
+	// UpgradeVotesRequired yes votes required for consensus upgrade
+	UpgradeVotesRequired uint64 `json:"upgrade-votes-required,omitempty"`
+
+	// UpgradeYesVotes yes votes cast for consensus upgrade
+	UpgradeYesVotes uint64 `json:"upgrade-yes-votes,omitempty"`
 }

client/v2/indexer/indexer.go

@@ -10,6 +10,11 @@ const authHeader = "X-Indexer-API-Token"
 
 type Client common.Client
 
+// delete performs a DELETE request to the specific path against the server, assumes JSON response
+func (c *Client) delete(ctx context.Context, response interface{}, path string, body interface{}, headers []*common.Header) error {
+	return (*common.Client)(c).Delete(ctx, response, path, body, headers)
+}
+
 // get performs a GET request to the specific path against the server, assumes JSON response
 func (c *Client) get(ctx context.Context, response interface{}, path string, body interface{}, headers []*common.Header) error {
 	return (*common.Client)(c).Get(ctx, response, path, body, headers)

encoding/json/json.go

@@ -13,6 +13,10 @@ var CodecHandle *codec.JsonHandle
 // LenientCodecHandle is used to instantiate msgpack encoders for the REST API.
 var LenientCodecHandle *codec.JsonHandle
 
+// JSONStrictHandle is the same as CodecHandle but with MapKeyAsString=true
+// for correct maps[int]interface{} encoding
+var JSONStrictHandle *codec.JsonHandle
+
 // init configures our json encoder and decoder
 func init() {
 	CodecHandle = new(codec.JsonHandle)
@@ -30,6 +34,15 @@ func init() {
 	LenientCodecHandle.RecursiveEmptyCheck = true
 	LenientCodecHandle.Indent = 2
 	LenientCodecHandle.HTMLCharsAsIs = true
+
+	JSONStrictHandle = new(codec.JsonHandle)
+	JSONStrictHandle.ErrorIfNoField = CodecHandle.ErrorIfNoField
+	JSONStrictHandle.ErrorIfNoArrayExpand = CodecHandle.ErrorIfNoArrayExpand
+	JSONStrictHandle.Canonical = CodecHandle.Canonical
+	JSONStrictHandle.RecursiveEmptyCheck = CodecHandle.RecursiveEmptyCheck
+	JSONStrictHandle.Indent = CodecHandle.Indent
+	JSONStrictHandle.HTMLCharsAsIs = CodecHandle.HTMLCharsAsIs
+	JSONStrictHandle.MapKeyAsString = true
 }
 
 // Encode returns a json-encoded byte buffer for a given object
@@ -40,6 +53,15 @@ func Encode(obj interface{}) []byte {
 	return b
 }
 
+// EncodeStrict returns a JSON-encoded byte buffer for a given object
+// It is the same Encode but encodes map's int keys as strings
+func EncodeStrict(obj interface{}) []byte {
+	var b []byte
+	enc := codec.NewEncoderBytes(&b, JSONStrictHandle)
+	enc.MustEncode(obj)
+	return b
+}
+
 // Decode attempts to decode a json-encoded byte buffer into an
 // object instance pointed to by objptr
 func Decode(b []byte, objptr interface{}) error {

encoding/json/json_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 type object struct {
@@ -27,7 +28,7 @@ func TestDecode(t *testing.T) {
 		// basic encode/decode test.
 		var decoded object
 		err := Decode(encodedOb, &decoded)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, obj, decoded)
 	})
 
@@ -36,7 +37,7 @@ func TestDecode(t *testing.T) {
 		decoder := NewDecoder(bytes.NewReader(encodedOb))
 		var decoded object
 		err := decoder.Decode(&decoded)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, obj, decoded)
 	})
 
@@ -45,7 +46,7 @@ func TestDecode(t *testing.T) {
 		decoder := NewDecoder(bytes.NewReader(encodedOb))
 		var decoded subsetObject
 		err := decoder.Decode(&decoded)
-		assert.Error(t, err)
+		require.Error(t, err)
 		assert.Contains(t, err.Error(), "no matching struct field found when decoding stream map with key name")
 	})
 
@@ -54,7 +55,32 @@ func TestDecode(t *testing.T) {
 		decoder := NewLenientDecoder(bytes.NewReader(encodedOb))
 		var decoded subsetObject
 		err := decoder.Decode(&decoded)
-		assert.NoError(t, err)
+		require.NoError(t, err)
 		assert.Equal(t, obj.subsetObject, decoded)
 	})
+
+	t.Run("original encode map key as string", func(t *testing.T) {
+		intMap := map[int]string{
+			0: "int key",
+		}
+		data := string(Encode(intMap))
+		assert.NotContains(t, data, "\"0\":")
+	})
+
+	t.Run("strict encode map key as string", func(t *testing.T) {
+		intMap := map[int]string{
+			0: "int key",
+		}
+		data := string(EncodeStrict(intMap))
+		assert.NotContains(t, data, "0:")
+	})
+
+	t.Run("strict encode map interface key as string", func(t *testing.T) {
+		t.Skip("There is a bug in go-codec with MapKeyAsString = true and Canonical = true")
+		intMap := map[interface{}]interface{}{
+			0: "int key",
+		}
+		data := string(EncodeStrict(intMap))
+		assert.NotContains(t, data, "0:")
+	})
 }

test/responses_unit_test.go

@@ -216,7 +216,7 @@ func theParsedResponseShouldEqualTheMockResponse() error {
 		if responseStr, ok := response.(string); ok {
 			responseJson = responseStr
 		} else {
-			responseJson = string(json.Encode(response))
+			responseJson = string(json.EncodeStrict(response))
 		}
 	}
 

test/unit.tags

@@ -28,7 +28,6 @@
 @unit.sourcemap
 @unit.stateproof.paths
 @unit.stateproof.responses
-@unit.stateproof.responses.msgp
 @unit.statedelta
 @unit.tealsign
 @unit.transactions