New text decoder

New decode use into get transactions

cmd/slnc/cmd/get_transactions.go

@@ -17,6 +17,9 @@ package cmd
 import (
 	"context"
 	"fmt"
+	"os"
+
+	"github.com/dfuse-io/solana-go/text"
 
 	"github.com/dfuse-io/solana-go"
 	"github.com/dfuse-io/solana-go/rpc"
@@ -38,7 +41,7 @@ var getTransactionsCmd = &cobra.Command{
 		errorCheck("public key", err)
 
 		csList, err := client.GetConfirmedSignaturesForAddress2(ctx, pubKey, &rpc.GetConfirmedSignaturesForAddress2Opts{
-			Limit:  10,
+			Limit:  100,
 			Before: "",
 			Until:  "",
 		})
@@ -47,17 +50,20 @@ var getTransactionsCmd = &cobra.Command{
 
 		for _, cs := range csList {
 			fmt.Println("-----------------------------------------------------------------------------------------------")
-			fmt.Println("Transaction: ", cs.Signature)
-			fmt.Println("Slot: ", cs.Slot)
-			fmt.Println("Memo: ", cs.Memo)
+			text.EncoderColorCyan.Print("Transaction: ")
+			fmt.Println(cs.Signature)
+
+			text.EncoderColorGreen.Print("Slot: ")
+			fmt.Println(cs.Slot)
+			text.EncoderColorGreen.Print("Memo: ")
+			fmt.Println(cs.Memo)
 
 			ct, err := client.GetConfirmedTransaction(ctx, cs.Signature)
 			errorCheck("confirm transaction", err)
 			if ct.Meta.Err != nil {
 				fmt.Println("ERROR:", ct.Meta.Err)
 				//	for k, _ := range ct.Meta.Err
 			}
-			fmt.Println("account count:", len(ct.Transaction.Message.AccountKeys))
 
 			fmt.Print("\nInstructions:\n-------------\n\n")
 			for _, i := range ct.Transaction.Message.Instructions {
@@ -80,10 +86,11 @@ var getTransactionsCmd = &cobra.Command{
 					continue
 				}
 
-				decoded, err := decoder(ct.Transaction.Message.AccountKeys, &i)
-				fmt.Printf("%s\n\n", decoded)
+				decoded, err := decoder(ct.Transaction.AccountMetaList(), &i)
+				err = text.NewEncoder(os.Stdout).Encode(decoded, nil)
+				errorCheck("textEncoding", err)
 			}
-			fmt.Print("End of transaction\n\n")
+			text.EncoderColorCyan.Print("\n\nEnd of transaction\n\n")
 		}
 
 		return nil

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/GeertJohan/go.rice v1.0.0
 	github.com/dfuse-io/binary v0.0.0-20201117201711-8656308cf309
 	github.com/dfuse-io/logging v0.0.0-20201110202154-26697de88c79
+	github.com/fatih/color v1.7.0
 	github.com/google/go-cmp v0.4.1 // indirect
 	github.com/gorilla/rpc v1.2.0
 	github.com/gorilla/websocket v1.4.2
@@ -25,5 +26,4 @@ require (
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 	golang.org/x/tools v0.0.0-20200601175630-2caf76543d99 // indirect
 	google.golang.org/api v0.15.0
-	gotest.tools v2.2.0+incompatible
 )

interface.go

@@ -1,5 +1,5 @@
 package solana
 
 type AccountSettable interface {
-	SetAccounts(accounts []PublicKey, instructionActIdx []uint8) error
+	SetAccounts(accounts []*AccountMeta, instructionActIdx []uint8) error
 }

registry.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 )
 
-type InstructionDecoder func([]PublicKey, *CompiledInstruction) (interface{}, error)
+type InstructionDecoder func([]*AccountMeta, *CompiledInstruction) (interface{}, error)
 
 var InstructionDecoderRegistry = map[string]InstructionDecoder{}
 
@@ -16,7 +16,7 @@ func RegisterInstructionDecoder(programID PublicKey, decoder InstructionDecoder)
 	InstructionDecoderRegistry[p] = decoder
 }
 
-func DecodeInstruction(programID PublicKey, accounts []PublicKey, inst *CompiledInstruction) (interface{}, error) {
+func DecodeInstruction(programID PublicKey, accounts []*AccountMeta, inst *CompiledInstruction) (interface{}, error) {
 	p := programID.String()
 
 	decoder, found := InstructionDecoderRegistry[p]

rpc/client_test.go

@@ -44,8 +44,8 @@ func TestClient_GetAccountInfo(t *testing.T) {
 
 func TestClient_GetConfirmedSignaturesForAddress2(t *testing.T) {
 	c := NewClient("http://api.mainnet-beta.solana.com:80/rpc")
-	account := solana.MustPublicKeyFromBase58("CG1XSWuXo2rw2SuHTRc54nihKvLKh4wMYi7oF3487LYt")
-	accInfo, err := c.GetConfirmedSignaturesForAddress2(context.Background(), account, nil)
+	account := solana.MustPublicKeyFromBase58("H7ATJQGhwG8Uf8sUntUognFpsKixPy2buFnXkvyNbGUb")
+	accInfo, err := c.GetConfirmedSignaturesForAddress2(context.Background(), account, &GetConfirmedSignaturesForAddress2Opts{Limit: 1})
 	require.NoError(t, err)
 
 	d, err := json.MarshalIndent(accInfo, "", " ")

rpc/types.go

@@ -113,7 +113,7 @@ type KeyedAccount struct {
 
 type GetConfirmedSignaturesForAddress2Opts struct {
 	Limit  uint64 `json:"limit,omitempty"`
-	Before string `json:"limit,omitempty"`
+	Before string `json:"before,omitempty"`
 	Until  string `json:"until,omitempty"`
 }