Merge pull request #5363 from guggero/psbt-no-final-tx

Allow skipping `PsbtFinalize` step during channel funding to support external broadcast

funding/batch.go

@@ -126,7 +126,7 @@ type Wallet interface {
 	// PsbtFundingVerify looks up a previously registered funding intent by
 	// its pending channel ID and tries to advance the state machine by
 	// verifying the passed PSBT.
-	PsbtFundingVerify([32]byte, *psbt.Packet) error
+	PsbtFundingVerify([32]byte, *psbt.Packet, bool) error
 
 	// PsbtFundingFinalize looks up a previously registered funding intent
 	// by its pending channel ID and tries to advance the state machine by
@@ -355,7 +355,7 @@ func (b *Batcher) BatchFund(ctx context.Context,
 	// each of the channels.
 	for _, channel := range b.channels {
 		err = b.cfg.Wallet.PsbtFundingVerify(
-			channel.pendingChanID, unsignedPacket,
+			channel.pendingChanID, unsignedPacket, false,
 		)
 		if err != nil {
 			return nil, fmt.Errorf("error verifying PSBT: %v", err)

funding/batch_test.go

@@ -233,7 +233,7 @@ func (h *testHarness) ReleaseOutput(_ context.Context,
 	return &walletrpc.ReleaseOutputResponse{}, nil
 }
 
-func (h *testHarness) PsbtFundingVerify([32]byte, *psbt.Packet) error {
+func (h *testHarness) PsbtFundingVerify([32]byte, *psbt.Packet, bool) error {
 	return nil
 }