Merge pull request #18 from dimalinux/fix-create-address

Fixes for get_address and create_address

daemon/daemon_test.go

@@ -3,7 +3,7 @@ package daemon
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -56,7 +56,7 @@ func getClient(uri string, client *http.Client) *MockMoneroRPC {
 
 func setupServer(t *testing.T, method string, output string) *httptest.Server {
 	server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
-		buff, _ := ioutil.ReadAll(req.Body)
+		buff, _ := io.ReadAll(req.Body)
 		t.Log(string(buff))
 		rw.Write([]byte(output))
 	}))

wallet/models.go

@@ -23,16 +23,16 @@ type SetDaemonRequest struct {
 // GetBalanceRequest represents the request model for GetBalance
 type GetBalanceRequest struct {
 	// Return balance for this account.
-	AccountIndex uint64 `json:"account_index"`
+	AccountIndex uint32 `json:"account_index"`
 	// Return balance detail for those subaddresses.
-	AddressIndices uint64 `json:"address_indices,omitempty"`
+	AddressIndices uint32 `json:"address_indices,omitempty"`
 }
 
 // PerSubaddress model
 type PerSubaddress struct {
 	AccountIndex uint32 `json:"account_index"`
 	// Index of the subaddress in the account.
-	AddressIndex uint64 `json:"address_index"`
+	AddressIndex uint32 `json:"address_index"`
 	// Address at this index. Base58 representation of the public keys.
 	Address string `json:"address"`
 	// Balance for the subaddress (locked or unlocked).
@@ -63,29 +63,31 @@ type GetBalanceResponse struct {
 
 // GetAddressRequest represents the request model for GetAddress
 type GetAddressRequest struct {
-	// Return subaddresses for this account.
-	AccountIndex uint64 `json:"account_index"`
-	// List of subaddresses to return from an account.
-	AddressIndex []uint64 `json:"address_index,omitempty"`
+	// Return addresses for this account.
+	AccountIndex uint32 `json:"account_index"`
+	// (Optional, defaults to all) List of address indices to return from the
+	// account. Index 0 is of account 0 is the primary address, all others
+	// are subadddresses.
+	AddressIndices []uint32 `json:"address_index,omitempty"`
 }
 
 // Address model
 type Address struct {
-	// The 95-character hex (sub)address string.
+	// The base58 (sub)address string.
 	Address string `json:"address"`
 	// Label of the (sub)address
 	Label string `json:"label"`
-	// index of the subaddress
-	AddressIndex uint64 `json:"address_index"`
+	// index of the (sub)address
+	AddressIndex uint32 `json:"address_index"`
 	// states if the (sub)address has already received funds
 	Used bool `json:"used"`
 }
 
 // GetAddressResponse represents the response model for GetAddress
 type GetAddressResponse struct {
-	// The 95-character hex address string of the monero-wallet-rpc in session.
+	// The primary address of the requested account index.
 	Address string `json:"address"`
-	// array of addresses informations
+	// Array of address information entries
 	Addresses []Address `json:"addresses"`
 }
 
@@ -98,31 +100,37 @@ type GetAddressIndexRequest struct {
 // Index model
 type Index struct {
 	// Account index.
-	Major uint64 `json:"major"`
-	// Address index.
-	Minor uint64 `json:"minor"`
+	Major uint32 `json:"major"`
+	// Subaddress index.
+	Minor uint32 `json:"minor"`
 }
 
 // GetAddressIndexResponse represents the response model for GetAddressIndex
 type GetAddressIndexResponse struct {
-	// subaddress informations
+	// subaddress information
 	Index Index `json:"index"`
 }
 
 // CreateAddressRequest represents the request model for CreateAddress
 type CreateAddressRequest struct {
-	// Create a new address for this account.
-	AccountIndex uint64 `json:"account_index"`
-	// Label for the new address.
+	// Create the new subaddress(es) in this account.
+	AccountIndex uint32 `json:"account_index"`
+	// (Optional) Label for the new address(es).
 	Label string `json:"label,omitempty"`
+	// (Optional) Number of addresses to create (range: 1 to 64, defaults to 1).
+	Count uint32 `json:"count,omitempty"`
 }
 
 // CreateAddressResponse represents the response model for CreateAddress
 type CreateAddressResponse struct {
-	// Newly created address. Base58 representation of the public keys.
+	// 1st newly created address. Base58 representation of the public keys.
 	Address string `json:"address"`
-	// Index of the new address under the input account.
-	AddressIndex uint64 `json:"address_index"`
+	// Index of the first new address created in the requested account.
+	AddressIndex uint32 `json:"address_index"`
+	// List of all address indices created.
+	AddressIndices []uint32 `json:"address_indices"`
+	// List of all addresses created
+	Addresses []string `json:"addresses"`
 }
 
 // LabelAddressRequest represents the request model for LabelAddress
@@ -166,7 +174,7 @@ type GetAccountsRequest struct {
 // SubaddressAcount model
 type SubaddressAcount struct {
 	// Index of the account.
-	AccountIndex uint64 `json:"account_index"`
+	AccountIndex uint32 `json:"account_index"`
 	// Balance of the account (locked or unlocked).
 	Balance uint64 `json:"balance"`
 	// Base64 representation of the first subaddress in the account.
@@ -198,15 +206,15 @@ type CreateAccountRequest struct {
 // CreateAccountResponse represents the response model for CreateAccount
 type CreateAccountResponse struct {
 	// Index of the new account.
-	AccountIndex uint64 `json:"account_index"`
+	AccountIndex uint32 `json:"account_index"`
 	// Address for this account. Base58 representation of the public keys.
 	Address string `json:"address"`
 }
 
 // LabelAccountRequest represents the request model for LabelAccount
 type LabelAccountRequest struct {
 	// Apply label to account at this index.
-	AccountIndex uint64 `json:"account_index"`
+	AccountIndex uint32 `json:"account_index"`
 	// Label for the account.
 	Label string `json:"label"`
 }
@@ -269,9 +277,9 @@ type TransferRequest struct {
 	// array of destinations to receive XMR
 	Destinations []Destination `json:"destinations"`
 	// Transfer from this account index. (Defaults to 0)
-	AccountIndex uint64 `json:"account_index,omitempty"`
+	AccountIndex uint32 `json:"account_index,omitempty"`
 	// Transfer from this set of subaddresses. (Defaults to empty - all indices)
-	SubaddrIndices []uint64 `json:"subaddr_indices,omitempty"`
+	SubaddrIndices []uint32 `json:"subaddr_indices,omitempty"`
 	// Set a priority for the transaction. Accepted Values are: 0-3 for: default, unimportant, normal, elevated, priority.
 	Priority uint64 `json:"priority,omitempty"`
 	// Number of outputs from the blockchain to mix with (0 means no mixing).
@@ -315,9 +323,9 @@ type TransferSplitRequest struct {
 	// array of destinations to receive XMR
 	Destinations []Destination `json:"destinations"`
 	// Transfer from this account index. (Defaults to 0)
-	AccountIndex uint64 `json:"account_index,omitempty"`
+	AccountIndex uint32 `json:"account_index,omitempty"`
 	// Transfer from this set of subaddresses. (Defaults to empty - all indices)
-	SubaddrIndices []uint64 `json:"subaddr_indices,omitempty"`
+	SubaddrIndices []uint32 `json:"subaddr_indices,omitempty"`
 	// Number of outputs from the blockchain to mix with (0 means no mixing).
 	Mixin uint64 `json:"mixin"`
 	// Sets ringsize to n (mixin + 1).
@@ -425,9 +433,9 @@ type SweepAllRequest struct {
 	// Destination public address.
 	Address string `json:"address"`
 	// Sweep transactions from this account.
-	AccountIndex uint64 `json:"account_index"`
+	AccountIndex uint32 `json:"account_index"`
 	// Sweep from this set of subaddresses in the account.
-	SubaddrIndices []uint64 `json:"subaddr_indices,omitempty"`
+	SubaddrIndices []uint32 `json:"subaddr_indices,omitempty"`
 	// Priority for sending the sweep transfer, partially determines fee.
 	Priority uint64 `json:"priority,omitempty"`
 	// Number of outputs from the blockchain to mix with (0 means no mixing).
@@ -472,9 +480,9 @@ type SweepSingleRequest struct {
 	// Destination public address.
 	Address string `json:"address"`
 	// Sweep transactions from this account.
-	AccountIndex uint64 `json:"account_index"`
+	AccountIndex uint32 `json:"account_index"`
 	// Sweep from this set of subaddresses in the account.
-	SubaddrIndices []uint64 `json:"subaddr_indices,omitempty"`
+	SubaddrIndices []uint32 `json:"subaddr_indices,omitempty"`
 	// Priority for sending the sweep transfer, partially determines fee.
 	Priority uint64 `json:"priority,omitempty"`
 	// Number of outputs from the blockchain to mix with (0 means no mixing).
@@ -577,7 +585,7 @@ type IncomingTransfersRequest struct {
 	// "all": all the transfers, "available": only transfers which are not yet spent, OR "unavailable": only transfers which are already spent.
 	TransferType string `json:"transfer_type"`
 	// Return transfers for this account. (defaults to 0)
-	AccountIndex uint64 `json:"account_index,omitempty"`
+	AccountIndex uint32 `json:"account_index,omitempty"`
 	// Return transfers sent to these subaddresses.
 	SubaddrIndices *Index `json:"subaddr_indices,omitempty"`
 }
@@ -797,7 +805,7 @@ type GetReserveProofRequest struct {
 	// Proves all wallet balance to be disposable.
 	All bool `json:"all"`
 	// Specify the account from witch to prove reserve. (ignored if all is set to true)
-	AccountIndex uint64 `json:"account_index"`
+	AccountIndex uint32 `json:"account_index"`
 	// Amount (in atomic units) to prove the account has for reserve. (ignored if all is set to true)
 	Amount uint64 `json:"amount"`
 	// (Optional) add a message to the signature to further authenticate the prooving process.
@@ -845,9 +853,9 @@ type GetTransfersRequest struct {
 	// (Opional) Maximum block height to scan for transfers, if filtering by height is enabled (defaults to max block height).
 	MaxHeight uint64 `json:"max_height,omitempty"`
 	// (Optional) Index of the account to query for transfers. (defaults to 0)
-	AccountIndex uint64 `json:"account_index,omitempty"`
+	AccountIndex uint32 `json:"account_index,omitempty"`
 	// (Optional) List of subaddress indices to query for transfers. (Defaults to empty - all indices)
-	SubaddrIndices []uint64 `json:"subaddr_indices,omitempty"`
+	SubaddrIndices []uint32 `json:"subaddr_indices,omitempty"`
 }
 
 // Transfer model
@@ -902,7 +910,7 @@ type GetTransferByTxidRequest struct {
 	// Transaction ID used to find the transfer.
 	TxID string `json:"txid"`
 	// (Optional) Index of the account to query for the transfer.
-	AccountIndex uint64 `json:"account_index,omitempty"`
+	AccountIndex uint32 `json:"account_index,omitempty"`
 }
 
 // GetTransferByTxidResponse represents the response model for GetTransferByTxid

wallet/wallet_test.go

@@ -3,7 +3,7 @@ package wallet
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -56,7 +56,7 @@ func getClient(uri string, client *http.Client) *MockMoneroRPC {
 
 func setupServer(t *testing.T, method string, output string) *httptest.Server {
 	server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
-		buff, _ := ioutil.ReadAll(req.Body)
+		buff, _ := io.ReadAll(req.Body)
 		t.Log(string(buff))
 		rw.Write([]byte(output))
 	}))
@@ -1213,8 +1213,8 @@ func TestWalletGetTransferByTxid(t *testing.T) {
 	is.Equal(res.Transfer.Locked, false)
 	is.Equal(res.Transfer.Note, "")
 	is.Equal(res.Transfer.PaymentID, "0000000000000000")
-	is.Equal(res.Transfer.SubaddrIndex.Major, uint64(0))
-	is.Equal(res.Transfer.SubaddrIndex.Minor, uint64(0))
+	is.Equal(res.Transfer.SubaddrIndex.Major, uint32(0))
+	is.Equal(res.Transfer.SubaddrIndex.Minor, uint32(0))
 	is.Equal(res.Transfer.SuggestedConfirmationsThreshold, uint64(1))
 	is.Equal(res.Transfer.Timestamp, uint64(1658360753))
 	is.Equal(res.Transfer.TxID, "765f7124d01bd2eb2d4e7e59aa44a28c24339a41e4009f463955b087017b0ca3")
@@ -1230,8 +1230,8 @@ func TestWalletGetTransferByTxid(t *testing.T) {
 	is.Equal(res.Transfers[0].Locked, false)
 	is.Equal(res.Transfers[0].Note, "")
 	is.Equal(res.Transfers[0].PaymentID, "0000000000000000")
-	is.Equal(res.Transfers[0].SubaddrIndex.Major, uint64(0))
-	is.Equal(res.Transfers[0].SubaddrIndex.Minor, uint64(0))
+	is.Equal(res.Transfers[0].SubaddrIndex.Major, uint32(0))
+	is.Equal(res.Transfers[0].SubaddrIndex.Minor, uint32(0))
 	is.Equal(res.Transfers[0].SuggestedConfirmationsThreshold, uint64(1))
 	is.Equal(res.Transfers[0].Timestamp, uint64(1658360753))
 	is.Equal(res.Transfers[0].TxID, "765f7124d01bd2eb2d4e7e59aa44a28c24339a41e4009f463955b087017b0ca3")