Add field to the accountInfo struct and correct the WebSocket accountInfo definition (#261)

wmh · Hunter · web-flow · commit f829a21bf6f3 · 2025-01-16T19:14:58.000+01:00
Co-authored-by: Hunter &lt;hunter.wu@herewebit.com&gt;
diff --git a/rpc/client_test.go b/rpc/client_test.go
@@ -2744,7 +2744,7 @@ func TestClient_GetTokenAccountBalance(t *testing.T) {
 }
 
 func TestClient_GetTokenAccountsByDelegate(t *testing.T) {
-	responseBody := `{"context":{"slot":1114},"value":[{"account":{"data":{"program":"spl-token","parsed":{"accountType":"account","info":{"tokenAmount":{"amount":"1","decimals":1,"uiAmount":0.1,"uiAmountString":"0.1"},"delegate":"4Nd1mBQtrMJVYVfKf2PJy9NZUZdTAsp7D4xWLs4gDB4T","delegatedAmount":1,"isInitialized":true,"isNative":false,"mint":"3wyAj7Rt1TWVPZVteFJPLa26JmLvdb1CAKEFZm3NY75E","owner":"CnPoSPKXu7wJqxe59Fs72tkBeALovhsCxYeFwPCQH9TD"}}},"executable":false,"lamports":1726080,"owner":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA","rentEpoch":4},"pubkey":"CnPoSPKXu7wJqxe59Fs72tkBeALovhsCxYeFwPCQH9TD"}]}`
+	responseBody := `{"context":{"slot":1114},"value":[{"account":{"data":{"program":"spl-token","parsed":{"accountType":"account","info":{"tokenAmount":{"amount":"1","decimals":1,"uiAmount":0.1,"uiAmountString":"0.1"},"delegate":"4Nd1mBQtrMJVYVfKf2PJy9NZUZdTAsp7D4xWLs4gDB4T","delegatedAmount":1,"isInitialized":true,"isNative":false,"mint":"3wyAj7Rt1TWVPZVteFJPLa26JmLvdb1CAKEFZm3NY75E","owner":"CnPoSPKXu7wJqxe59Fs72tkBeALovhsCxYeFwPCQH9TD"}}},"executable":false,"lamports":1726080,"owner":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA","rentEpoch":4,"space":0},"pubkey":"CnPoSPKXu7wJqxe59Fs72tkBeALovhsCxYeFwPCQH9TD"}]}`
 	server, closer := mockJSONRPC(t, stdjson.RawMessage(wrapIntoRPC(responseBody)))
 	defer closer()
 	client := New(server.URL)
@@ -2800,7 +2800,7 @@ func TestClient_GetTokenAccountsByDelegate(t *testing.T) {
 }
 
 func TestClient_GetTokenAccountsByOwner(t *testing.T) {
-	responseBody := `{"context":{"slot":1114},"value":[{"account":{"data":{"program":"spl-token","parsed":{"accountType":"account","info":{"tokenAmount":{"amount":"1","decimals":1,"uiAmount":0.1,"uiAmountString":"0.1"},"delegate":null,"delegatedAmount":1,"isInitialized":true,"isNative":false,"mint":"3wyAj7Rt1TWVPZVteFJPLa26JmLvdb1CAKEFZm3NY75E","owner":"4Qkev8aNZcqFNSRhQzwyLMFSsi94jHqE8WNVTJzTP99F"}}},"executable":false,"lamports":1726080,"owner":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA","rentEpoch":4},"pubkey":"CnPoSPKXu7wJqxe59Fs72tkBeALovhsCxYeFwPCQH9TD"}]}`
+	responseBody := `{"context":{"slot":1114},"value":[{"account":{"data":{"program":"spl-token","parsed":{"accountType":"account","info":{"tokenAmount":{"amount":"1","decimals":1,"uiAmount":0.1,"uiAmountString":"0.1"},"delegate":null,"delegatedAmount":1,"isInitialized":true,"isNative":false,"mint":"3wyAj7Rt1TWVPZVteFJPLa26JmLvdb1CAKEFZm3NY75E","owner":"4Qkev8aNZcqFNSRhQzwyLMFSsi94jHqE8WNVTJzTP99F"}}},"executable":false,"lamports":1726080,"owner":"TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA","rentEpoch":4,"space":0},"pubkey":"CnPoSPKXu7wJqxe59Fs72tkBeALovhsCxYeFwPCQH9TD"}]}`
 	server, closer := mockJSONRPC(t, stdjson.RawMessage(wrapIntoRPC(responseBody)))
 	defer closer()
 	client := New(server.URL)
diff --git a/rpc/types.go b/rpc/types.go
@@ -322,6 +322,9 @@ type Account struct {
 
 	// The epoch at which this account will next owe rent
 	RentEpoch *big.Int `json:"rentEpoch"`
+
+	// The amount of storage space required to store the token account
+	Space uint64 `json:"space"`
 }
 
 type DataBytesOrJSON struct {
diff --git a/rpc/ws/accountSubscribe.go b/rpc/ws/accountSubscribe.go
@@ -23,11 +23,9 @@ import (
 
 type AccountResult struct {
 	Context struct {
-		Slot uint64
+		Slot uint64 `json:"slot"`
 	} `json:"context"`
-	Value struct {
-		rpc.Account
-	} `json:"value"`
+	Value *rpc.Account `json:"value"`
 }
 
 // AccountSubscribe subscribes to an account to receive notifications
diff --git a/rpc/ws/client_test.go b/rpc/ws/client_test.go
@@ -51,8 +51,8 @@ func Test_AccountSubscribe(t *testing.T) {
 		return
 	}
 	text.NewEncoder(os.Stdout).Encode(data, nil)
-	fmt.Println("OpenOrders: ", data.Value.Account.Owner)
-	fmt.Println("data: ", data.Value.Account.Data)
+	fmt.Println("OpenOrders: ", data.Value.Owner)
+	fmt.Println("data: ", data.Value.Data)
 	return
 }
 
@@ -107,8 +107,8 @@ func Test_AccountSubscribeWithHttpHeader(t *testing.T) {
 		t.Errorf("encoding error: %v", err)
 	}
 
-	t.Log("OpenOrders: ", data.Value.Account.Owner)
-	t.Log("data: ", data.Value.Account.Data)
+	t.Log("OpenOrders: ", data.Value.Owner)
+	t.Log("data: ", data.Value.Data)
 }
 
 func Test_ProgramSubscribe(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -322,6 +322,9 @@ type Account struct {`
`322`	`322`
`323`	`323`	`// The epoch at which this account will next owe rent`
`324`	`324`	RentEpoch *big.Int `json:"rentEpoch"`
	`325`	`+`
	`326`	`+ // The amount of storage space required to store the token account`
	`327`	+ Space uint64 `json:"space"`
`325`	`328`	`}`
`326`	`329`
`327`	`330`	`type DataBytesOrJSON struct {`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,8 @@ func Test_AccountSubscribe(t *testing.T) {`
`51`	`51`	`return`
`52`	`52`	`}`
`53`	`53`	`text.NewEncoder(os.Stdout).Encode(data, nil)`
`54`		`- fmt.Println("OpenOrders: ", data.Value.Account.Owner)`
`55`		`- fmt.Println("data: ", data.Value.Account.Data)`
	`54`	`+ fmt.Println("OpenOrders: ", data.Value.Owner)`
	`55`	`+ fmt.Println("data: ", data.Value.Data)`
`56`	`56`	`return`
`57`	`57`	`}`
`58`	`58`
`@@ -107,8 +107,8 @@ func Test_AccountSubscribeWithHttpHeader(t *testing.T) {`
`107`	`107`	`t.Errorf("encoding error: %v", err)`
`108`	`108`	`}`
`109`	`109`
`110`		`- t.Log("OpenOrders: ", data.Value.Account.Owner)`
`111`		`- t.Log("data: ", data.Value.Account.Data)`
	`110`	`+ t.Log("OpenOrders: ", data.Value.Owner)`
	`111`	`+ t.Log("data: ", data.Value.Data)`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`func Test_ProgramSubscribe(t *testing.T) {`