Archives/loop
2
0
Fork 0
mirror of https://github.com/lightninglabs/loop synced 2024-11-09 19:10:47 +00:00
Code Issues Releases Wiki Activity

sweepbatcher: factor out method createPsbt

Browse Source 
Unload method publishBatchCoop. Also this code will be reused in new method
for mixed batches soon.
This commit is contained in:
Boris Nagaev 2024-07-11 00:30:01 -03:00
parent 5cd6c0c83c
commit 2c2c427a6d
No known key found for this signature in database
1 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
sweepbatcher/sweep_batch.go
View File

@ -922,6 +922,47 @@ func (b *batch) publishBatch(ctx context.Context) (btcutil.Amount, error) {
return fee, nil return fee, nil
} }
// createPsbt creates serialized PSBT and prevOuts map from unsignedTx and
// the list of sweeps.
func (b *batch) createPsbt(unsignedTx *wire.MsgTx, sweeps []sweep) ([]byte,
map[wire.OutPoint]*wire.TxOut, error) {
// Create PSBT packet object.
packet, err := psbt.NewFromUnsignedTx(unsignedTx)
if err != nil {
return nil, nil, fmt.Errorf("failed to create PSBT: %w", err)
}
// Sanity check: the number of inputs in PSBT must be equal to the
// number of sweeps.
if len(packet.Inputs) != len(sweeps) {
return nil, nil, fmt.Errorf("invalid number of packet inputs")
}
// Create prevOuts map.
prevOuts := make(map[wire.OutPoint]*wire.TxOut, len(sweeps))
// Fill input info in PSBT and prevOuts.
for i, sweep := range sweeps {
txOut := &wire.TxOut{
Value: int64(sweep.value),
PkScript: sweep.htlc.PkScript,
}
prevOuts[sweep.outpoint] = txOut
packet.Inputs[i].WitnessUtxo = txOut
}
// Serialize PSBT.
var psbtBuf bytes.Buffer
err = packet.Serialize(&psbtBuf)
if err != nil {
return nil, nil, fmt.Errorf("failed to serialize PSBT: %w", err)
}
return psbtBuf.Bytes(), prevOuts, nil
}
// publishBatchCoop attempts to construct and publish a batch transaction that // publishBatchCoop attempts to construct and publish a batch transaction that
// collects all the required signatures interactively from the server. This // collects all the required signatures interactively from the server. This
// helps with collecting the funds immediately without revealing any information // helps with collecting the funds immediately without revealing any information
@ -1013,36 +1054,15 @@ func (b *batch) publishBatchCoop(ctx context.Context) (btcutil.Amount,
Value: int64(batchAmt - fee), Value: int64(batchAmt - fee),
}) })
packet, err := psbt.NewFromUnsignedTx(batchTx) // Create PSBT and prevOuts.
if err != nil { psbtBytes, prevOuts, err := b.createPsbt(batchTx, sweeps)
return fee, err, false
}
if len(packet.Inputs) != len(sweeps) {
return fee, fmt.Errorf("invalid number of packet inputs"), false
}
prevOuts := make(map[wire.OutPoint]*wire.TxOut)
for i, sweep := range sweeps {
txOut := &wire.TxOut{
Value: int64(sweep.value),
PkScript: sweep.htlc.PkScript,
}
prevOuts[sweep.outpoint] = txOut
packet.Inputs[i].WitnessUtxo = txOut
}
var psbtBuf bytes.Buffer
err = packet.Serialize(&psbtBuf)
if err != nil { if err != nil {
return fee, err, false return fee, err, false
} }
// Attempt to cooperatively sign the batch tx with the server. // Attempt to cooperatively sign the batch tx with the server.
err = b.coopSignBatchTx( err = b.coopSignBatchTx(
ctx, batchTx, sweeps, prevOuts, psbtBuf.Bytes(), ctx, batchTx, sweeps, prevOuts, psbtBytes,
) )
if err != nil { if err != nil {
return fee, err, false return fee, err, false