token program: fix Mint decoding/encoding (optional = uint32 0 or 1)

programs/token/accounts.go

@@ -14,7 +14,13 @@
 
 package token
 
-import ag_solanago "github.com/gagliardetto/solana-go"
+import (
+	"encoding/binary"
+
+	bin "github.com/gagliardetto/binary"
+	"github.com/gagliardetto/solana-go"
+	ag_solanago "github.com/gagliardetto/solana-go"
+)
 
 type Mint struct {
 	// Optional authority used to mint new tokens. The mint authority may only be provided during
@@ -35,6 +41,107 @@ type Mint struct {
 	FreezeAuthority *ag_solanago.PublicKey `bin:"optional"`
 }
 
+func (mint *Mint) UnmarshalWithDecoder(dec *bin.Decoder) (err error) {
+	{
+		v, err := dec.ReadUint32(binary.LittleEndian)
+		if err != nil {
+			return err
+		}
+		if v == 1 {
+			v, err := dec.ReadNBytes(32)
+			if err != nil {
+				return err
+			}
+			mint.MintAuthority = solana.PublicKeyFromBytes(v).ToPointer()
+		}
+	}
+	{
+		v, err := dec.ReadUint64(binary.LittleEndian)
+		if err != nil {
+			return err
+		}
+		mint.Supply = v
+	}
+	{
+		v, err := dec.ReadUint8()
+		if err != nil {
+			return err
+		}
+		mint.Decimals = v
+	}
+	{
+		v, err := dec.ReadBool()
+		if err != nil {
+			return err
+		}
+		mint.IsInitialized = v
+	}
+	{
+		v, err := dec.ReadUint32(binary.LittleEndian)
+		if err != nil {
+			return err
+		}
+		if v == 1 {
+			v, err := dec.ReadNBytes(32)
+			if err != nil {
+				return err
+			}
+			mint.FreezeAuthority = solana.PublicKeyFromBytes(v).ToPointer()
+		}
+	}
+	return nil
+}
+
+func (mint Mint) MarshalWithEncoder(encoder *bin.Encoder) (err error) {
+	{
+		if mint.MintAuthority == nil {
+			err = encoder.WriteUint32(0, binary.LittleEndian)
+			if err != nil {
+				return err
+			}
+		} else {
+			err = encoder.WriteUint32(1, binary.LittleEndian)
+			if err != nil {
+				return err
+			}
+			err = encoder.WriteBytes(mint.MintAuthority[:], false)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	err = encoder.WriteUint64(mint.Supply, binary.LittleEndian)
+	if err != nil {
+		return err
+	}
+	err = encoder.WriteUint8(mint.Decimals)
+	if err != nil {
+		return err
+	}
+	err = encoder.WriteBool(mint.IsInitialized)
+	if err != nil {
+		return err
+	}
+	{
+		if mint.FreezeAuthority == nil {
+			err = encoder.WriteUint32(0, binary.LittleEndian)
+			if err != nil {
+				return err
+			}
+		} else {
+			err = encoder.WriteUint32(1, binary.LittleEndian)
+			if err != nil {
+				return err
+			}
+			err = encoder.WriteBytes(mint.FreezeAuthority[:], false)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
 type Account struct {
 	// The mint associated with this account
 	Mint ag_solanago.PublicKey

programs/token/accounts_test.go

@@ -0,0 +1,39 @@
+package token
+
+import (
+	"bytes"
+	"testing"
+
+	bin "github.com/gagliardetto/binary"
+	"github.com/gagliardetto/solana-go"
+	"github.com/stretchr/testify/require"
+)
+
+func TestMint(t *testing.T) {
+	account := []byte{1, 0, 0, 0, 5, 234, 156, 241, 108, 228, 17, 152, 241, 164, 153, 55, 200, 140, 55, 10, 148, 212, 175, 255, 137, 181, 186, 203, 142, 244, 94, 99, 36, 187, 120, 247, 9, 169, 49, 235, 241, 182, 6, 0, 6, 1, 1, 0, 0, 0, 5, 234, 156, 241, 108, 228, 17, 152, 241, 164, 153, 55, 200, 140, 55, 10, 148, 212, 175, 255, 137, 181, 186, 203, 142, 244, 94, 99, 36, 187, 120, 247}
+	{
+		dec := bin.NewBorshDecoder(account)
+		mint := new(Mint)
+
+		err := mint.UnmarshalWithDecoder(dec)
+		require.NoError(t, err)
+
+		require.Equal(t,
+			&Mint{
+				MintAuthority:   solana.MustPublicKeyFromBase58("Q6XprfkF8RQQKoQVG33xT88H7wi8Uk1B1CC7YAs69Gi").ToPointer(),
+				Supply:          1890000009537801,
+				Decimals:        6,
+				IsInitialized:   true,
+				FreezeAuthority: solana.MustPublicKeyFromBase58("Q6XprfkF8RQQKoQVG33xT88H7wi8Uk1B1CC7YAs69Gi").ToPointer(),
+			},
+			mint,
+		)
+
+		{
+			buf := new(bytes.Buffer)
+			err := mint.MarshalWithEncoder(bin.NewBinEncoder(buf))
+			require.NoError(t, err)
+			require.Equal(t, account, buf.Bytes())
+		}
+	}
+}