From 74729c6cc9f071d8857e49fc9339d7f4cb44f8a4 Mon Sep 17 00:00:00 2001
From: jholdstock <jholdstock@decred.org>
Date: Fri, 15 Sep 2023 12:38:41 +0100
Subject: [PATCH] multi: Consider DCP0012 in VSP fee calculations.

Upgrade the dcrwallet dependency to pick up the new version of
txrules.StakePoolTicketFee which considers the status of DCP0012 in its
fee calculation.
---
 cmd/v3tool/dcrwallet.go          |  2 +-
 go.mod                           |  2 +-
 go.sum                           |  4 ++--
 internal/webapi/getfeeaddress.go | 10 ++++++----
 rpc/dcrwallet.go                 |  2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cmd/v3tool/dcrwallet.go b/cmd/v3tool/dcrwallet.go
index 6b86a2e..7fd295f 100644
--- a/cmd/v3tool/dcrwallet.go
+++ b/cmd/v3tool/dcrwallet.go
@@ -13,7 +13,7 @@ import (
 	"fmt"
 	"strings"
 
-	wallettypes "decred.org/dcrwallet/v3/rpc/jsonrpc/types"
+	wallettypes "decred.org/dcrwallet/v4/rpc/jsonrpc/types"
 	"github.com/decred/dcrd/blockchain/stake/v5"
 	"github.com/decred/dcrd/chaincfg/v3"
 	"github.com/decred/dcrd/dcrutil/v4"
diff --git a/go.mod b/go.mod
index 6128ad9..217a55e 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/decred/vspd
 go 1.19
 
 require (
-	decred.org/dcrwallet/v3 v3.0.1
+	decred.org/dcrwallet/v4 v4.0.0-20230914182405-90232ed6062b
 	github.com/decred/dcrd/blockchain/stake/v5 v5.0.0
 	github.com/decred/dcrd/blockchain/standalone/v2 v2.2.0
 	github.com/decred/dcrd/chaincfg/chainhash v1.0.4
diff --git a/go.sum b/go.sum
index 78f1afb..cedb76b 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-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-20230914182405-90232ed6062b h1:GRfSfZ1yNGFtPu8OnI5YiVrlpAvmi72bUsplBZ0Zg7o=
+decred.org/dcrwallet/v4 v4.0.0-20230914182405-90232ed6062b/go.mod h1:0+CchVf/baDYJ0tlDjtEzAFsvYcwWRm0eo1+Lf7Z1as=
 github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 h1:w1UutsfOrms1J05zt7ISrnJIXKzwaspym5BTKGx93EI=
 github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
diff --git a/internal/webapi/getfeeaddress.go b/internal/webapi/getfeeaddress.go
index cf1ad6f..4900d7e 100644
--- a/internal/webapi/getfeeaddress.go
+++ b/internal/webapi/getfeeaddress.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"decred.org/dcrwallet/v3/wallet/txrules"
+	"decred.org/dcrwallet/v4/wallet/txrules"
 	"github.com/decred/dcrd/dcrutil/v4"
 	"github.com/decred/vspd/database"
 	"github.com/decred/vspd/rpc"
@@ -56,10 +56,12 @@ func (w *WebAPI) getCurrentFee(dcrdClient *rpc.DcrdRPC) (dcrutil.Amount, error)
 	// is only used to calculate the fee charged for adding a ticket to the VSP.
 	const defaultMinRelayTxFee = dcrutil.Amount(1e4)
 
-	isDCP0010Active := w.cfg.Network.DCP10Active(int64(bestBlock.Height))
+	height := int64(bestBlock.Height)
+	isDCP0010Active := w.cfg.Network.DCP10Active(height)
+	isDCP0012Active := w.cfg.Network.DCP12Active(height)
 
-	fee := txrules.StakePoolTicketFee(sDiff, defaultMinRelayTxFee,
-		int32(bestBlock.Height), w.cfg.VSPFee, w.cfg.Network.Params, isDCP0010Active)
+	fee := txrules.StakePoolTicketFee(sDiff, defaultMinRelayTxFee, int32(bestBlock.Height),
+		w.cfg.VSPFee, w.cfg.Network.Params, isDCP0010Active, isDCP0012Active)
 	if err != nil {
 		return 0, err
 	}
diff --git a/rpc/dcrwallet.go b/rpc/dcrwallet.go
index d320188..e2389f0 100644
--- a/rpc/dcrwallet.go
+++ b/rpc/dcrwallet.go
@@ -8,7 +8,7 @@ import (
 	"context"
 	"fmt"
 
-	wallettypes "decred.org/dcrwallet/v3/rpc/jsonrpc/types"
+	wallettypes "decred.org/dcrwallet/v4/rpc/jsonrpc/types"
 	"github.com/decred/dcrd/chaincfg/v3"
 	dcrdtypes "github.com/decred/dcrd/rpc/jsonrpc/types/v4"
 	"github.com/decred/dcrd/wire"