From 73d4a68a00e0408806bc945d15b011b828ee2a46 Mon Sep 17 00:00:00 2001
From: Javed Khan <tuxcanfly@gmail.com>
Date: Wed, 4 Feb 2015 23:43:58 +0530
Subject: [PATCH] Added importaddress, importpubkey cmds

---
 cmd/btcctl/btcctl.go | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/cmd/btcctl/btcctl.go b/cmd/btcctl/btcctl.go
index 9d22716a..202770ab 100644
--- a/cmd/btcctl/btcctl.go
+++ b/cmd/btcctl/btcctl.go
@@ -91,6 +91,8 @@ var commandHandlers = map[string]*handlerData{
 	"gettxoutsetinfo":       {0, 0, displayJSONDump, nil, makeGetTxOutSetInfo, ""},
 	"getwork":               {0, 1, displayJSONDump, nil, makeGetWork, "[data]"},
 	"help":                  {0, 1, displayGeneric, nil, makeHelp, "[commandName]"},
+	"importaddress":         {1, 1, displayGeneric, []conversionHandler{nil, toBool}, makeImportAddress, "<bitcoinaddress> [rescan=true]"},
+	"importpubkey":          {1, 1, displayGeneric, []conversionHandler{nil, toBool}, makeImportPubKey, "<pubkey> [rescan=true]"},
 	"importprivkey":         {1, 2, displayGeneric, []conversionHandler{nil, nil, toBool}, makeImportPrivKey, "<wifprivkey> [label] [rescan=true]"},
 	"importwallet":          {1, 0, displayGeneric, nil, makeImportWallet, "<filename>"},
 	"keypoolrefill":         {0, 1, displayGeneric, []conversionHandler{toInt}, makeKeyPoolRefill, "[newsize]"},
@@ -580,6 +582,28 @@ func makeGetRawTransaction(args []interface{}) (btcjson.Cmd, error) {
 	return btcjson.NewGetRawTransactionCmd("btcctl", args[0].(string), opt...)
 }
 
+// makeImportAddress generates the cmd structure for
+// importaddress commands.
+func makeImportAddress(args []interface{}) (btcjson.Cmd, error) {
+	var optargs = make([]interface{}, 0, 1)
+	if len(args) > 1 {
+		optargs = append(optargs, args[1].(bool))
+	}
+
+	return btcjson.NewImportAddressCmd("btcctl", args[0].(string), optargs...)
+}
+
+// makeImportPubKey generates the cmd structure for
+// importpubkey commands.
+func makeImportPubKey(args []interface{}) (btcjson.Cmd, error) {
+	var optargs = make([]interface{}, 0, 1)
+	if len(args) > 1 {
+		optargs = append(optargs, args[1].(bool))
+	}
+
+	return btcjson.NewImportPubKeyCmd("btcctl", args[0].(string), optargs...)
+}
+
 // makeImportPrivKey generates the cmd structure for
 // importprivkey commands.
 func makeImportPrivKey(args []interface{}) (btcjson.Cmd, error) {