Fix Insufficient Balance to Pay Ticket Fee #189
Conversation
oshorefueled
force-pushed
the
ticket-fee
branch
2 times, most recently
from
e317ae3
to
cc06ea6
Compare
vsp.go
Outdated
| c *w.ConfirmationNotificationsClient | ||
|
|
||
| ticketToFeeLock sync.Mutex | ||
| feesToTickets map[chainhash.Hash]chainhash.Hash |
There was a problem hiding this comment.
This variable is unused, can be removed.
vsp.go
Outdated
| "github.com/planetdecred/dcrlibwallet/vsp" | ||
|
|
||
| "decred.org/dcrwallet/wallet/txrules" | ||
|
|
||
| w "decred.org/dcrwallet/wallet" | ||
| "decred.org/dcrwallet/wallet/txsizes" |
vsp.go
Outdated
| func (r *lockedRand) coinflip() bool { | ||
| r.mu.Lock() | ||
| defer r.mu.Unlock() | ||
| return r.rand.Uint32n(2) == 0 |
There was a problem hiding this comment.
Lets remove the added prng.go file and use the random generator through wallet/txauthor/cprng.go to reduce added files
https://github.com/decred/dcrwallet/blob/master/wallet/txauthor/cprng.go#L32
Here's how it's used to randomize output position
https://github.com/decred/dcrwallet/blob/master/wallet/txauthor/author.go#L169
types.go
Outdated
| Timestamp int64 `json:"timestamp"` | ||
| Request json.RawMessage `json:"request"` | ||
| Timestamp int64 `json:"timestamp"` | ||
| Request []byte `json:"request"` | ||
| } | ||
|
|
||
| type TicketStatusRequest struct { |
There was a problem hiding this comment.
Remove unused structs.
- TicketStatusRequest
- TicketStatusResponse
- SetVoteChoicesRequest
- SetVoteChoicesResponse
- GetFeeAddressRequest
- GetFeeAddressResponse
vsp.go
Outdated
|
|
||
| *vsp.Client | ||
| ctx context.Context | ||
| c *w.ConfirmationNotificationsClient |
There was a problem hiding this comment.
This variable is not used, remove this & other unused variables in this struct.
vsp.go
Outdated
| passphraseCopy := make([]byte, len(passphrase)) | ||
| _ = copy(passphraseCopy, passphrase) |
vsp.go
Outdated
|
|
||
| // PurchaseStakeTickets purchases the number of tickets passed as an argument and pays the fees for the tickets | ||
| func (v *VSP) PurchaseTickets(ticketCount, expiryBlocks int32, passphrase []byte) error { | ||
| defer v.w.LockWallet() |
There was a problem hiding this comment.
Move this to after successfully unlocking the wallet.
vsp.go
Outdated
|
|
||
| _, err = v.w.internal.PurchaseTickets(v.ctx, networkBackend, request) | ||
| if err != nil { | ||
| log.Errorf("PURCHASE TICKET %v", err.Error()) |
There was a problem hiding this comment.
This log is not needed since the error is returned, to avoid spamming the logs.
vsp.go
Outdated
|
|
||
| // verify initial request matches server | ||
| if !bytes.Equal(requestBody, payfeeResponse.Request) { | ||
| log.Warnf("[PAYFee] server response has differing request: %#v != %#v", |
There was a problem hiding this comment.
I'm not sure if this should be considered spam log. There are a number of places where requests are made to the vsp server and they return this error. Logging it with the differences would make it easier to debug and fix. The error message returned "server response contains differing request" is a user friendly message that could easily be used by the caller of the method.
There was a problem hiding this comment.
Yeah but the log is not readable and not necessarily needed unless in development. If the content of the request is needed then it can be added to the returned error.
vsp.go
Outdated
|
|
||
| // verify initial request matches server | ||
| if !bytes.Equal(requestBody, payfeeResponse.Request) { | ||
| log.Warnf("[PAYFee] server response has differing request: %#v != %#v", |
There was a problem hiding this comment.
Yeah but the log is not readable and not necessarily needed unless in development. If the content of the request is needed then it can be added to the returned error.
vsp.go
Outdated
| log.Warnf("failed to generate pay to addr script for %v: %v", feeInfo.FeeAddress, err) | ||
| return err |
There was a problem hiding this comment.
| log.Warnf("failed to generate pay to addr script for %v: %v", feeInfo.FeeAddress, err) | |
| return err | |
| return errors.Errorf("failed to generate pay to addr script for %v: %v", feeInfo.FeeAddress, err) |
Also, make this change in other similar places.
methods required to pay tickets fees to a VSPD are made private and called from a single exported method. wallet unlocking is removed from createTicketFeeTx and payVSPFee methods and called only once before the methods are called.
- the issue with insufficient balance when trying to pay fees for tickets has been fixed on the ticketbuyer feature on dcrwallet. Fee payment methods used by dcrwallet are replicated and integrated into dcrlibwallet
- update fee processing method to requirements defined on dcrwallet 1.6.0
- remove unused struct field and type declarations - Replace prng code with exising output randomization method from the txauthor package. - remove spam logs from code
This PR resolves issue #176
It adds some of the methods used in dcrwallet vsp package to reserve some inputs for paying for fees after puchasing a ticket. It adds a vsp package which consists of some helper functions and client code for making requests to the vsp server