list address return the key_index

[bytom/bytom.git] / api / accounts.go

diff --git a/api/accounts.go b/api/accounts.go
index e0cf81c..b84e25d 100644 (file)
--- a/api/accounts.go
+++ b/api/accounts.go
@@ -2,6 +2,8 @@ package api
 
 import (
        "context"
+       "encoding/hex"
+       "sort"
 
        log "github.com/sirupsen/logrus"
 
@@ -18,7 +20,7 @@ func (a *API) createAccount(ctx context.Context, ins struct {
        Quorum    int            `json:"quorum"`
        Alias     string         `json:"alias"`
 }) Response {
-       acc, err := a.wallet.AccountMgr.Create(ctx, ins.RootXPubs, ins.Quorum, ins.Alias)
+       acc, err := a.wallet.AccountMgr.Create(ins.RootXPubs, ins.Quorum, ins.Alias)
        if err != nil {
                return NewErrorResponse(err)
        }
@@ -29,7 +31,7 @@ func (a *API) createAccount(ctx context.Context, ins struct {
        return NewSuccessResponse(annotatedAccount)
 }
 
-// AccountInfo
+// AccountInfo is request struct for deleteAccount
 type AccountInfo struct {
        Info string `json:"account_info"`
 }
@@ -43,7 +45,7 @@ func (a *API) deleteAccount(ctx context.Context, in AccountInfo) Response {
 }
 
 type validateAddressResp struct {
-       Vaild   bool `json:"vaild"`
+       Valid   bool `json:"valid"`
        IsLocal bool `json:"is_local"`
 }
 
@@ -52,10 +54,10 @@ func (a *API) validateAddress(ctx context.Context, ins struct {
        Address string `json:"address"`
 }) Response {
        resp := &validateAddressResp{
-               Vaild:   false,
+               Valid:   false,
                IsLocal: false,
        }
-       address, err := common.DecodeAddress(ins.Address, &consensus.MainNetParams)
+       address, err := common.DecodeAddress(ins.Address, &consensus.ActiveNetParams)
        if err != nil {
                return NewSuccessResponse(resp)
        }
@@ -74,51 +76,98 @@ func (a *API) validateAddress(ctx context.Context, ins struct {
                return NewSuccessResponse(resp)
        }
 
-       resp.Vaild = true
+       resp.Valid = true
        resp.IsLocal = a.wallet.AccountMgr.IsLocalControlProgram(program)
        return NewSuccessResponse(resp)
 }
 
 type addressResp struct {
-       AccountAlias string `json:"account_alias"`
-       AccountID    string `json:"account_id"`
-       Address      string `json:"address"`
-       Change       bool   `json:"change"`
+       AccountAlias   string `json:"account_alias"`
+       AccountID      string `json:"account_id"`
+       Address        string `json:"address"`
+       ControlProgram string `json:"control_program"`
+       Change         bool   `json:"change"`
+       KeyIndex       uint64 `json:"key_index"`
 }
 
+// SortByIndex implements sort.Interface for addressResp slices
+type SortByIndex []addressResp
+
+func (a SortByIndex) Len() int           { return len(a) }
+func (a SortByIndex) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
+func (a SortByIndex) Less(i, j int) bool { return a[i].KeyIndex < a[j].KeyIndex }
+
 func (a *API) listAddresses(ctx context.Context, ins struct {
        AccountID    string `json:"account_id"`
        AccountAlias string `json:"account_alias"`
+       From         uint   `json:"from"`
+       Count        uint   `json:"count"`
 }) Response {
        accountID := ins.AccountID
        var target *account.Account
        if ins.AccountAlias != "" {
-               acc, err := a.wallet.AccountMgr.FindByAlias(ctx, ins.AccountAlias)
+               acc, err := a.wallet.AccountMgr.FindByAlias(ins.AccountAlias)
                if err != nil {
                        return NewErrorResponse(err)
                }
                target = acc
        } else {
-               acc, err := a.wallet.AccountMgr.FindByID(ctx, accountID)
+               acc, err := a.wallet.AccountMgr.FindByID(accountID)
                if err != nil {
                        return NewErrorResponse(err)
                }
                target = acc
        }
 
-       cps, err := a.wallet.AccountMgr.ListCtrlProgramsByXpubs(ctx, target.XPubs)
+       cps, err := a.wallet.AccountMgr.ListControlProgram()
        if err != nil {
                return NewErrorResponse(err)
        }
 
-       var addresses []*addressResp
+       addresses := []addressResp{}
        for _, cp := range cps {
-               addresses = append(addresses, &addressResp{
-                       AccountAlias: target.Alias,
-                       AccountID:    cp.AccountID,
-                       Address:      cp.Address,
-                       Change:       cp.Change,
+               if cp.Address == "" || cp.AccountID != target.ID {
+                       continue
+               }
+               addresses = append(addresses, addressResp{
+                       AccountAlias:   target.Alias,
+                       AccountID:      cp.AccountID,
+                       Address:        cp.Address,
+                       ControlProgram: hex.EncodeToString(cp.ControlProgram),
+                       Change:         cp.Change,
+                       KeyIndex:       cp.KeyIndex,
                })
        }
-       return NewSuccessResponse(addresses)
+
+       // sort AddressResp by KeyIndex
+       sort.Sort(SortByIndex(addresses))
+       start, end := getPageRange(len(addresses), ins.From, ins.Count)
+       return NewSuccessResponse(addresses[start:end])
+}
+
+type minigAddressResp struct {
+       MiningAddress string `json:"mining_address"`
+}
+
+func (a *API) getMiningAddress(ctx context.Context) Response {
+       miningAddress, err := a.wallet.AccountMgr.GetMiningAddress()
+       if err != nil {
+               return NewErrorResponse(err)
+       }
+       return NewSuccessResponse(minigAddressResp{
+               MiningAddress: miningAddress,
+       })
+}
+
+// POST /set-mining-address
+func (a *API) setMiningAddress(ctx context.Context, in struct {
+       MiningAddress string `json:"mining_address"`
+}) Response {
+       miningAddress, err := a.wallet.AccountMgr.SetMiningAddress(in.MiningAddress)
+       if err != nil {
+               return NewErrorResponse(err)
+       }
+       return NewSuccessResponse(minigAddressResp{
+               MiningAddress: miningAddress,
+       })
 }