LBRYFoundation/lbcwallet
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbcwallet.git synced 2025-08-23 17:47:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

multi-account: update listaccounts

Browse source
This commit is contained in:
Roy Lee 2022-08-22 16:39:33 -07:00
parent 64554cfbc0
commit 678379ce45
2 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
internal/rpchelp/methods.go
View file

@ -7,7 +7,9 @@
package rpchelp package rpchelp
import "github.com/lbryio/lbcd/btcjson" import (
"github.com/lbryio/lbcd/btcjson"
)
// Common return types. // Common return types.
var ( var (

34
rpc/legacyrpc/methods.go
View file

@ -1231,16 +1231,40 @@ func help(icmd interface{}, _ *wallet.Wallet, chainClient *chain.RPCClient) (int
func listAccounts(icmd interface{}, w *wallet.Wallet) (interface{}, error) { func listAccounts(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
cmd := icmd.(*btcjson.ListAccountsCmd) cmd := icmd.(*btcjson.ListAccountsCmd)
accountBalances := map[string]float64{} accountBalances := map[string]map[string]float64{}
results, err := w.AccountBalances(waddrmgr.KeyScopeBIP0044, int32(*cmd.MinConf))
fn := func(scope waddrmgr.KeyScope) error {
results, err := w.AccountBalances(scope, int32(*cmd.MinConf))
if err != nil {
return err
}
for _, result := range results {
if accountBalances[result.AccountName] == nil {
accountBalances[result.AccountName] = map[string]float64{}
}
accountBalances[result.AccountName][scope.String()] += result.AccountBalance.ToBTC()
accountBalances[result.AccountName]["total"] += result.AccountBalance.ToBTC()
}
return nil
}
scope, err := lookupKeyScope(cmd.AddressType)
if err != nil { if err != nil {
return nil, err return nil, err
} }
for _, result := range results {
accountBalances[result.AccountName] = result.AccountBalance.ToBTC() if scope != nil {
err = fn(*scope)
} else {
err = forEachKeyScope(fn)
} }
if err != nil {
return nil, err
}
// Return the map. This will be marshaled into a JSON object. // Return the map. This will be marshaled into a JSON object.
return accountBalances, nil return accountBalances, err
} }
// listLockUnspent handles a listlockunspent request by returning an slice of // listLockUnspent handles a listlockunspent request by returning an slice of