mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2024-11-19 01:43:16 +01:00
Code Issues Projects Releases Wiki Activity

rpcserver: include fee calc. for psbt flow.

Browse Source 
Include the fee calculaltion for the psbt flow. Moreover include
fee rate testing in the itest environment.
This commit is contained in:
ziggie 2024-07-24 14:51:13 +02:00
parent 6f37db3a92
commit d0a7765c68
No known key found for this signature in database
GPG Key ID: 1AFF9C4DCED6D666
2 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
itest/lnd_funding_test.go
View File

@ -19,6 +19,7 @@ import (
"github.com/lightningnetwork/lnd/lnrpc/signrpc"
"github.com/lightningnetwork/lnd/lntest"
"github.com/lightningnetwork/lnd/lntest/node"
"github.com/lightningnetwork/lnd/lnwallet/chainfee"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/stretchr/testify/require"
)
@ -968,10 +969,15 @@ func testBatchChanFunding(ht *lntest.HarnessTest) {
ht.EnsureConnected(alice, dave)
ht.EnsureConnected(alice, eve)
expectedFeeRate := chainfee.SatPerKWeight(2500)
// We verify that the channel opening uses the correct fee rate.
ht.SetFeeEstimateWithConf(expectedFeeRate, 3)
// Let's create our batch TX request. This first one should fail as we
// open a channel to Carol that is too small for her min chan size.
batchReq := &lnrpc.BatchOpenChannelRequest{
SatPerVbyte: 12,
TargetConf: 3,
MinConfs: 1,
Channels: []*lnrpc.BatchOpenChannel{{
NodePubkey: bob.PubKey[:],
@ -1069,6 +1075,12 @@ func testBatchChanFunding(ht *lntest.HarnessTest) {
rawTx := ht.GetRawTransaction(txHash)
require.Len(ht, rawTx.MsgTx().TxOut, 5)
// Check the fee rate of the batch-opening transaction. We expect slight
// inaccuracies because of the DER signature fee estimation.
openingFeeRate := ht.CalculateTxFeeRate(rawTx.MsgTx())
require.InEpsilonf(ht, uint64(expectedFeeRate), uint64(openingFeeRate),
0.01, "want %v, got %v", expectedFeeRate, openingFeeRate)
// For calculating the change output index we use the formula for the
// sum of consecutive of integers (n(n+1)/2). All the channel point
// indexes are known, so we just calculate the difference to get the

12
rpcserver.go
View File

@ -2158,19 +2158,14 @@ func (r *rpcServer) parseOpenChannelReq(in *lnrpc.OpenChannelRequest,
return nil, fmt.Errorf("cannot open channel to self")
}
var feeRate chainfee.SatPerKWeight
// Skip estimating fee rate for PSBT funding.
if in.FundingShim == nil || in.FundingShim.GetPsbtShim() == nil {
// Keep the old behavior prior to 0.18.0 - when the user
// doesn't set fee rate or conf target, the default conf target
// of 6 is used.
// NOTE: We also need to do the fee rate calculation for the psbt
// funding flow because the `batchfund` depends on it.
targetConf := maybeUseDefaultConf(
in.SatPerByte, in.SatPerVbyte, uint32(in.TargetConf),
)
// Calculate an appropriate fee rate for this transaction.
feeRate, err = lnrpc.CalculateFeeRate(
feeRate, err := lnrpc.CalculateFeeRate(
uint64(in.SatPerByte), in.SatPerVbyte,
targetConf, r.server.cc.FeeEstimator,
)
@ -2180,7 +2175,6 @@ func (r *rpcServer) parseOpenChannelReq(in *lnrpc.OpenChannelRequest,
rpcsLog.Debugf("[openchannel]: using fee of %v sat/kw for "+
"funding tx", int64(feeRate))
}
script, err := chancloser.ParseUpfrontShutdownAddress(
in.CloseAddress, r.cfg.ActiveNetParams.Params,