LBRYCommunity/lbcwallet
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 14 Packages Wiki Activity

wallet: allow filtering of transactions by account

Browse source
This commit is contained in:
Wilmer Paulino 2021-02-17 16:24:20 -08:00
parent f5845dfb42
commit a180b0fcaa
No known key found for this signature in database
GPG key ID: 6DF57B9F9514972F
3 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rpc/legacyrpc/methods.go
View file

@ -1293,20 +1293,14 @@ func listAllTransactions(icmd interface{}, w *wallet.Wallet) (interface{}, error
func listUnspent(icmd interface{}, w *wallet.Wallet) (interface{}, error) { func listUnspent(icmd interface{}, w *wallet.Wallet) (interface{}, error) {
cmd := icmd.(*btcjson.ListUnspentCmd) cmd := icmd.(*btcjson.ListUnspentCmd)
var addresses map[string]struct{} if cmd.Addresses != nil && len(*cmd.Addresses) > 0 {
if cmd.Addresses != nil { return nil, &btcjson.RPCError{
addresses = make(map[string]struct{}) Code: btcjson.ErrRPCInvalidParameter,
// confirm that all of them are good: Message: "Filtering by addresses has been deprecated",
for _, as := range *cmd.Addresses {
a, err := decodeAddress(as, w.ChainParams())
if err != nil {
return nil, err
}
addresses[a.EncodeAddress()] = struct{}{}
} }
} }
return w.ListUnspent(int32(*cmd.MinConf), int32(*cmd.MaxConf), addresses) return w.ListUnspent(int32(*cmd.MinConf), int32(*cmd.MaxConf), "")
} }
// lockUnspent handles the lockunspent command. // lockUnspent handles the lockunspent command.

2
rpc/rpcserver/server.go
View file

@ -408,7 +408,7 @@ func (s *walletServer) GetTransactions(ctx context.Context, req *pb.GetTransacti
_ = minRecentTxs _ = minRecentTxs
gtr, err := s.wallet.GetTransactions(startBlock, endBlock, ctx.Done()) gtr, err := s.wallet.GetTransactions(startBlock, endBlock, "", ctx.Done())
if err != nil { if err != nil {
return nil, translateError(err) return nil, translateError(err)
} }

23
wallet/wallet.go
View file

@ -2186,7 +2186,9 @@ type GetTransactionsResult struct {
// Transaction results are organized by blocks in ascending order and unmined // Transaction results are organized by blocks in ascending order and unmined
// transactions in an unspecified order. Mined transactions are saved in a // transactions in an unspecified order. Mined transactions are saved in a
// Block structure which records properties about the block. // Block structure which records properties about the block.
func (w *Wallet) GetTransactions(startBlock, endBlock *BlockIdentifier, cancel <-chan struct{}) (*GetTransactionsResult, error) { func (w *Wallet) GetTransactions(startBlock, endBlock *BlockIdentifier,
accountName string, cancel <-chan struct{}) (*GetTransactionsResult, error) {
var start, end int32 = 0, -1 var start, end int32 = 0, -1
w.chainClientLock.Lock() w.chainClientLock.Lock()
@ -2508,7 +2510,7 @@ func (s creditSlice) Swap(i, j int) {
// contained within it will be considered. If we know nothing about a // contained within it will be considered. If we know nothing about a
// transaction an empty array will be returned. // transaction an empty array will be returned.
func (w *Wallet) ListUnspent(minconf, maxconf int32, func (w *Wallet) ListUnspent(minconf, maxconf int32,
addresses map[string]struct{}) ([]*btcjson.ListUnspentResult, error) { accountName string) ([]*btcjson.ListUnspentResult, error) {
var results []*btcjson.ListUnspentResult var results []*btcjson.ListUnspentResult
err := walletdb.View(w.db, func(tx walletdb.ReadTx) error { err := walletdb.View(w.db, func(tx walletdb.ReadTx) error {
@ -2517,7 +2519,7 @@ func (w *Wallet) ListUnspent(minconf, maxconf int32,
syncBlock := w.Manager.SyncedTo() syncBlock := w.Manager.SyncedTo()
filter := len(addresses) != 0 filter := accountName != ""
unspent, err := w.TxStore.UnspentOutputs(txmgrNs) unspent, err := w.TxStore.UnspentOutputs(txmgrNs)
if err != nil { if err != nil {
return err return err
@ -2556,7 +2558,7 @@ func (w *Wallet) ListUnspent(minconf, maxconf int32,
// //
// This will be unnecessary once transactions and outputs are // This will be unnecessary once transactions and outputs are
// grouped under the associated account in the db. // grouped under the associated account in the db.
acctName := defaultAccountName outputAcctName := defaultAccountName
sc, addrs, _, err := txscript.ExtractPkScriptAddrs( sc, addrs, _, err := txscript.ExtractPkScriptAddrs(
output.PkScript, w.chainParams) output.PkScript, w.chainParams)
if err != nil { if err != nil {
@ -2567,22 +2569,15 @@ func (w *Wallet) ListUnspent(minconf, maxconf int32,
if err == nil { if err == nil {
s, err := smgr.AccountName(addrmgrNs, acct) s, err := smgr.AccountName(addrmgrNs, acct)
if err == nil { if err == nil {
acctName = s outputAcctName = s
} }
} }
} }
if filter { if filter && outputAcctName != accountName {
for _, addr := range addrs {
_, ok := addresses[addr.EncodeAddress()]
if ok {
goto include
}
}
continue continue
} }
include:
// At the moment watch-only addresses are not supported, so all // At the moment watch-only addresses are not supported, so all
// recorded outputs that are not multisig are "spendable". // recorded outputs that are not multisig are "spendable".
// Multisig outputs are only "spendable" if all keys are // Multisig outputs are only "spendable" if all keys are
@ -2622,7 +2617,7 @@ func (w *Wallet) ListUnspent(minconf, maxconf int32,
result := &btcjson.ListUnspentResult{ result := &btcjson.ListUnspentResult{
TxID: output.OutPoint.Hash.String(), TxID: output.OutPoint.Hash.String(),
Vout: output.OutPoint.Index, Vout: output.OutPoint.Index,
Account: acctName, Account: outputAcctName,
ScriptPubKey: hex.EncodeToString(output.PkScript), ScriptPubKey: hex.EncodeToString(output.PkScript),
Amount: output.Amount.ToBTC(), Amount: output.Amount.ToBTC(),
Confirmations: int64(confs), Confirmations: int64(confs),