akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5200 from champo/send_all_min_confs

Browse Source 
sweep,rpc: honor minConfs paramater when SendAll is set
This commit is contained in:
Olaoluwa Osuntokun 2021-06-18 14:08:45 -07:00 committed by GitHub
commit da94cbf1ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcserver.go
View File

@ -1207,6 +1207,7 @@ func (r *rpcServer) SendCoins(ctx context.Context,
uint32(bestHeight), nil, targetAddr, wallet, uint32(bestHeight), nil, targetAddr, wallet,
wallet, wallet.WalletController, wallet, wallet.WalletController,
r.server.cc.FeeEstimator, r.server.cc.Signer, r.server.cc.FeeEstimator, r.server.cc.Signer,
minConfs,
) )
if err != nil { if err != nil {
return nil, err return nil, err
@ -1259,6 +1260,7 @@ func (r *rpcServer) SendCoins(ctx context.Context,
uint32(bestHeight), outputs, targetAddr, wallet, uint32(bestHeight), outputs, targetAddr, wallet,
wallet, wallet.WalletController, wallet, wallet.WalletController,
r.server.cc.FeeEstimator, r.server.cc.Signer, r.server.cc.FeeEstimator, r.server.cc.Signer,
minConfs,
) )
if err != nil { if err != nil {
return nil, err return nil, err

4
sweep/walletsweep.go
View File

@ -169,7 +169,7 @@ func CraftSweepAllTx(feeRate chainfee.SatPerKWeight, dustLimit btcutil.Amount,
blockHeight uint32, deliveryAddrs []DeliveryAddr, changeAddr btcutil.Address, blockHeight uint32, deliveryAddrs []DeliveryAddr, changeAddr btcutil.Address,
coinSelectLocker CoinSelectionLocker, utxoSource UtxoSource, coinSelectLocker CoinSelectionLocker, utxoSource UtxoSource,
outpointLocker OutpointLocker, feeEstimator chainfee.Estimator, outpointLocker OutpointLocker, feeEstimator chainfee.Estimator,
signer input.Signer) (*WalletSweepPackage, error) { signer input.Signer, minConfs int32) (*WalletSweepPackage, error) {
// TODO(roasbeef): turn off ATPL as well when available? // TODO(roasbeef): turn off ATPL as well when available?
@ -194,7 +194,7 @@ func CraftSweepAllTx(feeRate chainfee.SatPerKWeight, dustLimit btcutil.Amount,
// operations are going on, we can grab a clean snapshot of the // operations are going on, we can grab a clean snapshot of the
// current UTXO state of the wallet. // current UTXO state of the wallet.
utxos, err := utxoSource.ListUnspentWitnessFromDefaultAccount( utxos, err := utxoSource.ListUnspentWitnessFromDefaultAccount(
1, math.MaxInt32, minConfs, math.MaxInt32,
) )
if err != nil { if err != nil {
return err return err

6
sweep/walletsweep_test.go
View File

@ -289,7 +289,7 @@ func TestCraftSweepAllTxCoinSelectFail(t *testing.T) {
_, err := CraftSweepAllTx( _, err := CraftSweepAllTx(
0, 100, 10, nil, nil, coinSelectLocker, utxoSource, 0, 100, 10, nil, nil, coinSelectLocker, utxoSource,
utxoLocker, nil, nil, utxoLocker, nil, nil, 0,
) )
// Since we instructed the coin select locker to fail above, we should // Since we instructed the coin select locker to fail above, we should
@ -315,7 +315,7 @@ func TestCraftSweepAllTxUnknownWitnessType(t *testing.T) {
_, err := CraftSweepAllTx( _, err := CraftSweepAllTx(
0, 100, 10, nil, nil, coinSelectLocker, utxoSource, 0, 100, 10, nil, nil, coinSelectLocker, utxoSource,
utxoLocker, nil, nil, utxoLocker, nil, nil, 0,
) )
// Since passed in a p2wsh output, which is unknown, we should fail to // Since passed in a p2wsh output, which is unknown, we should fail to
@ -350,7 +350,7 @@ func TestCraftSweepAllTx(t *testing.T) {
sweepPkg, err := CraftSweepAllTx( sweepPkg, err := CraftSweepAllTx(
0, 100, 10, nil, deliveryAddr, coinSelectLocker, utxoSource, 0, 100, 10, nil, deliveryAddr, coinSelectLocker, utxoSource,
utxoLocker, feeEstimator, signer, utxoLocker, feeEstimator, signer, 0,
) )
if err != nil { if err != nil {
t.Fatalf("unable to make sweep tx: %v", err) t.Fatalf("unable to make sweep tx: %v", err)