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

multi: Consider DCP0012 in VSP fee calculations.

Browse Source 
Upgrade the dcrwallet dependency to pick up the new version of
txrules.StakePoolTicketFee which considers the status of DCP0012 in its
fee calculation.
This commit is contained in:
jholdstock 2023-09-15 12:38:41 +01:00 committed by Jamie Holdstock
parent 73ccfccda8
commit 74729c6cc9
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/v3tool/dcrwallet.go
View File

@ -13,7 +13,7 @@ import (
"fmt" "fmt"
"strings" "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/blockchain/stake/v5"
"github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/chaincfg/v3"
"github.com/decred/dcrd/dcrutil/v4" "github.com/decred/dcrd/dcrutil/v4"

2
go.mod
View File

@ -3,7 +3,7 @@ module github.com/decred/vspd
go 1.19 go 1.19
require ( 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/stake/v5 v5.0.0
github.com/decred/dcrd/blockchain/standalone/v2 v2.2.0 github.com/decred/dcrd/blockchain/standalone/v2 v2.2.0
github.com/decred/dcrd/chaincfg/chainhash v1.0.4 github.com/decred/dcrd/chaincfg/chainhash v1.0.4

4
go.sum
View File

@ -1,5 +1,5 @@
decred.org/dcrwallet/v3 v3.0.1 h1:+OLi+u/MvKc3Ubcnf19oyG/a5hJ/qp4OtezdiQZnLIs= decred.org/dcrwallet/v4 v4.0.0-20230914182405-90232ed6062b h1:GRfSfZ1yNGFtPu8OnI5YiVrlpAvmi72bUsplBZ0Zg7o=
decred.org/dcrwallet/v3 v3.0.1/go.mod h1:a+R8BZIOKVpWVPat5VZoBWNh/cnIciwcRkPtrzfS/tw= 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 h1:w1UutsfOrms1J05zt7ISrnJIXKzwaspym5BTKGx93EI=
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0= 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= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=

10
internal/webapi/getfeeaddress.go
View File

@ -8,7 +8,7 @@ import (
"sync" "sync"
"time" "time"
"decred.org/dcrwallet/v3/wallet/txrules" "decred.org/dcrwallet/v4/wallet/txrules"
"github.com/decred/dcrd/dcrutil/v4" "github.com/decred/dcrd/dcrutil/v4"
"github.com/decred/vspd/database" "github.com/decred/vspd/database"
"github.com/decred/vspd/rpc" "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. // is only used to calculate the fee charged for adding a ticket to the VSP.
const defaultMinRelayTxFee = dcrutil.Amount(1e4) 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, fee := txrules.StakePoolTicketFee(sDiff, defaultMinRelayTxFee, int32(bestBlock.Height),
int32(bestBlock.Height), w.cfg.VSPFee, w.cfg.Network.Params, isDCP0010Active) w.cfg.VSPFee, w.cfg.Network.Params, isDCP0010Active, isDCP0012Active)
if err != nil { if err != nil {
return 0, err return 0, err
} }

2
rpc/dcrwallet.go
View File

@ -8,7 +8,7 @@ import (
"context" "context"
"fmt" "fmt"
wallettypes "decred.org/dcrwallet/v3/rpc/jsonrpc/types" wallettypes "decred.org/dcrwallet/v4/rpc/jsonrpc/types"
"github.com/decred/dcrd/chaincfg/v3" "github.com/decred/dcrd/chaincfg/v3"
dcrdtypes "github.com/decred/dcrd/rpc/jsonrpc/types/v4" dcrdtypes "github.com/decred/dcrd/rpc/jsonrpc/types/v4"
"github.com/decred/dcrd/wire" "github.com/decred/dcrd/wire"