Merge pull request #709 from sputn1ck/instantout_custom_addr

instantout: add custom address to send funds to

Author: sputn1ck

cmd/loop/instantout.go

@@ -25,6 +25,12 @@ var instantOutCommand = cli.Command{
 			Usage: "the comma-separated list of short " +
 				"channel IDs of the channels to loop out",
 		},
+		cli.StringFlag{
+			Name: "addr",
+			Usage: "the optional address that the looped out funds " +
+				"should be sent to, if let blank the funds " +
+				"will go to lnd's wallet",
+		},
 	},
 	Action: instantOut,
 }
@@ -178,6 +184,7 @@ func instantOut(ctx *cli.Context) error {
 		&looprpc.InstantOutRequest{
 			ReservationIds:  selectedReservations,
 			OutgoingChanSet: outgoingChanSet,
+			DestAddr:        ctx.String("addr"),
 		},
 	)
 

instantout/actions.go

@@ -19,6 +19,7 @@ import (
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
 	"github.com/lightningnetwork/lnd/lntypes"
+	"github.com/lightningnetwork/lnd/lnwallet"
 )
 
 const (
@@ -59,6 +60,7 @@ type InitInstantOutCtx struct {
 	initationHeight int32
 	outgoingChanSet loopdb.ChannelSet
 	protocolVersion ProtocolVersion
+	sweepAddress    btcutil.Address
 }
 
 // InitInstantOutAction is the first action that is executed when the instant
@@ -165,11 +167,15 @@ func (f *FSM) InitInstantOutAction(eventCtx fsm.EventContext) fsm.EventType {
 	}
 
 	// Create the address that we'll send the funds to.
-	sweepAddress, err := f.cfg.Wallet.NextAddr(
-		f.ctx, "", walletrpc.AddressType_TAPROOT_PUBKEY, false,
-	)
-	if err != nil {
-		return f.HandleError(err)
+	sweepAddress := initCtx.sweepAddress
+	if sweepAddress == nil {
+		sweepAddress, err = f.cfg.Wallet.NextAddr(
+			f.ctx, lnwallet.DefaultAccountName,
+			walletrpc.AddressType_TAPROOT_PUBKEY, false,
+		)
+		if err != nil {
+			return f.HandleError(err)
+		}
 	}
 
 	// Now we can create the instant out.

instantout/manager.go

@@ -137,7 +137,20 @@ func (m *Manager) recoverInstantOuts(ctx context.Context) error {
 
 // NewInstantOut creates a new instantout.
 func (m *Manager) NewInstantOut(ctx context.Context,
-	reservations []reservation.ID) (*FSM, error) {
+	reservations []reservation.ID, sweepAddress string) (*FSM, error) {
+
+	var (
+		sweepAddr btcutil.Address
+		err       error
+	)
+	if sweepAddress != "" {
+		sweepAddr, err = btcutil.DecodeAddress(
+			sweepAddress, m.cfg.Network,
+		)
+		if err != nil {
+			return nil, err
+		}
+	}
 
 	m.Lock()
 	// Create the instantout request.
@@ -146,6 +159,7 @@ func (m *Manager) NewInstantOut(ctx context.Context,
 		reservations:    reservations,
 		initationHeight: m.currentHeight,
 		protocolVersion: CurrentProtocolVersion(),
+		sweepAddress:    sweepAddr,
 	}
 
 	instantOut, err := NewFSM(

loopd/swapclient_server.go

@@ -1194,7 +1194,7 @@ func (s *swapClientServer) InstantOut(ctx context.Context,
 	}
 
 	instantOutFsm, err := s.instantOutManager.NewInstantOut(
-		ctx, reservationIds,
+		ctx, reservationIds, req.DestAddr,
 	)
 	if err != nil {
 		return nil, err