btcjson: add optional address field to signmessagewithprivkey

Author: asheswook

btcjson/chainsvrcmds.go

@@ -929,19 +929,23 @@ func NewSetGenerateCmd(generate bool, genProcLimit *int) *SetGenerateCmd {
 
 // SignMessageWithPrivKeyCmd defines the signmessagewithprivkey JSON-RPC command.
 type SignMessageWithPrivKeyCmd struct {
-	PrivKey string // base 58 Wallet Import format private key
-	Message string // Message to sign
+	PrivKey string  // base 58 Wallet Import format private key
+	Message string  // Message to sign
+	Address *string // optional address for BIP-322 signing
 }
 
 // NewSignMessageWithPrivKey returns a new instance which can be used to issue a
 // signmessagewithprivkey JSON-RPC command.
 //
 // The first parameter is a private key in base 58 Wallet Import format.
 // The second parameter is the message to sign.
-func NewSignMessageWithPrivKey(privKey, message string) *SignMessageWithPrivKeyCmd {
+// The optional third parameter is an address for BIP-322 signing.  Passing nil
+// will use the default legacy signing method.
+func NewSignMessageWithPrivKey(privKey, message string, address *string) *SignMessageWithPrivKeyCmd {
 	return &SignMessageWithPrivKeyCmd{
 		PrivKey: privKey,
 		Message: message,
+		Address: address,
 	}
 }
 

btcjson/chainsvrcmds_test.go

@@ -1304,14 +1304,29 @@ func TestChainSvrCmds(t *testing.T) {
 				return btcjson.NewCmd("signmessagewithprivkey", "5Hue", "Hey")
 			},
 			staticCmd: func() interface{} {
-				return btcjson.NewSignMessageWithPrivKey("5Hue", "Hey")
+				return btcjson.NewSignMessageWithPrivKey("5Hue", "Hey", nil)
 			},
 			marshalled: `{"jsonrpc":"1.0","method":"signmessagewithprivkey","params":["5Hue","Hey"],"id":1}`,
 			unmarshalled: &btcjson.SignMessageWithPrivKeyCmd{
 				PrivKey: "5Hue",
 				Message: "Hey",
 			},
 		},
+		{
+			name: "signmessagewithprivkey - with address",
+			newCmd: func() (interface{}, error) {
+				return btcjson.NewCmd("signmessagewithprivkey", "5Hue", "Hey", "1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa")
+			},
+			staticCmd: func() interface{} {
+				return btcjson.NewSignMessageWithPrivKey("5Hue", "Hey", btcjson.String("1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa"))
+			},
+			marshalled: `{"jsonrpc":"1.0","method":"signmessagewithprivkey","params":["5Hue","Hey","1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa"],"id":1}`,
+			unmarshalled: &btcjson.SignMessageWithPrivKeyCmd{
+				PrivKey: "5Hue",
+				Message: "Hey",
+				Address: btcjson.String("1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa"),
+			},
+		},
 		{
 			name: "stop",
 			newCmd: func() (interface{}, error) {