From a3cec7e036134cd4c0bc426e1f3777eb6c7a97e3 Mon Sep 17 00:00:00 2001 From: Wilmer Paulino Date: Thu, 9 Aug 2018 19:44:25 -0700 Subject: [PATCH] rpcserver: set minConfs field in openChanReq --- rpcserver.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/rpcserver.go b/rpcserver.go index 6f4e8e6c4..bcee345ab 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -770,6 +770,12 @@ func (r *rpcServer) OpenChannel(in *lnrpc.OpenChannelRequest, "size is: %v SAT", int64(minChanFundingSize)) } + // Ensure that the MinConfs parameter is non-negative. + if in.MinConfs < 0 { + return errors.New("minimum number of confirmations must be a " + + "non-negative number") + } + var ( nodePubKey *btcec.PublicKey nodePubKeyBytes []byte @@ -822,6 +828,7 @@ func (r *rpcServer) OpenChannel(in *lnrpc.OpenChannelRequest, fundingFeePerKw: feeRate, private: in.Private, remoteCsvDelay: remoteCsvDelay, + minConfs: in.MinConfs, } updateChan, errChan := r.server.OpenChannel(req) @@ -936,6 +943,12 @@ func (r *rpcServer) OpenChannelSync(ctx context.Context, "size is: %v SAT", int64(minChanFundingSize)) } + // Ensure that the MinConfs parameter is non-negative. + if in.MinConfs < 0 { + return nil, errors.New("minimum number of confirmations must " + + "be a non-negative number") + } + // Based on the passed fee related parameters, we'll determine an // appropriate fee rate for the funding transaction. feeRate, err := determineFeePerKw( @@ -957,6 +970,7 @@ func (r *rpcServer) OpenChannelSync(ctx context.Context, fundingFeePerKw: feeRate, private: in.Private, remoteCsvDelay: remoteCsvDelay, + minConfs: in.MinConfs, } updateChan, errChan := r.server.OpenChannel(req)