Split methods.go (#39)

README.md

@@ -27,7 +27,7 @@
   - Request fee amount (`GET /fee`)
   - Request fee address (`POST /feeaddress`)
   - Pay fee (`POST /payFee`)
-  - Ticket status (`POST /ticketstatus`)
+  - Ticket status (`GET /ticketstatus`)
   - Set voting preferences (`POST /setvotebits`)
 - A minimal, static, web front-end providing pool stats and basic connection instructions.
 - Fees have an expiry period. If the fee is not paid within this period, the

main.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"os"
 	"sync"
+	"time"
 
 	"github.com/jholdstock/dcrvsp/database"
 	"github.com/jholdstock/dcrvsp/rpc"
@@ -15,6 +16,8 @@ import (
 
 const (
 	feeAccountName = "fees"
+	// TODO: Make expiration configurable?
+	defaultFeeAddressExpiration = 24 * time.Hour
 )
 
 func main() {
@@ -85,11 +88,12 @@ func run(ctx context.Context) error {
 
 	// Create and start webapi server.
 	apiCfg := webapi.Config{
-		SignKey:        signKey,
-		PubKey:         pubKey,
-		VSPFee:         cfg.VSPFee,
-		NetParams:      cfg.netParams.Params,
-		FeeAccountName: feeAccountName,
+		SignKey:              signKey,
+		PubKey:               pubKey,
+		VSPFee:               cfg.VSPFee,
+		NetParams:            cfg.netParams.Params,
+		FeeAccountName:       feeAccountName,
+		FeeAddressExpiration: defaultFeeAddressExpiration,
 	}
 	err = webapi.Start(ctx, shutdownRequestChannel, &shutdownWg, cfg.Listen, db, walletRPC, cfg.WebServerDebug, apiCfg)
 	if err != nil {

webapi/getfeeaddress.go

@@ -0,0 +1,202 @@
+package webapi
+
+import (
+	"encoding/base64"
+	"encoding/hex"
+	"errors"
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/decred/dcrd/blockchain/stake/v3"
+	"github.com/decred/dcrd/chaincfg/chainhash"
+	"github.com/decred/dcrd/dcrutil/v3"
+	dcrdtypes "github.com/decred/dcrd/rpc/jsonrpc/types/v2"
+	"github.com/decred/dcrd/wire"
+	"github.com/gin-gonic/gin"
+	"github.com/jholdstock/dcrvsp/database"
+)
+
+// feeAddress is the handler for "POST /feeaddress"
+func feeAddress(c *gin.Context) {
+	var feeAddressRequest FeeAddressRequest
+	if err := c.ShouldBindJSON(&feeAddressRequest); err != nil {
+		log.Warnf("Bad feeaddress request from %s: %v", c.ClientIP(), err)
+		sendErrorResponse(err.Error(), http.StatusBadRequest, c)
+		return
+	}
+
+	// ticketHash
+	ticketHashStr := feeAddressRequest.TicketHash
+	txHash, err := chainhash.NewHashFromStr(ticketHashStr)
+	if err != nil {
+		log.Warnf("Invalid ticket hash from %s", c.ClientIP())
+		sendErrorResponse("invalid ticket hash", http.StatusBadRequest, c)
+		return
+	}
+
+	// signature - sanity check signature is in base64 encoding
+	signature := feeAddressRequest.Signature
+	if _, err = base64.StdEncoding.DecodeString(signature); err != nil {
+		log.Warnf("Invalid signature from %s", c.ClientIP())
+		sendErrorResponse("invalid signature", http.StatusBadRequest, c)
+		return
+	}
+
+	// Check for existing response
+	ticket, err := db.GetTicketByHash(ticketHashStr)
+	if err != nil && !errors.Is(err, database.ErrNoTicketFound) {
+		log.Errorf("GetTicketByHash error: %v", err)
+		sendErrorResponse("database error", http.StatusInternalServerError, c)
+		return
+	}
+	if err == nil {
+		// Ticket already exists
+		if signature == ticket.CommitmentSignature {
+			now := time.Now()
+			expire := ticket.Expiration
+			VSPFee := ticket.VSPFee
+			if now.After(time.Unix(ticket.Expiration, 0)) {
+				expire = now.Add(cfg.FeeAddressExpiration).Unix()
+				VSPFee = cfg.VSPFee
+
+				err = db.UpdateExpireAndFee(ticketHashStr, expire, VSPFee)
+				if err != nil {
+					log.Errorf("UpdateExpireAndFee error: %v", err)
+					sendErrorResponse("database error", http.StatusInternalServerError, c)
+					return
+				}
+			}
+			sendJSONResponse(feeAddressResponse{
+				Timestamp:  now.Unix(),
+				Request:    feeAddressRequest,
+				FeeAddress: ticket.FeeAddress,
+				Fee:        VSPFee,
+				Expiration: expire,
+			}, c)
+
+			return
+		}
+		log.Warnf("Invalid signature from %s", c.ClientIP())
+		sendErrorResponse("invalid signature", http.StatusBadRequest, c)
+		return
+	}
+
+	walletClient, err := walletRPC()
+	if err != nil {
+		log.Errorf("Failed to dial dcrwallet RPC: %v", err)
+		sendErrorResponse("dcrwallet RPC error", http.StatusInternalServerError, c)
+		return
+	}
+
+	ctx := c.Request.Context()
+
+	var resp dcrdtypes.TxRawResult
+	err = walletClient.Call(ctx, "getrawtransaction", &resp, txHash.String(), 1)
+	if err != nil {
+		log.Warnf("Could not retrieve tx %s for %s: %v", txHash, c.ClientIP(), err)
+		sendErrorResponse("unknown transaction", http.StatusBadRequest, c)
+		return
+	}
+	if resp.Confirmations < 2 || resp.BlockHeight < 0 {
+		log.Warnf("Not enough confs for tx from %s", c.ClientIP())
+		sendErrorResponse("transaction does not have minimum confirmations", http.StatusBadRequest, c)
+		return
+	}
+	if resp.Confirmations > int64(uint32(cfg.NetParams.TicketMaturity)+cfg.NetParams.TicketExpiry) {
+		log.Warnf("Too old tx from %s", c.ClientIP())
+		sendErrorResponse("transaction too old", http.StatusBadRequest, c)
+		return
+	}
+
+	msgHex, err := hex.DecodeString(resp.Hex)
+	if err != nil {
+		log.Errorf("Failed to decode tx: %v", err)
+		sendErrorResponse("unable to decode transaction", http.StatusInternalServerError, c)
+		return
+	}
+
+	msgTx := wire.NewMsgTx()
+	if err = msgTx.FromBytes(msgHex); err != nil {
+		log.Errorf("Failed to deserialize tx: %v", err)
+		sendErrorResponse("failed to deserialize transaction", http.StatusInternalServerError, c)
+		return
+	}
+	if !stake.IsSStx(msgTx) {
+		log.Warnf("Non-ticket tx from %s", c.ClientIP())
+		sendErrorResponse("transaction is not a ticket", http.StatusBadRequest, c)
+		return
+	}
+	if len(msgTx.TxOut) != 3 {
+		log.Warnf("Invalid ticket from %s", c.ClientIP())
+		sendErrorResponse("invalid ticket", http.StatusBadRequest, c)
+		return
+	}
+
+	// Get commitment address
+	addr, err := stake.AddrFromSStxPkScrCommitment(msgTx.TxOut[1].PkScript, cfg.NetParams)
+	if err != nil {
+		log.Errorf("Failed to get commitment address: %v", err)
+		sendErrorResponse("failed to get commitment address", http.StatusInternalServerError, c)
+		return
+	}
+
+	// verify message
+	message := fmt.Sprintf("vsp v3 getfeeaddress %s", msgTx.TxHash())
+	err = dcrutil.VerifyMessage(addr.Address(), signature, message, cfg.NetParams)
+	if err != nil {
+		log.Warnf("Invalid signature from %s", c.ClientIP())
+		sendErrorResponse("invalid signature", http.StatusBadRequest, c)
+		return
+	}
+
+	// get blockheight and sdiff which is required by
+	// txrules.StakePoolTicketFee, and store them in the database
+	// for processing by payfee
+	var blockHeader dcrdtypes.GetBlockHeaderVerboseResult
+	err = walletClient.Call(ctx, "getblockheader", &blockHeader, resp.BlockHash, true)
+	if err != nil {
+		log.Errorf("GetBlockHeader error: %v", err)
+		sendErrorResponse("dcrwallet RPC error", http.StatusInternalServerError, c)
+		return
+	}
+
+	var newAddress string
+	err = walletClient.Call(ctx, "getnewaddress", &newAddress, "fees")
+	if err != nil {
+		log.Errorf("GetNewAddress error: %v", err)
+		sendErrorResponse("unable to generate fee address", http.StatusInternalServerError, c)
+		return
+	}
+
+	now := time.Now()
+	expire := now.Add(cfg.FeeAddressExpiration).Unix()
+
+	dbTicket := database.Ticket{
+		Hash:                txHash.String(),
+		CommitmentSignature: signature,
+		CommitmentAddress:   addr.Address(),
+		FeeAddress:          newAddress,
+		SDiff:               blockHeader.SBits,
+		BlockHeight:         int64(blockHeader.Height),
+		VoteBits:            dcrutil.BlockValid,
+		VSPFee:              cfg.VSPFee,
+		Expiration:          expire,
+		// VotingKey: set during payfee
+	}
+
+	err = db.InsertFeeAddress(dbTicket)
+	if err != nil {
+		log.Errorf("InsertFeeAddress error: %v", err)
+		sendErrorResponse("database error", http.StatusInternalServerError, c)
+		return
+	}
+
+	sendJSONResponse(feeAddressResponse{
+		Timestamp:  now.Unix(),
+		Request:    feeAddressRequest,
+		FeeAddress: newAddress,
+		Fee:        cfg.VSPFee,
+		Expiration: expire,
+	}, c)
+}

webapi/helpers.go

@@ -5,23 +5,22 @@ import (
 	"github.com/decred/dcrd/dcrutil/v3"
 )
 
-func currentVoteVersion(params *chaincfg.Params) uint32 {
-	var latestVersion uint32
-	for version := range params.Deployments {
-		if latestVersion < version {
-			latestVersion = version
-		}
-	}
-	return latestVersion
-}
+// isValidVoteBits checks if voteBits are valid for the most recent agendas.
+func isValidVoteBits(params *chaincfg.Params, voteBits uint16) bool {
 
-// isValidVoteBits returns an error if voteBits are not valid for agendas
-func isValidVoteBits(params *chaincfg.Params, voteVersion uint32, voteBits uint16) bool {
 	if !dcrutil.IsFlagSet16(voteBits, dcrutil.BlockValid) {
 		return false
 	}
 	voteBits &= ^uint16(dcrutil.BlockValid)
 
+	// Get the most recent vote version.
+	var voteVersion uint32
+	for version := range params.Deployments {
+		if voteVersion < version {
+			voteVersion = version
+		}
+	}
+
 	var availVoteBits uint16
 	for _, vote := range params.Deployments[voteVersion] {
 		availVoteBits |= vote.Vote.Mask

webapi/helpers_test.go

@@ -24,9 +24,8 @@ func TestVoteBits(t *testing.T) {
 	}
 
 	params := chaincfg.MainNetParams()
-	voteVersion := currentVoteVersion(params)
 	for _, test := range tests {
-		isValid := isValidVoteBits(params, voteVersion, test.voteBits)
+		isValid := isValidVoteBits(params, test.voteBits)
 		if isValid != test.isValid {
 			t.Fatalf("isValidVoteBits failed for votebits '%d': want %v, got %v",
 				test.voteBits, test.isValid, isValid)

webapi/methods.go

@@ -1,536 +0,0 @@
-package webapi
-
-import (
-	"bytes"
-	"crypto/ed25519"
-	"encoding/base64"
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-	"time"
-
-	"github.com/jholdstock/dcrvsp/database"
-
-	"decred.org/dcrwallet/wallet/txrules"
-	"github.com/decred/dcrd/blockchain/stake/v3"
-	"github.com/decred/dcrd/chaincfg/chainhash"
-	"github.com/decred/dcrd/dcrec"
-	"github.com/decred/dcrd/dcrutil/v3"
-	dcrdtypes "github.com/decred/dcrd/rpc/jsonrpc/types/v2"
-	"github.com/decred/dcrd/txscript/v3"
-	"github.com/decred/dcrd/wire"
-	"github.com/gin-gonic/gin"
-)
-
-const (
-	defaultFeeAddressExpiration = 24 * time.Hour
-)
-
-func sendJSONResponse(resp interface{}, c *gin.Context) {
-	dec, err := json.Marshal(resp)
-	if err != nil {
-		log.Errorf("JSON marshal error: %v", err)
-		sendErrorResponse("failed to marshal json", http.StatusInternalServerError, c)
-		return
-	}
-
-	sig := ed25519.Sign(cfg.SignKey, dec)
-	c.Writer.Header().Set("VSP-Signature", hex.EncodeToString(sig))
-
-	c.JSON(http.StatusOK, resp)
-}
-
-func sendErrorResponse(errMsg string, code int, c *gin.Context) {
-	c.JSON(code, gin.H{"error": errMsg})
-}
-
-func pubKey(c *gin.Context) {
-	sendJSONResponse(pubKeyResponse{
-		Timestamp: time.Now().Unix(),
-		PubKey:    cfg.PubKey,
-	}, c)
-}
-
-func fee(c *gin.Context) {
-	sendJSONResponse(feeResponse{
-		Timestamp: time.Now().Unix(),
-		Fee:       cfg.VSPFee,
-	}, c)
-}
-
-func feeAddress(c *gin.Context) {
-
-	var feeAddressRequest FeeAddressRequest
-	if err := c.ShouldBindJSON(&feeAddressRequest); err != nil {
-		log.Warnf("Bad feeaddress request from %s: %v", c.ClientIP(), err)
-		sendErrorResponse(err.Error(), http.StatusBadRequest, c)
-		return
-	}
-
-	// ticketHash
-	ticketHashStr := feeAddressRequest.TicketHash
-	txHash, err := chainhash.NewHashFromStr(ticketHashStr)
-	if err != nil {
-		log.Warnf("Invalid ticket hash from %s", c.ClientIP())
-		sendErrorResponse("invalid ticket hash", http.StatusBadRequest, c)
-		return
-	}
-
-	// signature - sanity check signature is in base64 encoding
-	signature := feeAddressRequest.Signature
-	if _, err = base64.StdEncoding.DecodeString(signature); err != nil {
-		log.Warnf("Invalid signature from %s", c.ClientIP())
-		sendErrorResponse("invalid signature", http.StatusBadRequest, c)
-		return
-	}
-
-	// Check for existing response
-	ticket, err := db.GetTicketByHash(ticketHashStr)
-	if err != nil && !errors.Is(err, database.ErrNoTicketFound) {
-		log.Errorf("GetTicketByHash error: %v", err)
-		sendErrorResponse("database error", http.StatusInternalServerError, c)
-		return
-	}
-	if err == nil {
-		// Ticket already exists
-		if signature == ticket.CommitmentSignature {
-			now := time.Now()
-			expire := ticket.Expiration
-			VSPFee := ticket.VSPFee
-			if now.After(time.Unix(ticket.Expiration, 0)) {
-				expire = now.Add(defaultFeeAddressExpiration).Unix()
-				VSPFee = cfg.VSPFee
-
-				err = db.UpdateExpireAndFee(ticketHashStr, expire, VSPFee)
-				if err != nil {
-					log.Errorf("UpdateExpireAndFee error: %v", err)
-					sendErrorResponse("database error", http.StatusInternalServerError, c)
-					return
-				}
-			}
-			sendJSONResponse(feeAddressResponse{
-				Timestamp:  now.Unix(),
-				Request:    feeAddressRequest,
-				FeeAddress: ticket.FeeAddress,
-				Fee:        VSPFee,
-				Expiration: expire,
-			}, c)
-
-			return
-		}
-		log.Warnf("Invalid signature from %s", c.ClientIP())
-		sendErrorResponse("invalid signature", http.StatusBadRequest, c)
-		return
-	}
-
-	walletClient, err := walletRPC()
-	if err != nil {
-		log.Errorf("Failed to dial dcrwallet RPC: %v", err)
-		sendErrorResponse("dcrwallet RPC error", http.StatusInternalServerError, c)
-		return
-	}
-
-	ctx := c.Request.Context()
-
-	var resp dcrdtypes.TxRawResult
-	err = walletClient.Call(ctx, "getrawtransaction", &resp, txHash.String(), 1)
-	if err != nil {
-		log.Warnf("Could not retrieve tx %s for %s: %v", txHash, c.ClientIP(), err)
-		sendErrorResponse("unknown transaction", http.StatusBadRequest, c)
-		return
-	}
-	if resp.Confirmations < 2 || resp.BlockHeight < 0 {
-		log.Warnf("Not enough confs for tx from %s", c.ClientIP())
-		sendErrorResponse("transaction does not have minimum confirmations", http.StatusBadRequest, c)
-		return
-	}
-	if resp.Confirmations > int64(uint32(cfg.NetParams.TicketMaturity)+cfg.NetParams.TicketExpiry) {
-		log.Warnf("Too old tx from %s", c.ClientIP())
-		sendErrorResponse("transaction too old", http.StatusBadRequest, c)
-		return
-	}
-
-	msgHex, err := hex.DecodeString(resp.Hex)
-	if err != nil {
-		log.Errorf("Failed to decode tx: %v", err)
-		sendErrorResponse("unable to decode transaction", http.StatusInternalServerError, c)
-		return
-	}
-
-	msgTx := wire.NewMsgTx()
-	if err = msgTx.FromBytes(msgHex); err != nil {
-		log.Errorf("Failed to deserialize tx: %v", err)
-		sendErrorResponse("failed to deserialize transaction", http.StatusInternalServerError, c)
-		return
-	}
-	if !stake.IsSStx(msgTx) {
-		log.Warnf("Non-ticket tx from %s", c.ClientIP())
-		sendErrorResponse("transaction is not a ticket", http.StatusBadRequest, c)
-		return
-	}
-	if len(msgTx.TxOut) != 3 {
-		log.Warnf("Invalid ticket from %s", c.ClientIP())
-		sendErrorResponse("invalid ticket", http.StatusBadRequest, c)
-		return
-	}
-
-	// Get commitment address
-	addr, err := stake.AddrFromSStxPkScrCommitment(msgTx.TxOut[1].PkScript, cfg.NetParams)
-	if err != nil {
-		log.Errorf("Failed to get commitment address: %v", err)
-		sendErrorResponse("failed to get commitment address", http.StatusInternalServerError, c)
-		return
-	}
-
-	// verify message
-	message := fmt.Sprintf("vsp v3 getfeeaddress %s", msgTx.TxHash())
-	err = dcrutil.VerifyMessage(addr.Address(), signature, message, cfg.NetParams)
-	if err != nil {
-		log.Warnf("Invalid signature from %s", c.ClientIP())
-		sendErrorResponse("invalid signature", http.StatusBadRequest, c)
-		return
-	}
-
-	// get blockheight and sdiff which is required by
-	// txrules.StakePoolTicketFee, and store them in the database
-	// for processing by payfee
-	var blockHeader dcrdtypes.GetBlockHeaderVerboseResult
-	err = walletClient.Call(ctx, "getblockheader", &blockHeader, resp.BlockHash, true)
-	if err != nil {
-		log.Errorf("GetBlockHeader error: %v", err)
-		sendErrorResponse("dcrwallet RPC error", http.StatusInternalServerError, c)
-		return
-	}
-
-	var newAddress string
-	err = walletClient.Call(ctx, "getnewaddress", &newAddress, cfg.FeeAccountName)
-	if err != nil {
-		log.Errorf("GetNewAddress error: %v", err)
-		sendErrorResponse("unable to generate fee address", http.StatusInternalServerError, c)
-		return
-	}
-
-	now := time.Now()
-	expire := now.Add(defaultFeeAddressExpiration).Unix()
-
-	dbTicket := database.Ticket{
-		Hash:                txHash.String(),
-		CommitmentSignature: signature,
-		CommitmentAddress:   addr.Address(),
-		FeeAddress:          newAddress,
-		SDiff:               blockHeader.SBits,
-		BlockHeight:         int64(blockHeader.Height),
-		VoteBits:            dcrutil.BlockValid,
-		VSPFee:              cfg.VSPFee,
-		Expiration:          expire,
-		// VotingKey: set during payfee
-	}
-
-	err = db.InsertFeeAddress(dbTicket)
-	if err != nil {
-		log.Errorf("InsertFeeAddress error: %v", err)
-		sendErrorResponse("database error", http.StatusInternalServerError, c)
-		return
-	}
-
-	sendJSONResponse(feeAddressResponse{
-		Timestamp:  now.Unix(),
-		Request:    feeAddressRequest,
-		FeeAddress: newAddress,
-		Fee:        cfg.VSPFee,
-		Expiration: expire,
-	}, c)
-}
-
-func payFee(c *gin.Context) {
-	var payFeeRequest PayFeeRequest
-	if err := c.ShouldBindJSON(&payFeeRequest); err != nil {
-		log.Warnf("Bad payfee request from %s: %v", c.ClientIP(), err)
-		sendErrorResponse(err.Error(), http.StatusBadRequest, c)
-		return
-	}
-
-	votingKey := payFeeRequest.VotingKey
-	votingWIF, err := dcrutil.DecodeWIF(votingKey, cfg.NetParams.PrivateKeyID)
-	if err != nil {
-		log.Warnf("Failed to decode WIF: %v", err)
-		sendErrorResponse("error decoding WIF", http.StatusBadRequest, c)
-		return
-	}
-
-	voteBits := payFeeRequest.VoteBits
-	if !isValidVoteBits(cfg.NetParams, currentVoteVersion(cfg.NetParams), voteBits) {
-		log.Warnf("Invalid votebits from %s", c.ClientIP())
-		sendErrorResponse("invalid votebits", http.StatusBadRequest, c)
-		return
-	}
-
-	feeTxBytes, err := hex.DecodeString(payFeeRequest.FeeTx)
-	if err != nil {
-		log.Warnf("Failed to decode tx: %v", err)
-		sendErrorResponse("failed to decode transaction", http.StatusBadRequest, c)
-		return
-	}
-
-	feeTx := wire.NewMsgTx()
-	err = feeTx.FromBytes(feeTxBytes)
-	if err != nil {
-		log.Warnf("Failed to deserialize tx: %v", err)
-		sendErrorResponse("unable to deserialize transaction", http.StatusBadRequest, c)
-		return
-	}
-
-	// TODO: DB - check expiration given during fee address request
-
-	ticket, err := db.GetTicketByHash(payFeeRequest.TicketHash)
-	if err != nil {
-		log.Warnf("Invalid ticket from %s", c.ClientIP())
-		sendErrorResponse("invalid ticket", http.StatusBadRequest, c)
-		return
-	}
-	var feeAmount dcrutil.Amount
-	const scriptVersion = 0
-
-findAddress:
-	for _, txOut := range feeTx.TxOut {
-		_, addresses, _, err := txscript.ExtractPkScriptAddrs(scriptVersion,
-			txOut.PkScript, cfg.NetParams)
-		if err != nil {
-			log.Errorf("Extract PK error: %v", err)
-			sendErrorResponse("extract PK error", http.StatusInternalServerError, c)
-			return
-		}
-		for _, addr := range addresses {
-			if addr.Address() == ticket.FeeAddress {
-				feeAmount = dcrutil.Amount(txOut.Value)
-				break findAddress
-			}
-		}
-	}
-
-	if feeAmount == 0 {
-		log.Warnf("FeeTx for ticket %s did not include any payments for address %s", ticket.Hash, ticket.FeeAddress)
-		sendErrorResponse("feetx did not include any payments for fee address", http.StatusBadRequest, c)
-		return
-	}
-
-	voteAddr, err := dcrutil.DecodeAddress(ticket.CommitmentAddress, cfg.NetParams)
-	if err != nil {
-		log.Errorf("DecodeAddress: %v", err)
-		sendErrorResponse("database error", http.StatusInternalServerError, c)
-		return
-	}
-	_, err = dcrutil.NewAddressPubKeyHash(dcrutil.Hash160(votingWIF.PubKey()), cfg.NetParams,
-		dcrec.STEcdsaSecp256k1)
-	if err != nil {
-		log.Errorf("NewAddressPubKeyHash: %v", err)
-		sendErrorResponse("failed to deserialize voting wif", http.StatusInternalServerError, c)
-		return
-	}
-
-	// TODO: DB - validate votingkey against ticket submission address
-
-	sDiff := dcrutil.Amount(ticket.SDiff)
-
-	// TODO - RPC - get relayfee from wallet
-	relayFee, err := dcrutil.NewAmount(0.0001)
-	if err != nil {
-		log.Errorf("NewAmount failed: %v", err)
-		sendErrorResponse("failed to create new amount", http.StatusInternalServerError, c)
-		return
-	}
-
-	minFee := txrules.StakePoolTicketFee(sDiff, relayFee, int32(ticket.BlockHeight), cfg.VSPFee, cfg.NetParams)
-	if feeAmount < minFee {
-		log.Errorf("Fee too small: was %v, expected %v", feeAmount, minFee)
-		sendErrorResponse("fee too small", http.StatusInternalServerError, c)
-		return
-	}
-
-	// Get vote tx to give to wallet
-	ticketHash, err := chainhash.NewHashFromStr(ticket.Hash)
-	if err != nil {
-		log.Errorf("NewHashFromStr failed: %v", err)
-		sendErrorResponse("failed to create hash", http.StatusInternalServerError, c)
-		return
-	}
-
-	walletClient, err := walletRPC()
-	if err != nil {
-		log.Errorf("Failed to dial dcrwallet RPC: %v", err)
-		sendErrorResponse("dcrwallet RPC error", http.StatusInternalServerError, c)
-		return
-	}
-
-	ctx := c.Request.Context()
-	var resp dcrdtypes.TxRawResult
-
-	err = walletClient.Call(ctx, "getrawtransaction", &resp, ticketHash.String(), 1)
-	if err != nil {
-		log.Errorf("GetRawTransaction failed: %v", err)
-		sendErrorResponse("dcrwallet RPC error", http.StatusInternalServerError, c)
-		return
-	}
-
-	err = walletClient.Call(ctx, "addtransaction", nil, resp.BlockHash, resp.Hex)
-	if err != nil {
-		log.Errorf("AddTransaction failed: %v", err)
-		sendErrorResponse("dcrwallet RPC error", http.StatusInternalServerError, c)
-		return
-	}
-
-	err = walletClient.Call(ctx, "importprivkey", nil, votingWIF.String(), "imported", false, 0)
-	if err != nil {
-		log.Errorf("ImportPrivKey failed: %v", err)
-		sendErrorResponse("dcrwallet RPC error", http.StatusInternalServerError, c)
-		return
-	}
-
-	feeTxBuf := new(bytes.Buffer)
-	feeTxBuf.Grow(feeTx.SerializeSize())
-	err = feeTx.Serialize(feeTxBuf)
-	if err != nil {
-		log.Errorf("Serialize tx failed: %v", err)
-		sendErrorResponse("serialize tx error", http.StatusInternalServerError, c)
-		return
-	}
-
-	var res string
-	err = walletClient.Call(ctx, "sendrawtransaction", &res, hex.EncodeToString(feeTxBuf.Bytes()), false)
-	if err != nil {
-		log.Errorf("SendRawTransaction failed: %v", err)
-		sendErrorResponse("dcrwallet RPC error", http.StatusInternalServerError, c)
-		return
-	}
-
-	err = db.InsertFeeAddressVotingKey(voteAddr.Address(), votingWIF.String(), voteBits)
-	if err != nil {
-		log.Errorf("InsertFeeAddressVotingKey failed: %v", err)
-		sendErrorResponse("database error", http.StatusInternalServerError, c)
-		return
-	}
-
-	sendJSONResponse(payFeeResponse{
-		Timestamp: time.Now().Unix(),
-		TxHash:    res,
-		Request:   payFeeRequest,
-	}, c)
-}
-
-func setVoteBits(c *gin.Context) {
-	var setVoteBitsRequest SetVoteBitsRequest
-	if err := c.ShouldBindJSON(&setVoteBitsRequest); err != nil {
-		log.Warnf("Bad setvotebits request from %s: %v", c.ClientIP(), err)
-		sendErrorResponse(err.Error(), http.StatusBadRequest, c)
-		return
-	}
-
-	// ticketHash
-	ticketHashStr := setVoteBitsRequest.TicketHash
-	txHash, err := chainhash.NewHashFromStr(ticketHashStr)
-	if err != nil {
-		log.Warnf("Invalid ticket hash from %s", c.ClientIP())
-		sendErrorResponse("invalid ticket hash", http.StatusBadRequest, c)
-		return
-	}
-
-	// signature - sanity check signature is in base64 encoding
-	signature := setVoteBitsRequest.Signature
-	if _, err = base64.StdEncoding.DecodeString(signature); err != nil {
-		log.Warnf("Invalid signature from %s", c.ClientIP())
-		sendErrorResponse("invalid signature", http.StatusBadRequest, c)
-		return
-	}
-
-	// votebits
-	voteBits := setVoteBitsRequest.VoteBits
-	if !isValidVoteBits(cfg.NetParams, currentVoteVersion(cfg.NetParams), voteBits) {
-		log.Warnf("Invalid votebits from %s", c.ClientIP())
-		sendErrorResponse("invalid votebits", http.StatusBadRequest, c)
-		return
-	}
-
-	ticket, err := db.GetTicketByHash(txHash.String())
-	if err != nil {
-		log.Warnf("Invalid ticket from %s", c.ClientIP())
-		sendErrorResponse("invalid ticket", http.StatusBadRequest, c)
-		return
-	}
-
-	// verify message
-	message := fmt.Sprintf("vsp v3 setvotebits %d %s %d", setVoteBitsRequest.Timestamp, txHash, voteBits)
-	err = dcrutil.VerifyMessage(ticket.CommitmentAddress, signature, message, cfg.NetParams)
-	if err != nil {
-		log.Warnf("Failed to verify message from %s", c.ClientIP())
-		sendErrorResponse("message did not pass verification", http.StatusBadRequest, c)
-		return
-	}
-
-	err = db.UpdateVoteBits(txHash.String(), voteBits)
-	if err != nil {
-		log.Errorf("UpdateVoteBits error: %v", err)
-		sendErrorResponse("database error", http.StatusInternalServerError, c)
-		return
-	}
-
-	// TODO: DB - error if given timestamp is older than any previous requests
-
-	// TODO: DB - store setvotebits receipt in log
-
-	sendJSONResponse(setVoteBitsResponse{
-		Timestamp: time.Now().Unix(),
-		Request:   setVoteBitsRequest,
-		VoteBits:  voteBits,
-	}, c)
-}
-
-func ticketStatus(c *gin.Context) {
-	var ticketStatusRequest TicketStatusRequest
-	if err := c.ShouldBindJSON(&ticketStatusRequest); err != nil {
-		log.Warnf("Bad ticketstatus request from %s: %v", c.ClientIP(), err)
-		sendErrorResponse(err.Error(), http.StatusBadRequest, c)
-		return
-	}
-
-	// ticketHash
-	ticketHashStr := ticketStatusRequest.TicketHash
-	_, err := chainhash.NewHashFromStr(ticketHashStr)
-	if err != nil {
-		log.Warnf("Invalid ticket hash from %s", c.ClientIP())
-		sendErrorResponse("invalid ticket hash", http.StatusBadRequest, c)
-		return
-	}
-
-	// signature - sanity check signature is in base64 encoding
-	signature := ticketStatusRequest.Signature
-	if _, err = base64.StdEncoding.DecodeString(signature); err != nil {
-		log.Warnf("Invalid signature from %s", c.ClientIP())
-		sendErrorResponse("invalid signature", http.StatusBadRequest, c)
-		return
-	}
-
-	ticket, err := db.GetTicketByHash(ticketHashStr)
-	if err != nil {
-		log.Warnf("Invalid ticket from %s", c.ClientIP())
-		sendErrorResponse("invalid ticket", http.StatusBadRequest, c)
-		return
-	}
-
-	// verify message
-	message := fmt.Sprintf("vsp v3 ticketstatus %d %s", ticketStatusRequest.Timestamp, ticketHashStr)
-	err = dcrutil.VerifyMessage(ticket.CommitmentAddress, signature, message, cfg.NetParams)
-	if err != nil {
-		log.Warnf("Invalid signature from %s", c.ClientIP())
-		sendErrorResponse("invalid signature", http.StatusBadRequest, c)
-		return
-	}
-
-	sendJSONResponse(ticketStatusResponse{
-		Timestamp: time.Now().Unix(),
-		Request:   ticketStatusRequest,
-		Status:    "active", // TODO - active, pending, expired (missed, revoked?)
-		VoteBits:  ticket.VoteBits,
-	}, c)
-}

webapi/payfee.go

@@ -0,0 +1,193 @@
+package webapi
+
+import (
+	"bytes"
+	"encoding/hex"
+	"net/http"
+	"time"
+
+	"decred.org/dcrwallet/wallet/txrules"
+	"github.com/decred/dcrd/chaincfg/chainhash"
+	"github.com/decred/dcrd/dcrec"
+	"github.com/decred/dcrd/dcrutil/v3"
+	dcrdtypes "github.com/decred/dcrd/rpc/jsonrpc/types/v2"
+	"github.com/decred/dcrd/txscript/v3"
+	"github.com/decred/dcrd/wire"
+	"github.com/gin-gonic/gin"
+)
+
+// payFee is the handler for "POST /payfee"
+func payFee(c *gin.Context) {
+	var payFeeRequest PayFeeRequest
+	if err := c.ShouldBindJSON(&payFeeRequest); err != nil {
+		log.Warnf("Bad payfee request from %s: %v", c.ClientIP(), err)
+		sendErrorResponse(err.Error(), http.StatusBadRequest, c)
+		return
+	}
+
+	votingKey := payFeeRequest.VotingKey
+	votingWIF, err := dcrutil.DecodeWIF(votingKey, cfg.NetParams.PrivateKeyID)
+	if err != nil {
+		log.Warnf("Failed to decode WIF: %v", err)
+		sendErrorResponse("error decoding WIF", http.StatusBadRequest, c)
+		return
+	}
+
+	voteBits := payFeeRequest.VoteBits
+	if !isValidVoteBits(cfg.NetParams, voteBits) {
+		log.Warnf("Invalid votebits from %s", c.ClientIP())
+		sendErrorResponse("invalid votebits", http.StatusBadRequest, c)
+		return
+	}
+
+	feeTxBytes, err := hex.DecodeString(payFeeRequest.FeeTx)
+	if err != nil {
+		log.Warnf("Failed to decode tx: %v", err)
+		sendErrorResponse("failed to decode transaction", http.StatusBadRequest, c)
+		return
+	}
+
+	feeTx := wire.NewMsgTx()
+	err = feeTx.FromBytes(feeTxBytes)
+	if err != nil {
+		log.Warnf("Failed to deserialize tx: %v", err)
+		sendErrorResponse("unable to deserialize transaction", http.StatusBadRequest, c)
+		return
+	}
+
+	// TODO: DB - check expiration given during fee address request
+
+	ticket, err := db.GetTicketByHash(payFeeRequest.TicketHash)
+	if err != nil {
+		log.Warnf("Invalid ticket from %s", c.ClientIP())
+		sendErrorResponse("invalid ticket", http.StatusBadRequest, c)
+		return
+	}
+	var feeAmount dcrutil.Amount
+	const scriptVersion = 0
+
+findAddress:
+	for _, txOut := range feeTx.TxOut {
+		_, addresses, _, err := txscript.ExtractPkScriptAddrs(scriptVersion,
+			txOut.PkScript, cfg.NetParams)
+		if err != nil {
+			log.Errorf("Extract PK error: %v", err)
+			sendErrorResponse("extract PK error", http.StatusInternalServerError, c)
+			return
+		}
+		for _, addr := range addresses {
+			if addr.Address() == ticket.FeeAddress {
+				feeAmount = dcrutil.Amount(txOut.Value)
+				break findAddress
+			}
+		}
+	}
+
+	if feeAmount == 0 {
+		log.Warnf("FeeTx for ticket %s did not include any payments for address %s", ticket.Hash, ticket.FeeAddress)
+		sendErrorResponse("feetx did not include any payments for fee address", http.StatusBadRequest, c)
+		return
+	}
+
+	voteAddr, err := dcrutil.DecodeAddress(ticket.CommitmentAddress, cfg.NetParams)
+	if err != nil {
+		log.Errorf("DecodeAddress: %v", err)
+		sendErrorResponse("database error", http.StatusInternalServerError, c)
+		return
+	}
+	_, err = dcrutil.NewAddressPubKeyHash(dcrutil.Hash160(votingWIF.PubKey()), cfg.NetParams,
+		dcrec.STEcdsaSecp256k1)
+	if err != nil {
+		log.Errorf("NewAddressPubKeyHash: %v", err)
+		sendErrorResponse("failed to deserialize voting wif", http.StatusInternalServerError, c)
+		return
+	}
+
+	// TODO: DB - validate votingkey against ticket submission address
+
+	sDiff := dcrutil.Amount(ticket.SDiff)
+
+	// TODO - RPC - get relayfee from wallet
+	relayFee, err := dcrutil.NewAmount(0.0001)
+	if err != nil {
+		log.Errorf("NewAmount failed: %v", err)
+		sendErrorResponse("failed to create new amount", http.StatusInternalServerError, c)
+		return
+	}
+
+	minFee := txrules.StakePoolTicketFee(sDiff, relayFee, int32(ticket.BlockHeight), cfg.VSPFee, cfg.NetParams)
+	if feeAmount < minFee {
+		log.Errorf("Fee too small: was %v, expected %v", feeAmount, minFee)
+		sendErrorResponse("fee too small", http.StatusInternalServerError, c)
+		return
+	}
+
+	// Get vote tx to give to wallet
+	ticketHash, err := chainhash.NewHashFromStr(ticket.Hash)
+	if err != nil {
+		log.Errorf("NewHashFromStr failed: %v", err)
+		sendErrorResponse("failed to create hash", http.StatusInternalServerError, c)
+		return
+	}
+
+	walletClient, err := walletRPC()
+	if err != nil {
+		log.Errorf("Failed to dial dcrwallet RPC: %v", err)
+		sendErrorResponse("dcrwallet RPC error", http.StatusInternalServerError, c)
+		return
+	}
+
+	ctx := c.Request.Context()
+	var rawTicket dcrdtypes.TxRawResult
+
+	err = walletClient.Call(ctx, "getrawtransaction", &rawTicket, ticketHash.String(), 1)
+	if err != nil {
+		log.Errorf("GetRawTransaction failed: %v", err)
+		sendErrorResponse("dcrwallet RPC error", http.StatusInternalServerError, c)
+		return
+	}
+
+	err = walletClient.Call(ctx, "addtransaction", nil, rawTicket.BlockHash, rawTicket.Hex)
+	if err != nil {
+		log.Errorf("AddTransaction failed: %v", err)
+		sendErrorResponse("dcrwallet RPC error", http.StatusInternalServerError, c)
+		return
+	}
+
+	err = walletClient.Call(ctx, "importprivkey", nil, votingWIF.String(), "imported", false, 0)
+	if err != nil {
+		log.Errorf("ImportPrivKey failed: %v", err)
+		sendErrorResponse("dcrwallet RPC error", http.StatusInternalServerError, c)
+		return
+	}
+
+	feeTxBuf := new(bytes.Buffer)
+	feeTxBuf.Grow(feeTx.SerializeSize())
+	err = feeTx.Serialize(feeTxBuf)
+	if err != nil {
+		log.Errorf("Serialize tx failed: %v", err)
+		sendErrorResponse("serialize tx error", http.StatusInternalServerError, c)
+		return
+	}
+
+	var sendTxHash string
+	err = walletClient.Call(ctx, "sendrawtransaction", &sendTxHash, hex.EncodeToString(feeTxBuf.Bytes()), false)
+	if err != nil {
+		log.Errorf("SendRawTransaction failed: %v", err)
+		sendErrorResponse("dcrwallet RPC error", http.StatusInternalServerError, c)
+		return
+	}
+
+	err = db.InsertFeeAddressVotingKey(voteAddr.Address(), votingWIF.String(), voteBits)
+	if err != nil {
+		log.Errorf("InsertFeeAddressVotingKey failed: %v", err)
+		sendErrorResponse("database error", http.StatusInternalServerError, c)
+		return
+	}
+
+	sendJSONResponse(payFeeResponse{
+		Timestamp: time.Now().Unix(),
+		TxHash:    sendTxHash,
+		Request:   payFeeRequest,
+	}, c)
+}

webapi/setvotebits.go

@@ -0,0 +1,80 @@
+package webapi
+
+import (
+	"encoding/base64"
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/decred/dcrd/chaincfg/chainhash"
+	"github.com/decred/dcrd/dcrutil/v3"
+	"github.com/gin-gonic/gin"
+)
+
+// setVoteBits is the handler for "POST /setvotebits"
+func setVoteBits(c *gin.Context) {
+	var setVoteBitsRequest SetVoteBitsRequest
+	if err := c.ShouldBindJSON(&setVoteBitsRequest); err != nil {
+		log.Warnf("Bad setvotebits request from %s: %v", c.ClientIP(), err)
+		sendErrorResponse(err.Error(), http.StatusBadRequest, c)
+		return
+	}
+
+	// ticketHash
+	ticketHashStr := setVoteBitsRequest.TicketHash
+	txHash, err := chainhash.NewHashFromStr(ticketHashStr)
+	if err != nil {
+		log.Warnf("Invalid ticket hash from %s", c.ClientIP())
+		sendErrorResponse("invalid ticket hash", http.StatusBadRequest, c)
+		return
+	}
+
+	// signature - sanity check signature is in base64 encoding
+	signature := setVoteBitsRequest.Signature
+	if _, err = base64.StdEncoding.DecodeString(signature); err != nil {
+		log.Warnf("Invalid signature from %s", c.ClientIP())
+		sendErrorResponse("invalid signature", http.StatusBadRequest, c)
+		return
+	}
+
+	// votebits
+	voteBits := setVoteBitsRequest.VoteBits
+	if !isValidVoteBits(cfg.NetParams, voteBits) {
+		log.Warnf("Invalid votebits from %s", c.ClientIP())
+		sendErrorResponse("invalid votebits", http.StatusBadRequest, c)
+		return
+	}
+
+	ticket, err := db.GetTicketByHash(txHash.String())
+	if err != nil {
+		log.Warnf("Invalid ticket from %s", c.ClientIP())
+		sendErrorResponse("invalid ticket", http.StatusBadRequest, c)
+		return
+	}
+
+	// verify message
+	message := fmt.Sprintf("vsp v3 setvotebits %d %s %d", setVoteBitsRequest.Timestamp, txHash, voteBits)
+	err = dcrutil.VerifyMessage(ticket.CommitmentAddress, signature, message, cfg.NetParams)
+	if err != nil {
+		log.Warnf("Failed to verify message from %s", c.ClientIP())
+		sendErrorResponse("message did not pass verification", http.StatusBadRequest, c)
+		return
+	}
+
+	err = db.UpdateVoteBits(txHash.String(), voteBits)
+	if err != nil {
+		log.Errorf("UpdateVoteBits error: %v", err)
+		sendErrorResponse("database error", http.StatusInternalServerError, c)
+		return
+	}
+
+	// TODO: DB - error if given timestamp is older than any previous requests
+
+	// TODO: DB - store setvotebits receipt in log
+
+	sendJSONResponse(setVoteBitsResponse{
+		Timestamp: time.Now().Unix(),
+		Request:   setVoteBitsRequest,
+		VoteBits:  voteBits,
+	}, c)
+}

webapi/status.go

@@ -0,0 +1,23 @@
+package webapi
+
+import (
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+// pubKey is the handler for "GET /pubkey"
+func pubKey(c *gin.Context) {
+	sendJSONResponse(pubKeyResponse{
+		Timestamp: time.Now().Unix(),
+		PubKey:    cfg.PubKey,
+	}, c)
+}
+
+// fee is the handler for "GET /fee"
+func fee(c *gin.Context) {
+	sendJSONResponse(feeResponse{
+		Timestamp: time.Now().Unix(),
+		Fee:       cfg.VSPFee,
+	}, c)
+}

webapi/ticketstatus.go

@@ -0,0 +1,62 @@
+package webapi
+
+import (
+	"encoding/base64"
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/decred/dcrd/chaincfg/chainhash"
+	"github.com/decred/dcrd/dcrutil/v3"
+	"github.com/gin-gonic/gin"
+)
+
+// ticketStatus is the handler for "GET /ticketstatus"
+func ticketStatus(c *gin.Context) {
+	var ticketStatusRequest TicketStatusRequest
+	if err := c.ShouldBindJSON(&ticketStatusRequest); err != nil {
+		log.Warnf("Bad ticketstatus request from %s: %v", c.ClientIP(), err)
+		sendErrorResponse(err.Error(), http.StatusBadRequest, c)
+		return
+	}
+
+	// ticketHash
+	ticketHashStr := ticketStatusRequest.TicketHash
+	_, err := chainhash.NewHashFromStr(ticketHashStr)
+	if err != nil {
+		log.Warnf("Invalid ticket hash from %s", c.ClientIP())
+		sendErrorResponse("invalid ticket hash", http.StatusBadRequest, c)
+		return
+	}
+
+	// signature - sanity check signature is in base64 encoding
+	signature := ticketStatusRequest.Signature
+	if _, err = base64.StdEncoding.DecodeString(signature); err != nil {
+		log.Warnf("Invalid signature from %s", c.ClientIP())
+		sendErrorResponse("invalid signature", http.StatusBadRequest, c)
+		return
+	}
+
+	ticket, err := db.GetTicketByHash(ticketHashStr)
+	if err != nil {
+		log.Warnf("Invalid ticket from %s", c.ClientIP())
+		sendErrorResponse("invalid ticket", http.StatusBadRequest, c)
+		return
+	}
+
+	// verify message
+	message := fmt.Sprintf("vsp v3 ticketstatus %d %s", ticketStatusRequest.Timestamp, ticketHashStr)
+	err = dcrutil.VerifyMessage(ticket.CommitmentAddress, signature, message, cfg.NetParams)
+	if err != nil {
+		log.Warnf("Invalid signature from %s", c.ClientIP())
+		sendErrorResponse("invalid signature", http.StatusBadRequest, c)
+		return
+	}
+
+	sendJSONResponse(ticketStatusResponse{
+		Timestamp: time.Now().Unix(),
+		Request:   ticketStatusRequest,
+		Status:    "active", // TODO - active, pending, expired (missed, revoked?)
+		VoteBits:  ticket.VoteBits,
+	}, c)
+}

webapi/webapi.go

@@ -3,6 +3,8 @@ package webapi
 import (
 	"context"
 	"crypto/ed25519"
+	"encoding/hex"
+	"encoding/json"
 	"net"
 	"net/http"
 	"sync"
@@ -16,11 +18,12 @@ import (
 )
 
 type Config struct {
-	SignKey        ed25519.PrivateKey
-	PubKey         ed25519.PublicKey
-	VSPFee         float64
-	NetParams      *chaincfg.Params
-	FeeAccountName string
+	SignKey              ed25519.PrivateKey
+	PubKey               ed25519.PublicKey
+	VSPFee               float64
+	NetParams            *chaincfg.Params
+	FeeAccountName       string
+	FeeAddressExpiration time.Duration
 }
 
 var cfg Config
@@ -114,7 +117,7 @@ func router(debugMode bool) *gin.Engine {
 		api.GET("/pubkey", pubKey)
 		api.POST("/payfee", payFee)
 		api.POST("/setvotebits", setVoteBits)
-		api.POST("/ticketstatus", ticketStatus)
+		api.GET("/ticketstatus", ticketStatus)
 	}
 
 	return router
@@ -125,3 +128,21 @@ func homepage(c *gin.Context) {
 		"Message": "Welcome to dcrvsp!",
 	})
 }
+
+func sendJSONResponse(resp interface{}, c *gin.Context) {
+	dec, err := json.Marshal(resp)
+	if err != nil {
+		log.Errorf("JSON marshal error: %v", err)
+		sendErrorResponse("failed to marshal json", http.StatusInternalServerError, c)
+		return
+	}
+
+	sig := ed25519.Sign(cfg.SignKey, dec)
+	c.Writer.Header().Set("VSP-Signature", hex.EncodeToString(sig))
+
+	c.JSON(http.StatusOK, resp)
+}
+
+func sendErrorResponse(errMsg string, code int, c *gin.Context) {
+	c.JSON(code, gin.H{"error": errMsg})
+}