Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Return VSP errors from purchase tickets and Sync failed vsp tickets #2010

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Return VSP errors from purchase tickets and Sync failed vsp tickets #2010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c68463
Return VSP errors from purchase tickets
alexlyp Feb 25, 2021
dda2ff6
just use string
alexlyp Feb 25, 2021
8226757
Do the same error handling for SyncFailed
alexlyp Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 12 additions & 2 deletions internal/rpc/rpcserver/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3764,6 +3764,7 @@ func (s *walletServer) GetVSPTicketsByFeeStatus(ctx context.Context, req *pb.Get

func (s *walletServer) SyncVSPFailedTickets(ctx context.Context, req *pb.SyncVSPTicketsRequest) (
*pb.SyncVSPTicketsResponse, error) {
var err error
failedTicketsFee, err := s.wallet.GetVSPTicketsByFeeStatus(ctx, int(udb.VSPFeeProcessErrored))
if err != nil {
return nil, err
Expand All @@ -3790,20 +3791,29 @@ func (s *walletServer) SyncVSPFailedTickets(ctx context.Context, req *pb.SyncVSP
}
vspClient, err := getVSP(cfg)
if err != nil {
return nil, status.Errorf(codes.Unknown, "TicketBuyerV3 instance failed to start. Error: %v", err)
return nil, status.Errorf(codes.Unknown, "vsp client instance failed to start. Error: %v", err)
}

// process tickets fee if needed.
feeErrors := ""
for _, ticketHash := range failedTicketsFee {
feeTx := new(wire.MsgTx)
err := vspClient.Process(ctx, &ticketHash, feeTx)
if err != nil {
if feeErrors == "" {
feeErrors = err.Error()
} else {
feeErrors += ", " + err.Error()
}
// if it fails to process again, we log it and continue with
// the wallet start.
// Not sure we need to log here since it's already warned elsewhere
}
}
return &pb.SyncVSPTicketsResponse{}, nil
if feeErrors != "" {
err = status.Errorf(codes.Unknown, feeErrors)
}
return &pb.SyncVSPTicketsResponse{}, err
}

func (s *walletServer) ProcessManagedTickets(ctx context.Context, req *pb.ProcessManagedTicketsRequest) (
Expand Down
15 changes: 13 additions & 2 deletions wallet/createtx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"crypto/rand"
"crypto/tls"
"encoding/binary"
"fmt"
"net"
"sort"
"time"
Expand Down Expand Up @@ -1741,6 +1742,7 @@ func (w *Wallet) purchaseTickets(ctx context.Context, op errors.Op,

if !req.DontSignTx && req.VSPFeePaymentProcess != nil {
unlockCredits = false
feeErrors := ""
for i, ticketHash := range purchaseTicketsResponse.TicketHashes {
// set vsp fee as processing, so we can know it started to be
// processed.
Expand All @@ -1760,7 +1762,14 @@ func (w *Wallet) purchaseTickets(ctx context.Context, op errors.Op,

err = req.VSPFeePaymentProcess(ctx, ticketHash, feeTx)
if err != nil {
log.Errorf("vsp ticket %v fee proccessment failed: %v", ticketHash, err)
feeError := fmt.Sprintf("vsp ticket %v fee proccessment failed: %v", ticketHash, err)
if feeErrors == "" {
feeErrors = feeError
} else {
feeErrors += ", " + feeError
}
log.Error(feeError)

rec.FeeTxStatus = uint32(udb.VSPFeeProcessErrored)
err = w.UpdateVSPTicket(ctx, ticketHash, rec)
if err != nil {
Expand All @@ -1778,8 +1787,10 @@ func (w *Wallet) purchaseTickets(ctx context.Context, op errors.Op,
return nil, err
}
}
if feeErrors != "" {
err = errors.E(op, errors.Other, feeErrors)
}
}

return purchaseTicketsResponse, err
}

Expand Down