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.

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

rpc: Add ProcessManaged and ProcessUnmanagedTicket requests #1958

Merged
merged 1 commit into from
Jan 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 83 additions & 2 deletions internal/rpc/rpcserver/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ import (

// Public API version constants
const (
semverString = "7.6.0"
semverString = "7.7.0"
semverMajor = 7
semverMinor = 6
semverMinor = 7
semverPatch = 0
)

Expand Down Expand Up @@ -3788,3 +3788,84 @@ func (s *walletServer) SyncVSPFailedTickets(ctx context.Context, req *pb.SyncVSP
}
return &pb.SyncVSPTicketsResponse{}, nil
}

func (s *walletServer) ProcessManagedTickets(ctx context.Context, req *pb.ProcessManagedTicketsRequest) (
*pb.ProcessManagedTicketsResponse, error) {

vspHost := req.VspHost
vspPubKey := req.VspPubkey
if vspPubKey == "" {
return nil, status.Errorf(codes.InvalidArgument, "vsp pubkey can not be null")
}
if vspHost == "" {
return nil, status.Errorf(codes.InvalidArgument, "vsp host can not be null")
}
policy := vsp.Policy{
MaxFee: 0.1e8,
FeeAcct: req.FeeAccount,
ChangeAcct: req.ChangeAccount,
}
cfg := vsp.Config{
URL: vspHost,
PubKey: vspPubKey,
Dialer: nil,
Wallet: s.wallet,
Policy: policy,
}
vspClient, err := getVSP(cfg)
if err != nil {
return nil, status.Errorf(codes.Unknown, "VSPClient instance failed to start. Error: %v", err)
}

err = vspClient.ProcessManagedTickets(ctx, policy)
if err != nil {
return nil, status.Errorf(codes.Unknown, "ProcessManagedTickets failed. Error: %v", err)
}

return &pb.ProcessManagedTicketsResponse{}, nil
}

func (s *walletServer) ProcessUnmanagedTickets(ctx context.Context, req *pb.ProcessUnmanagedTicketsRequest) (
*pb.ProcessUnmanagedTicketsResponse, error) {

vspHost := req.VspHost
vspPubKey := req.VspPubkey
if vspPubKey == "" {
return nil, status.Errorf(codes.InvalidArgument, "vsp pubkey can not be null")
}
if vspHost == "" {
return nil, status.Errorf(codes.InvalidArgument, "vsp host can not be null")
}
policy := vsp.Policy{
MaxFee: 0.1e8,
FeeAcct: req.FeeAccount,
ChangeAcct: req.ChangeAccount,
}
cfg := vsp.Config{
URL: vspHost,
PubKey: vspPubKey,
Dialer: nil,
Wallet: s.wallet,
Policy: policy,
}
vspClient, err := getVSP(cfg)
if err != nil {
return nil, status.Errorf(codes.Unknown, "VSPClient instance failed to start. Error: %v", err)
}

errUnmanagedTickets := errors.New("unmanaged tickets")
err = vspClient.ForUnspentUnexpiredTickets(ctx, func(hash *chainhash.Hash) error {
_, err := s.wallet.VSPFeeHashForTicket(ctx, hash)
if errors.Is(err, errors.NotExist) {
return errUnmanagedTickets
}
return nil
})
if errors.Is(err, errUnmanagedTickets) && s.wallet.Locked() {
return nil, status.Errorf(codes.Unknown, "Wallet must be unlocked for ProcessUnprocessedTickets %v", err)
} else if errors.Is(err, errUnmanagedTickets) {
vspClient.ProcessUnprocessedTickets(ctx, policy)
}

return &pb.ProcessUnmanagedTicketsResponse{}, nil
}
20 changes: 20 additions & 0 deletions rpc/api.proto
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ service WalletService {
rpc LockWallet (LockWalletRequest) returns (LockWalletResponse);
rpc SyncVSPFailedTickets(SyncVSPTicketsRequest) returns (SyncVSPTicketsResponse);
rpc GetVSPTicketsByFeeStatus (GetVSPTicketsByFeeStatusRequest) returns (GetVSPTicketsByFeeStatusResponse);
rpc ProcessManagedTickets (ProcessManagedTicketsRequest) returns (ProcessManagedTicketsResponse);
rpc ProcessUnmanagedTickets (ProcessUnmanagedTicketsRequest) returns (ProcessUnmanagedTicketsResponse);
}

service WalletLoaderService {
Expand Down Expand Up @@ -1272,3 +1274,21 @@ message GetVSPTicketsByFeeStatusRequest {
message GetVSPTicketsByFeeStatusResponse {
repeated bytes tickets_hashes = 1;
}

message ProcessManagedTicketsRequest {
string vsp_host = 1;
string vsp_pubkey = 2;
uint32 fee_account = 3;
uint32 change_account = 4;
}

message ProcessManagedTicketsResponse {}

message ProcessUnmanagedTicketsRequest {
string vsp_host = 1;
string vsp_pubkey = 2;
uint32 fee_account = 3;
uint32 change_account = 4;
}

message ProcessUnmanagedTicketsResponse {}
Loading