upgrade dcrwallet to v4 fixing ticket buying bug

go.mod

@@ -3,7 +3,7 @@ module github.com/crypto-power/cryptopower
 go 1.19
 
 require (
-	decred.org/dcrwallet/v3 v3.0.1
+	decred.org/dcrwallet/v4 v4.0.0-20230809150859-a87fa843495e
 	gioui.org v0.1.0
 	github.com/JohannesKaufmann/html-to-markdown v1.2.1
 	github.com/PuerkitoBio/goquery v1.6.1
@@ -37,6 +37,8 @@ require (
 	github.com/decred/dcrdata/v8 v8.0.0-20230617164141-fa4d8e1b4e8e
 	github.com/decred/politeia v1.4.0
 	github.com/decred/slog v1.2.0
+	github.com/decred/vspd/client/v2 v2.0.0
+	github.com/decred/vspd/types/v2 v2.0.0
 	github.com/dgraph-io/badger v1.6.2
 	github.com/gen2brain/beeep v0.0.0-20220402123239-6a3042f4b71a
 	github.com/gomarkdown/markdown v0.0.0-20220817224203-2206187d3406
@@ -100,8 +102,6 @@ require (
 	github.com/decred/dcrd/txscript/v3 v3.0.0 // indirect
 	github.com/decred/dcrtime v0.0.0-20191018193024-8d8b4ef0458e // indirect
 	github.com/decred/go-socks v1.1.0 // indirect
-	github.com/decred/vspd/client/v2 v2.0.0 // indirect
-	github.com/decred/vspd/types/v2 v2.0.0 // indirect
 	github.com/dgraph-io/ristretto v0.0.2 // indirect
 	github.com/dustin/go-humanize v1.0.1-0.20210705192016-249ff6c91207 // indirect
 	github.com/fogleman/gg v1.3.0 // indirect

go.sum

@@ -79,8 +79,8 @@ decred.org/cspp/v2 v2.1.0 h1:HeHb9+BFqrBaAPc6CsPiUpPFmC1uyBM2mJZUAbUXkRw=
 decred.org/cspp/v2 v2.1.0/go.mod h1:9nO3bfvCheOPIFZw5f6sRQ42CjBFB5RKSaJ9Iq6G4MA=
 decred.org/dcrwallet v1.7.0 h1:U/ew00YBdUlx3rJAynt2OdKDgGzBKK4O89FijBq8iVg=
 decred.org/dcrwallet v1.7.0/go.mod h1:hNOGyvH53gWdgFB601/ubGRzCPfPtWnEVAi9Grs90y4=
-decred.org/dcrwallet/v3 v3.0.1 h1:+OLi+u/MvKc3Ubcnf19oyG/a5hJ/qp4OtezdiQZnLIs=
-decred.org/dcrwallet/v3 v3.0.1/go.mod h1:a+R8BZIOKVpWVPat5VZoBWNh/cnIciwcRkPtrzfS/tw=
+decred.org/dcrwallet/v4 v4.0.0-20230809150859-a87fa843495e h1:Y1f5xYRQi7qMzLYifvAOplMhgHiKxtWWzd1psXqsS6A=
+decred.org/dcrwallet/v4 v4.0.0-20230809150859-a87fa843495e/go.mod h1:0+CchVf/baDYJ0tlDjtEzAFsvYcwWRm0eo1+Lf7Z1as=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d h1:ARo7NCVvN2NdhLlJE9xAbKweuI9L6UgfTbYb0YwPacY=
 gioui.org v0.1.0 h1:fEDY5A4+epOdzjCBYSUC4BzvjWqsjfqf5D6mskbthOs=

libwallet/assets/btc/accounts.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"time"
 
-	"decred.org/dcrwallet/v3/errors"
+	"decred.org/dcrwallet/v4/errors"
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg"
 	"github.com/btcsuite/btcwallet/waddrmgr"

libwallet/assets/btc/address.go

@@ -3,7 +3,7 @@ package btc
 import (
 	"fmt"
 
-	"decred.org/dcrwallet/v3/errors"
+	"decred.org/dcrwallet/v4/errors"
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/crypto-power/cryptopower/libwallet/utils"
 )

libwallet/assets/btc/feerate.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"sync"
 
-	"decred.org/dcrwallet/v3/errors"
+	"decred.org/dcrwallet/v4/errors"
 	"github.com/btcsuite/btcd/btcutil"
 	sharedW "github.com/crypto-power/cryptopower/libwallet/assets/wallet"
 	"github.com/crypto-power/cryptopower/libwallet/utils"

libwallet/assets/btc/rescan.go

@@ -6,7 +6,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"decred.org/dcrwallet/v3/errors"
+	"decred.org/dcrwallet/v4/errors"
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcwallet/chain"
 	"github.com/btcsuite/btcwallet/waddrmgr"

libwallet/assets/btc/sync.go

@@ -7,7 +7,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"decred.org/dcrwallet/v3/errors"
+	"decred.org/dcrwallet/v4/errors"
 	"github.com/btcsuite/btcwallet/chain"
 	sharedW "github.com/crypto-power/cryptopower/libwallet/assets/wallet"
 	"github.com/crypto-power/cryptopower/libwallet/utils"

libwallet/assets/btc/txandblocknotifications.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"sync/atomic"
 
-	"decred.org/dcrwallet/v3/errors"
+	"decred.org/dcrwallet/v4/errors"
 	sharedW "github.com/crypto-power/cryptopower/libwallet/assets/wallet"
 	"github.com/crypto-power/cryptopower/libwallet/utils"
 )

libwallet/assets/btc/txauthor.go

@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"decred.org/dcrwallet/v3/errors"
+	"decred.org/dcrwallet/v4/errors"
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/txscript"

libwallet/assets/btc/wallet.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"decred.org/dcrwallet/v3/errors"
+	"decred.org/dcrwallet/v4/errors"
 	"github.com/btcsuite/btcd/btcec/v2/ecdsa"
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/btcutil/gcs"

libwallet/assets/dcr/account_mixer.go

@@ -7,9 +7,9 @@ import (
 	"errors"
 	"net"
 
-	"decred.org/dcrwallet/v3/ticketbuyer"
-	w "decred.org/dcrwallet/v3/wallet"
-	"decred.org/dcrwallet/v3/wallet/udb"
+	"decred.org/dcrwallet/v4/ticketbuyer"
+	w "decred.org/dcrwallet/v4/wallet"
+	"decred.org/dcrwallet/v4/wallet/udb"
 	sharedW "github.com/crypto-power/cryptopower/libwallet/assets/wallet"
 	"github.com/crypto-power/cryptopower/libwallet/internal/certs"
 	"github.com/crypto-power/cryptopower/libwallet/utils"

libwallet/assets/dcr/accounts.go

@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"decred.org/dcrwallet/v3/errors"
-	w "decred.org/dcrwallet/v3/wallet"
+	"decred.org/dcrwallet/v4/errors"
+	w "decred.org/dcrwallet/v4/wallet"
 	"github.com/crypto-power/cryptopower/libwallet/addresshelper"
 	sharedW "github.com/crypto-power/cryptopower/libwallet/assets/wallet"
 	"github.com/crypto-power/cryptopower/libwallet/utils"

libwallet/assets/dcr/address.go

@@ -3,8 +3,8 @@ package dcr
 import (
 	"fmt"
 
-	"decred.org/dcrwallet/v3/errors"
-	w "decred.org/dcrwallet/v3/wallet"
+	"decred.org/dcrwallet/v4/errors"
+	w "decred.org/dcrwallet/v4/wallet"
 	"github.com/crypto-power/cryptopower/libwallet/utils"
 	"github.com/decred/dcrd/txscript/v4/stdaddr"
 )

libwallet/assets/dcr/consensus.go

@@ -6,8 +6,7 @@ import (
 	"sort"
 	"strings"
 
-	"decred.org/dcrwallet/v3/errors"
-	w "decred.org/dcrwallet/v3/wallet"
+	"decred.org/dcrwallet/v4/errors"
 
 	"github.com/crypto-power/cryptopower/libwallet/utils"
 	"github.com/decred/dcrd/chaincfg/chainhash"
@@ -111,22 +110,19 @@ func (asset *Asset) SetVoteChoice(agendaID, choiceID, hash, passphrase string) e
 		return err
 	}
 
-	currentChoice := w.AgendaChoice{
-		AgendaID: agendaID,
-		ChoiceID: "abstain", // default to abstain as current choice if not found in wallet
+	choice, ok := choices[agendaID]
+	if ok && choice == strings.ToLower(choiceID) {
+		// Do not set the same choice again
+		return nil
 	}
 
-	for i := range choices {
-		if choices[i].AgendaID == agendaID {
-			currentChoice.ChoiceID = choices[i].ChoiceID
-			break
-		}
+	if !ok {
+		// Default to abstain if no previous choice existed
+		choice = "abstain"
 	}
 
-	newChoice := w.AgendaChoice{
-		AgendaID: agendaID,
-		ChoiceID: strings.ToLower(choiceID),
-	}
+	currentChoice := map[string]string{agendaID: choice}
+	newChoice := map[string]string{agendaID: strings.ToLower(choiceID)}
 
 	_, err = asset.Internal().DCR.SetAgendaChoices(ctx, ticketHash, newChoice)
 	if err != nil {
@@ -181,7 +177,7 @@ func (asset *Asset) SetVoteChoice(agendaID, choiceID, hash, passphrase string) e
 			firstErr = err
 			continue // try next tHash
 		}
-		err = vspClient.SetVoteChoice(ctx, tHash, []w.AgendaChoice{newChoice}, nil, nil)
+		err = vspClient.SetVoteChoice(ctx, tHash, newChoice, nil, nil)
 		if err != nil && firstErr == nil {
 			firstErr = err
 			continue // try next tHash
@@ -245,9 +241,9 @@ func (asset *Asset) AllVoteAgendas(hash string, newestFirst bool) ([]*Agenda, er
 		d := &deployments[i]
 
 		votingPreference := "abstain" // assume abstain, if we have the saved pref, it'll be updated below
-		for c := range choices {
-			if choices[c].AgendaID == d.Vote.Id {
-				votingPreference = choices[c].ChoiceID
+		for agendaID, choiceID := range choices {
+			if agendaID == d.Vote.Id {
+				votingPreference = choiceID
 				break
 			}
 		}

libwallet/assets/dcr/decodetx.go

@@ -3,7 +3,7 @@ package dcr
 import (
 	"fmt"
 
-	w "decred.org/dcrwallet/v3/wallet"
+	w "decred.org/dcrwallet/v4/wallet"
 	sharedW "github.com/crypto-power/cryptopower/libwallet/assets/wallet"
 	"github.com/crypto-power/cryptopower/libwallet/txhelper"
 	"github.com/decred/dcrd/blockchain/stake/v5"

libwallet/assets/dcr/message.go

@@ -1,8 +1,8 @@
 package dcr
 
 import (
-	"decred.org/dcrwallet/v3/errors"
-	w "decred.org/dcrwallet/v3/wallet"
+	"decred.org/dcrwallet/v4/errors"
+	w "decred.org/dcrwallet/v4/wallet"
 	"github.com/crypto-power/cryptopower/libwallet/utils"
 	"github.com/decred/dcrd/txscript/v4/stdaddr"
 )

libwallet/assets/dcr/rescan.go

@@ -5,8 +5,8 @@ import (
 	"math"
 	"time"
 
-	"decred.org/dcrwallet/v3/errors"
-	w "decred.org/dcrwallet/v3/wallet"
+	"decred.org/dcrwallet/v4/errors"
+	w "decred.org/dcrwallet/v4/wallet"
 	sharedW "github.com/crypto-power/cryptopower/libwallet/assets/wallet"
 	"github.com/crypto-power/cryptopower/libwallet/utils"
 )

libwallet/assets/dcr/sync.go

@@ -9,10 +9,10 @@ import (
 	"strings"
 	"sync"
 
-	"decred.org/dcrwallet/v3/errors"
-	"decred.org/dcrwallet/v3/p2p"
-	"decred.org/dcrwallet/v3/spv"
-	w "decred.org/dcrwallet/v3/wallet"
+	"decred.org/dcrwallet/v4/errors"
+	"decred.org/dcrwallet/v4/p2p"
+	"decred.org/dcrwallet/v4/spv"
+	w "decred.org/dcrwallet/v4/wallet"
 	sharedW "github.com/crypto-power/cryptopower/libwallet/assets/wallet"
 	"github.com/crypto-power/cryptopower/libwallet/utils"
 	"github.com/decred/dcrd/addrmgr/v2"

libwallet/assets/dcr/syncnotification.go

@@ -4,7 +4,7 @@ import (
 	"math"
 	"time"
 
-	"decred.org/dcrwallet/v3/spv"
+	"decred.org/dcrwallet/v4/spv"
 	sharedW "github.com/crypto-power/cryptopower/libwallet/assets/wallet"
 	"golang.org/x/sync/errgroup"
 )

libwallet/assets/dcr/ticket.go

@@ -7,14 +7,15 @@ import (
 	"sync"
 	"time"
 
-	"decred.org/dcrwallet/v3/errors"
-	w "decred.org/dcrwallet/v3/wallet"
+	"decred.org/dcrwallet/v4/errors"
+	w "decred.org/dcrwallet/v4/wallet"
 	sharedW "github.com/crypto-power/cryptopower/libwallet/assets/wallet"
-	"github.com/crypto-power/cryptopower/libwallet/internal/vsp"
 	"github.com/crypto-power/cryptopower/libwallet/utils"
+	"github.com/decred/dcrd/blockchain/stake/v5"
 	"github.com/decred/dcrd/chaincfg/chainhash"
 	"github.com/decred/dcrd/dcrutil/v4"
 	"github.com/decred/dcrd/wire"
+	"github.com/decred/vspd/types/v2"
 )
 
 func (asset *Asset) TotalStakingRewards() (int64, error) {
@@ -127,9 +128,9 @@ func (asset *Asset) PurchaseTickets(account, numTickets int32, vspHost, passphra
 		Count:         int(numTickets),
 		SourceAccount: uint32(account),
 		MinConf:       asset.RequiredConfirmations(),
-		VSPFeeProcess: vspClient.FeePercentage,
+		VSPFeePercent: vspClient.FeePercentage,
 		VSPFeePaymentProcess: func(ctx context.Context, ticketHash *chainhash.Hash, feeTx *wire.MsgTx) error {
-			return vspClient.Process(ctx, ticketHash, feeTx, asset.GetvspPolicy(account))
+			return vspClient.Process(ctx, ticketHash, feeTx)
 		},
 	}
 
@@ -152,17 +153,6 @@ func (asset *Asset) PurchaseTickets(account, numTickets int32, vspHost, passphra
 	return ticketsResponse.TicketHashes, err
 }
 
-// GetvspPolicy creates the VSP policy using the account number provided.
-// Uses the user-specified instructions for processing fee payments
-// on a ticket, rather than some default policy.
-func (asset *Asset) GetvspPolicy(account int32) vsp.Policy {
-	return vsp.Policy{
-		MaxFee:     0.2e8,
-		FeeAcct:    uint32(account),
-		ChangeAcct: uint32(account),
-	}
-}
-
 // VSPTicketInfo returns vsp-related info for a given ticket. Returns an error
 // if the ticket is not yet assigned to a VSP.
 func (asset *Asset) VSPTicketInfo(hash string) (*VSPTicketInfo, error) {
@@ -204,7 +194,22 @@ func (asset *Asset) VSPTicketInfo(hash string) (*VSPTicketInfo, error) {
 
 	ticketInfo.Client = vspClient
 
-	vspTicketStatus, err := vspClient.GetTicketStatus(ctx, ticketHash)
+	txs, _, err := asset.Internal().DCR.GetTransactionsByHashes(ctx, []*chainhash.Hash{ticketHash})
+	if err != nil {
+		return nil, err
+	}
+
+	commitmentAddr, err := stake.AddrFromSStxPkScrCommitment(txs[0].TxOut[1].PkScript, asset.chainParams)
+	if err != nil {
+		return nil, fmt.Errorf("failed to extract commitment address from %v: %w",
+			ticketHash, err)
+	}
+
+	req := types.TicketStatusRequest{
+		TicketHash: ticketHash.String(),
+	}
+
+	vspTicketStatus, err := vspClient.TicketStatus(ctx, req, commitmentAddr)
 	if err != nil {
 		log.Warnf("unable to get vsp ticket: %s Error: %v", hash, err)
 		return ticketInfo, nil
@@ -452,19 +457,14 @@ func (asset *Asset) buyTicket(ctx context.Context, passphrase string, sdiff dcru
 	// Count is 1 to prevent combining multiple split outputs in one tx,
 	// which can be used to link the tickets eventually purchased with the
 	// split outputs.
-	vspPolicy := vsp.Policy{
-		MaxFee:     0.2e8,
-		FeeAcct:    uint32(cfg.PurchaseAccount),
-		ChangeAcct: uint32(cfg.PurchaseAccount),
-	}
 	request := &w.PurchaseTicketsRequest{
 		Count:         1,
 		SourceAccount: uint32(cfg.PurchaseAccount),
 		Expiry:        expiry,
 		MinConf:       asset.RequiredConfirmations(),
-		VSPFeeProcess: cfg.VspClient.FeePercentage,
+		VSPFeePercent: cfg.VspClient.FeePercentage,
 		VSPFeePaymentProcess: func(ctx context.Context, ticketHash *chainhash.Hash, feeTx *wire.MsgTx) error {
-			return cfg.VspClient.Process(ctx, ticketHash, feeTx, vspPolicy)
+			return cfg.VspClient.Process(ctx, ticketHash, feeTx)
 		},
 	}
 	// Mixed split buying through CoinShuffle++, if configured.

libwallet/assets/dcr/treasury.go

@@ -4,7 +4,7 @@ import (
 	"encoding/hex"
 	"fmt"
 
-	"decred.org/dcrwallet/v3/errors"
+	"decred.org/dcrwallet/v4/errors"
 	"github.com/crypto-power/cryptopower/libwallet/utils"
 
 	"github.com/decred/dcrd/blockchain/stake/v5"

libwallet/assets/dcr/txandblocknotifications.go

@@ -3,7 +3,7 @@ package dcr
 import (
 	"encoding/json"
 
-	"decred.org/dcrwallet/v3/errors"
+	"decred.org/dcrwallet/v4/errors"
 	sharedW "github.com/crypto-power/cryptopower/libwallet/assets/wallet"
 	"github.com/crypto-power/cryptopower/libwallet/utils"
 )

libwallet/assets/dcr/txauthor.go

@@ -7,11 +7,11 @@ import (
 	"fmt"
 	"time"
 
-	"decred.org/dcrwallet/v3/errors"
-	w "decred.org/dcrwallet/v3/wallet"
-	"decred.org/dcrwallet/v3/wallet/txauthor"
-	"decred.org/dcrwallet/v3/wallet/txrules"
-	"decred.org/dcrwallet/v3/wallet/txsizes"
+	"decred.org/dcrwallet/v4/errors"
+	w "decred.org/dcrwallet/v4/wallet"
+	"decred.org/dcrwallet/v4/wallet/txauthor"
+	"decred.org/dcrwallet/v4/wallet/txrules"
+	"decred.org/dcrwallet/v4/wallet/txsizes"
 	sharedW "github.com/crypto-power/cryptopower/libwallet/assets/wallet"
 	"github.com/crypto-power/cryptopower/libwallet/txhelper"
 	"github.com/crypto-power/cryptopower/libwallet/utils"