add sendfrom to btcctl

util/btcctl/btcctl.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/conformal/btcjson"
+	"github.com/conformal/btcutil"
 	"github.com/conformal/go-flags"
 	"github.com/davecgh/go-spew/spew"
 	"io/ioutil"
@@ -73,6 +74,8 @@ var commandHandlers = map[string]*handlerData{
 	"importprivkey":         &handlerData{1, 2, displayGeneric, []conversionHandler{nil, nil, toBool}, makeImportPrivKey, "<wifprivkey> [label] [rescan=true]"},
 	"listtransactions":      &handlerData{0, 3, displayJSONDump, []conversionHandler{nil, toInt, toInt}, makeListTransactions, "[account] [count=10] [from=0]"},
 	"ping":                  &handlerData{0, 0, displayGeneric, nil, makePing, ""},
+	"sendfrom": &handlerData{3, 3, displayGeneric, []conversionHandler{nil, nil, toSatoshi, toInt, nil, nil},
+		makeSendFrom, "<account> <address> <amount> [minconf=1] [comment] [comment-to]"},
 	"sendrawtransaction":     &handlerData{1, 0, displayGeneric, nil, makeSendRawTransaction, "<hextx>"},
 	"stop":                   &handlerData{0, 0, displayGeneric, nil, makeStop, ""},
 	"submitblock":            &handlerData{1, 1, displayGeneric, nil, makeSubmitBlock, "<hexdata> [jsonparametersobject]"},
@@ -82,6 +85,18 @@ var commandHandlers = map[string]*handlerData{
 	"walletpassphrasechange": &handlerData{2, 0, displayGeneric, nil, makeWalletPassphraseChange, "<oldpassphrase> <newpassphrase>"},
 }
 
+// toSatoshi attempts to convert the passed string to a satoshi amount returned
+// as an int64.  It returns the int64 packed into an interface so it can be used
+// in the calls which expect interfaces.  An error will be returned if the string
+// can't be converted first to a float64.
+func toSatoshi(val string) (interface{}, error) {
+	idx, err := strconv.ParseFloat(val, 64)
+	if err != nil {
+		return nil, err
+	}
+	return int64(float64(btcutil.SatoshiPerBitcoin) * idx), nil
+}
+
 // toInt attempts to convert the passed string to an integer.  It returns the
 // integer packed into an interface so it can be used in the calls which expect
 // interfaces.  An error will be returned if the string can't be converted to an
@@ -429,6 +444,25 @@ func makePing(args []interface{}) (btcjson.Cmd, error) {
 	return btcjson.NewPingCmd("btcctl")
 }
 
+// makeSendFrom generates the cmd structure for sendfrom commands.
+func makeSendFrom(args []interface{}) (btcjson.Cmd, error) {
+	minconf := 1
+	comment := ""
+	commentTo := ""
+
+	if len(args) > 3 {
+		minconf = args[3].(int)
+	}
+	if len(args) > 4 {
+		comment = args[4].(string)
+	}
+	if len(args) > 5 {
+		commentTo = args[5].(string)
+	}
+	return btcjson.NewSendFromCmd("btcctl", args[0].(string), args[1].(string),
+		args[2].(int64), minconf, comment, commentTo)
+}
+
 // makeSendRawTransaction generates the cmd structure for sendrawtransaction
 // commands.
 func makeSendRawTransaction(args []interface{}) (btcjson.Cmd, error) {