btcjson: add addresstype arg to getnewaddress

btcsuite · Dec 22, 2021 · 1d7192d · 1d7192d
1 parent a1f43e4
commit 1d7192d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/btcjson/jsonrpcerr.go b/btcjson/jsonrpcerr.go
@@ -117,6 +117,9 @@ const (
 	// example, key not found, etc.
 	ErrRPCWallet RPCErrorCode = -4
 
+	// ErrRPCWalletInvalidAddressType indicates an invalid address type.
+	ErrRPCWalletInvalidAddressType RPCErrorCode = -5
+
 	// ErrRPCWalletInsufficientFunds indicates that there are not enough
 	// funds in wallet or account.
 	ErrRPCWalletInsufficientFunds RPCErrorCode = -6

diff --git a/btcjson/walletsvrcmds.go b/btcjson/walletsvrcmds.go
@@ -242,17 +242,19 @@ func NewGetBalancesCmd() *GetBalancesCmd {
 
 // GetNewAddressCmd defines the getnewaddress JSON-RPC command.
 type GetNewAddressCmd struct {
-	Account *string
+	Account     *string
+	AddressType *string
 }
 
 // NewGetNewAddressCmd returns a new instance which can be used to issue a
 // getnewaddress JSON-RPC command.
 //
 // The parameters which are pointers indicate they are optional.  Passing nil
 // for optional parameters will use the default value.
-func NewGetNewAddressCmd(account *string) *GetNewAddressCmd {
+func NewGetNewAddressCmd(account, addrType *string) *GetNewAddressCmd {
 	return &GetNewAddressCmd{
-		Account: account,
+		Account:     account,
+		AddressType: addrType,
 	}
 }
 

diff --git a/btcjson/walletsvrcmds_test.go b/btcjson/walletsvrcmds_test.go
@@ -379,24 +379,26 @@ func TestWalletSvrCmds(t *testing.T) {
 				return btcjson.NewCmd("getnewaddress")
 			},
 			staticCmd: func() interface{} {
-				return btcjson.NewGetNewAddressCmd(nil)
+				return btcjson.NewGetNewAddressCmd(nil, nil)
 			},
 			marshalled: `{"jsonrpc":"1.0","method":"getnewaddress","params":[],"id":1}`,
 			unmarshalled: &btcjson.GetNewAddressCmd{
-				Account: nil,
+				Account:     nil,
+				AddressType: nil,
 			},
 		},
 		{
 			name: "getnewaddress optional",
 			newCmd: func() (interface{}, error) {
-				return btcjson.NewCmd("getnewaddress", "acct")
+				return btcjson.NewCmd("getnewaddress", "acct", "legacy")
 			},
 			staticCmd: func() interface{} {
-				return btcjson.NewGetNewAddressCmd(btcjson.String("acct"))
+				return btcjson.NewGetNewAddressCmd(btcjson.String("acct"), btcjson.String("legacy"))
 			},
-			marshalled: `{"jsonrpc":"1.0","method":"getnewaddress","params":["acct"],"id":1}`,
+			marshalled: `{"jsonrpc":"1.0","method":"getnewaddress","params":["acct","legacy"],"id":1}`,
 			unmarshalled: &btcjson.GetNewAddressCmd{
-				Account: btcjson.String("acct"),
+				Account:     btcjson.String("acct"),
+				AddressType: btcjson.String("legacy"),
 			},
 		},
 		{

diff --git a/rpcclient/wallet.go b/rpcclient/wallet.go
@@ -1089,8 +1089,8 @@ func (r FutureGetNewAddressResult) Receive() (btcutil.Address, error) {
 // returned instance.
 //
 // See GetNewAddress for the blocking version and more details.
-func (c *Client) GetNewAddressAsync(account string) FutureGetNewAddressResult {
-	cmd := btcjson.NewGetNewAddressCmd(&account)
+func (c *Client) GetNewAddressAsync(account, addrType string) FutureGetNewAddressResult {
+	cmd := btcjson.NewGetNewAddressCmd(&account, &addrType)
 	result := FutureGetNewAddressResult{
 		network:         c.chainParams,
 		responseChannel: c.SendCmd(cmd),
@@ -1100,8 +1100,8 @@ func (c *Client) GetNewAddressAsync(account string) FutureGetNewAddressResult {
 
 // GetNewAddress returns a new address, and decodes based on the client's
 // chain params.
-func (c *Client) GetNewAddress(account string) (btcutil.Address, error) {
-	return c.GetNewAddressAsync(account).Receive()
+func (c *Client) GetNewAddress(account, addrType string) (btcutil.Address, error) {
+	return c.GetNewAddressAsync(account, addrType).Receive()
 }
 
 // FutureGetRawChangeAddressResult is a future promise to deliver the result of