account confirmation added for account list

Signed-off-by: kevin xu <cming.xu@gmail.com>

Author: cmingxu

api/createaccount.go

@@ -31,7 +31,7 @@ func (api *ApiServer) CreateAccount(c *gin.Context) {
 		return
 	}
 
-	if _, err := keeper.GetAccountInfo(account); err == nil {
+	if _, err := keeper.GetAccountInfo(account, 0); err == nil {
 		c.JSON(http.StatusBadRequest, R("account exists"))
 		return
 	}

api/getaccount.go

@@ -1,7 +1,9 @@
 package api
 
 import (
+	"fmt"
 	"net/http"
+	"strconv"
 
 	"github.com/cmingxu/wallet-keeper/keeper"
 
@@ -20,7 +22,18 @@ func (api *ApiServer) GetAccountInfo(c *gin.Context) {
 		return
 	}
 
-	accountInfo, err := keeper.GetAccountInfo(account)
+	confarg, found := c.GetQuery("minconf")
+	if !found {
+		confarg = "1"
+	}
+
+	conf, err := strconv.ParseUint(confarg, 10, 32)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, R(fmt.Sprint(err)))
+		return
+	}
+
+	accountInfo, err := keeper.GetAccountInfo(account, int(conf))
 	if err != nil {
 		c.JSON(http.StatusNotFound, R("account not found"))
 	} else {

api/listaccounts.go

@@ -3,9 +3,9 @@ package api
 import (
 	"fmt"
 	"net/http"
+	"strconv"
 
 	"github.com/cmingxu/wallet-keeper/keeper"
-	"github.com/cmingxu/wallet-keeper/keeper/btc"
 
 	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
@@ -16,7 +16,18 @@ func (api *ApiServer) ListAccounts(c *gin.Context) {
 	value, _ := c.Get(KEEPER_KEY) // sure about the presence of this value
 	keeper := value.(keeper.Keeper)
 
-	accounts, err := keeper.ListAccountsMinConf(btc.DEFAULT_CONFIRMATION)
+	confarg, found := c.GetQuery("minconf")
+	if !found {
+		confarg = "6"
+	}
+
+	conf, err := strconv.ParseUint(confarg, 10, 32)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, R(fmt.Sprint(err)))
+		return
+	}
+
+	accounts, err := keeper.ListAccountsMinConf(int(conf))
 	if err != nil {
 		log.Error(err)
 		c.JSON(http.StatusInternalServerError, R(fmt.Sprint(err)))

api/listunspentmin.go

@@ -16,12 +16,12 @@ func (api *ApiServer) ListUnspentMin(c *gin.Context) {
 
 	confarg, found := c.GetQuery("minconf")
 	if !found {
-		confarg = "0"
+		confarg = "1"
 	}
 
 	conf, err := strconv.ParseUint(confarg, 10, 32)
 	if err != nil {
-		c.JSON(http.StatusInternalServerError, R(fmt.Sprint(err)))
+		c.JSON(http.StatusBadRequest, R(fmt.Sprint(err)))
 		return
 	}
 

keeper/btc/client.go

@@ -98,10 +98,10 @@ func (client *Client) CreateAccount(account string) (keeper.Account, error) {
 }
 
 // GetAccountInfo
-func (client *Client) GetAccountInfo(account string) (keeper.Account, error) {
+func (client *Client) GetAccountInfo(account string, minCon int) (keeper.Account, error) {
 	var accountsMap map[string]float64
 	var err error
-	if accountsMap, err = client.ListAccountsMinConf(0); err != nil {
+	if accountsMap, err = client.ListAccountsMinConf(minCon); err != nil {
 		return keeper.Account{}, err
 	}
 

keeper/eth/client.go

@@ -74,7 +74,7 @@ func (client *Client) GetAddress(account string) (string, error) {
 
 // Create Account
 // Returns customized account info
-func (client *Client) CreateAccount(account string) (keeper.Account, error) {
+func (client *Client) CreateAccount(account string, minConf int) (keeper.Account, error) {
 	return nil, nil
 }
 

keeper/keeper.go

@@ -34,7 +34,7 @@ type Keeper interface {
 
 	// Get account, together with balance and address
 	// return error if account not exist
-	GetAccountInfo(account string) (Account, error)
+	GetAccountInfo(account string, conf int) (Account, error)
 
 	// Returns address under accont, use default account if
 	// not provided

keeper/usdt/client.go

@@ -99,7 +99,7 @@ func (client *Client) CreateAccount(account string) (keeper.Account, error) {
 }
 
 // GetAccountInfo
-func (client *Client) GetAccountInfo(account string) (keeper.Account, error) {
+func (client *Client) GetAccountInfo(account string, minConf int) (keeper.Account, error) {
 	addresses, err := client.GetAddressesByAccount(account)
 	if err != nil {
 		return keeper.Account{}, err