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

Additional sanity (#10)

Browse Source 
* Add expiration field

VSPs may wish to change their poolFees.  We must honor the poolfee
given in the feeaddress request, but only for a certain amount of time.

* VSP must also sign voteBits as a guarantee

* add timestamps and full requests to the responses
This commit is contained in:
David Hill 2020-05-15 02:49:34 -05:00 committed by GitHub
parent c371f1983b
commit 6b6655cfed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
methods.go
View File

@ -24,6 +24,10 @@ import (
"github.com/gin-gonic/gin"
)
const (
defaultFeeAddressExpiration = 24 * time.Hour
)
func sendJSONResponse(resp interface{}, code int, c *gin.Context) {
dec, err := json.Marshal(resp)
if err != nil {
@ -54,11 +58,6 @@ func fee(c *gin.Context) {
}
func feeAddress(c *gin.Context) {
// HTTP GET Params required
// ticketHash - hash of ticket
// signature - signmessage signature using the ticket commitment address
// - message = "vsp v3 getfeeaddress ticketHash"
dec := json.NewDecoder(c.Request.Body)
var feeAddressRequest FeeAddressRequest
@ -87,8 +86,8 @@ func feeAddress(c *gin.Context) {
return
}
// check DB for cached response
// TODO: check db
// TODO: check db for cache response - if expired, reset expiration, but still
// use same feeaddress
ctx := c.Request.Context()
@ -168,20 +167,16 @@ func feeAddress(c *gin.Context) {
// TODO: Insert into DB
_ = sDiff
now := time.Now()
sendJSONResponse(feeAddressResponse{
Timestamp: time.Now().Unix(),
TicketHash: txHash.String(),
CommitmentSignature: signature,
FeeAddress: newAddress,
Timestamp: now.Unix(),
Request: feeAddressRequest,
FeeAddress: newAddress,
Expiration: now.Add(defaultFeeAddressExpiration).Unix(),
}, http.StatusOK, c)
}
func payFee(c *gin.Context) {
// HTTP GET Params required
// feeTx - serialized wire.MsgTx
// votingKey - WIF private key for ticket stakesubmission address
// voteBits - voting preferences in little endian
dec := json.NewDecoder(c.Request.Body)
var payFeeRequest PayFeeRequest
@ -197,6 +192,7 @@ func payFee(c *gin.Context) {
c.AbortWithError(http.StatusInternalServerError, err)
return
}
voteBits := payFeeRequest.VoteBits
feeTx := wire.NewMsgTx()
@ -206,6 +202,8 @@ func payFee(c *gin.Context) {
return
}
// TODO: DB - check expiration given during fee address request
validFeeAddrs, err := db.GetInactiveFeeAddresses()
if err != nil {
log.Fatalf("database error: %v", err)
@ -262,10 +260,12 @@ findAddress:
c.AbortWithError(http.StatusInternalServerError, errors.New("failed to deserialize voting wif"))
return
}
// TODO: validate votingkey against ticket submission address
// TODO: DB - validate votingkey against ticket submission address
sDiff := dcrutil.Amount(feeEntry.SDiff)
// TODO - wallet relayfee
// TODO - RPC - get relayfee from wallet
relayFee, err := dcrutil.NewAmount(0.0001)
if err != nil {
fmt.Printf("PayFee: failed to NewAmount: %v", err)
@ -306,6 +306,7 @@ findAddress:
sendJSONResponse(payFeeResponse{
Timestamp: now.Unix(),
TxHash: resp,
Request: payFeeRequest,
}, http.StatusOK, c)
}

16
responses.go
View File

@ -11,24 +11,28 @@ type feeResponse struct {
}
type FeeAddressRequest struct {
Timestamp int64 `json:"timestamp"`
TicketHash string `json:"ticketHash"`
Signature string `json:"signature"`
}
type feeAddressResponse struct {
Timestamp int64 `json:"timestamp"`
TicketHash string `json:"ticketHash"`
CommitmentSignature string `json:"commitmentSignature"`
FeeAddress string `json:"feeAddress"`
Timestamp int64 `json:"timestamp"`
FeeAddress string `json:"feeAddress"`
Fee float64 `json:"fee"`
Expiration int64 `json:"expiration"`
Request FeeAddressRequest `json:"request"`
}
type PayFeeRequest struct {
Timestamp int64 `json:"timestamp"`
Hex []byte `json:"feeTx"`
VotingKey string `json:"votingKey"`
VoteBits uint16 `json:"voteBits"`
}
type payFeeResponse struct {
Timestamp int64 `json:"timestamp"`
TxHash string `json:"txHash"`
Timestamp int64 `json:"timestamp"`
TxHash string `json:"txHash"`
Request PayFeeRequest `json:"request"`
}