stakey/vspd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Combine ImportPrivKey and AddTransaction

Browse Source
This commit is contained in:
jholdstock 2020-06-30 09:46:31 +01:00 committed by David Hill
parent b24c1a4c78
commit 70ba1adc93
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
background/background.go
View File

@ -192,16 +192,9 @@ func blockConnected() {
continue continue
} }
for _, walletClient := range walletClients { for _, walletClient := range walletClients {
err = walletClient.ImportPrivKey(ticket.VotingWIF) err = walletClient.AddTicketForVoting(ticket.VotingWIF, rawTicket.BlockHash, rawTicket.Hex)
if err != nil { if err != nil {
log.Errorf("%s: dcrwallet.ImportPrivKey error (wallet=%s, ticketHash=%s): %v", log.Errorf("%s: dcrwallet.AddTicketForVoting error (wallet=%s, ticketHash=%s): %v",
funcName, walletClient.String(), ticket.Hash, err)
continue
}
err = walletClient.AddTransaction(rawTicket.BlockHash, rawTicket.Hex)
if err != nil {
log.Errorf("%s: dcrwallet.AddTransaction error (wallet=%s, ticketHash=%s): %v",
funcName, walletClient.String(), ticket.Hash, err) funcName, walletClient.String(), ticket.Hash, err)
continue continue
} }

19
rpc/dcrwallet.go
View File

@ -2,6 +2,7 @@ package rpc
import ( import (
"context" "context"
"fmt"
wallettypes "decred.org/dcrwallet/rpc/jsonrpc/types" wallettypes "decred.org/dcrwallet/rpc/jsonrpc/types"
"github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/chaincfg/v3"
@ -125,15 +126,21 @@ func (w *WalletConnect) Clients(ctx context.Context, netParams *chaincfg.Params)
return walletClients, failedConnections return walletClients, failedConnections
} }
func (c *WalletRPC) AddTransaction(blockHash, txHex string) error { func (c *WalletRPC) AddTicketForVoting(votingWIF, blockHash, txHex string) error {
return c.Call(c.ctx, "addtransaction", nil, blockHash, txHex)
}
func (c *WalletRPC) ImportPrivKey(votingWIF string) error {
label := "imported" label := "imported"
rescan := false rescan := false
scanFrom := 0 scanFrom := 0
return c.Call(c.ctx, "importprivkey", nil, votingWIF, label, rescan, scanFrom) err := c.Call(c.ctx, "importprivkey", nil, votingWIF, label, rescan, scanFrom)
if err != nil {
return fmt.Errorf("importprivkey failed: %v", err)
}
err = c.Call(c.ctx, "addtransaction", nil, blockHash, txHex)
if err != nil {
return fmt.Errorf("addtransaction failed: %v", err)
}
return nil
} }
func (c *WalletRPC) SetVoteChoice(agenda, choice, ticketHash string) error { func (c *WalletRPC) SetVoteChoice(agenda, choice, ticketHash string) error {