Skip to content

Commit 07f5d18

Browse files
committed
loopd: static address withdrawals support
1 parent 2c802fe commit 07f5d18

File tree

3 files changed

+112
-0
lines changed

3 files changed

+112
-0
lines changed

loopd/daemon.go

+41
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
loop_looprpc "github.com/lightninglabs/loop/looprpc"
2424
"github.com/lightninglabs/loop/staticaddr/address"
2525
"github.com/lightninglabs/loop/staticaddr/deposit"
26+
"github.com/lightninglabs/loop/staticaddr/withdraw"
2627
loop_swaprpc "github.com/lightninglabs/loop/swapserverrpc"
2728
"github.com/lightninglabs/loop/sweepbatcher"
2829
"github.com/lightningnetwork/lnd/clock"
@@ -500,6 +501,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
500501

501502
staticAddressManager *address.Manager
502503
depositManager *deposit.Manager
504+
withdrawalManager *withdraw.Manager
503505
)
504506
// Create the reservation and instantout managers.
505507
if d.cfg.EnableExperimental {
@@ -561,6 +563,18 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
561563
Signer: d.lnd.Signer,
562564
}
563565
depositManager = deposit.NewManager(depoCfg)
566+
567+
// Static address deposit withdrawal manager setup.
568+
closeCfg := &withdraw.ManagerConfig{
569+
StaticAddressServerClient: staticAddressClient,
570+
AddressManager: staticAddressManager,
571+
DepositManager: depositManager,
572+
WalletKit: d.lnd.WalletKit,
573+
ChainParams: d.lnd.ChainParams,
574+
ChainNotifier: d.lnd.ChainNotifier,
575+
Signer: d.lnd.Signer,
576+
}
577+
withdrawalManager = withdraw.NewManager(closeCfg)
564578
}
565579

566580
// Now finally fully initialize the swap client RPC server instance.
@@ -578,6 +592,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
578592
instantOutManager: instantOutManager,
579593
staticAddressManager: staticAddressManager,
580594
depositManager: depositManager,
595+
withdrawalManager: withdrawalManager,
581596
}
582597

583598
// Retrieve all currently existing swaps from the database.
@@ -709,6 +724,32 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
709724
depositManager.WaitInitComplete()
710725
}
711726

727+
// Start the static address deposit withdrawal manager.
728+
if withdrawalManager != nil {
729+
d.wg.Add(1)
730+
go func() {
731+
defer d.wg.Done()
732+
733+
// Lnd's GetInfo call supplies us with the current block
734+
// height.
735+
info, err := d.lnd.Client.GetInfo(d.mainCtx)
736+
if err != nil {
737+
d.internalErrChan <- err
738+
return
739+
}
740+
741+
log.Info("Starting static address deposit withdrawal " +
742+
"manager...")
743+
err = withdrawalManager.Run(d.mainCtx, info.BlockHeight)
744+
if err != nil && !errors.Is(context.Canceled, err) {
745+
d.internalErrChan <- err
746+
}
747+
log.Info("Static address deposit withdrawal manager " +
748+
"stopped")
749+
}()
750+
withdrawalManager.WaitInitComplete()
751+
}
752+
712753
// Last, start our internal error handler. This will return exactly one
713754
// error or nil on the main error channel to inform the caller that
714755
// something went wrong or that shutdown is complete. We don't add to

loopd/perms/perms.go

+7
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,13 @@ var RequiredPermissions = map[string][]bakery.Op{
8787
Entity: "loop",
8888
Action: "in",
8989
}},
90+
"/looprpc.SwapClient/WithdrawDeposits": {{
91+
Entity: "swap",
92+
Action: "execute",
93+
}, {
94+
Entity: "loop",
95+
Action: "in",
96+
}},
9097
"/looprpc.SwapClient/GetLsatTokens": {{
9198
Entity: "auth",
9299
Action: "read",

loopd/swapclient_server.go

+64
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/btcsuite/btcd/btcec/v2"
1616
"github.com/btcsuite/btcd/btcutil"
1717
"github.com/btcsuite/btcd/chaincfg"
18+
"github.com/btcsuite/btcd/wire"
1819
"github.com/lightninglabs/aperture/l402"
1920
"github.com/lightninglabs/lndclient"
2021
"github.com/lightninglabs/loop"
@@ -26,6 +27,7 @@ import (
2627
clientrpc "github.com/lightninglabs/loop/looprpc"
2728
"github.com/lightninglabs/loop/staticaddr/address"
2829
"github.com/lightninglabs/loop/staticaddr/deposit"
30+
"github.com/lightninglabs/loop/staticaddr/withdraw"
2931
"github.com/lightninglabs/loop/swap"
3032
looprpc "github.com/lightninglabs/loop/swapserverrpc"
3133
"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
@@ -87,6 +89,7 @@ type swapClientServer struct {
8789
instantOutManager *instantout.Manager
8890
staticAddressManager *address.Manager
8991
depositManager *deposit.Manager
92+
withdrawalManager *withdraw.Manager
9093
swaps map[lntypes.Hash]loop.SwapInfo
9194
subscribers map[int]chan<- interface{}
9295
statusChan chan loop.SwapInfo
@@ -1336,6 +1339,67 @@ func (s *swapClientServer) ListUnspentDeposits(ctx context.Context,
13361339
return &clientrpc.ListUnspentDepositsResponse{Utxos: respUtxos}, nil
13371340
}
13381341

1342+
// WithdrawDeposits tries to obtain a partial signature from the server to spend
1343+
// the selected deposits to the client's wallet.
1344+
func (s *swapClientServer) WithdrawDeposits(ctx context.Context,
1345+
req *clientrpc.WithdrawDepositsRequest) (
1346+
*clientrpc.WithdrawDepositsResponse, error) {
1347+
1348+
var (
1349+
isAllSelected = req.All
1350+
isUtxoSelected = req.Outpoints != nil
1351+
outpoints []wire.OutPoint
1352+
err error
1353+
)
1354+
1355+
switch {
1356+
case isAllSelected == isUtxoSelected:
1357+
return nil, fmt.Errorf("must select either all or some utxos")
1358+
1359+
case isAllSelected:
1360+
deposits, err := s.depositManager.GetActiveDepositsInState(
1361+
deposit.Deposited,
1362+
)
1363+
if err != nil {
1364+
return nil, err
1365+
}
1366+
1367+
for _, d := range deposits {
1368+
outpoints = append(outpoints, d.OutPoint)
1369+
}
1370+
1371+
case isUtxoSelected:
1372+
outpoints, err = toServerOutpoints(req.Outpoints)
1373+
if err != nil {
1374+
return nil, err
1375+
}
1376+
}
1377+
1378+
err = s.withdrawalManager.WithdrawDeposits(ctx, outpoints)
1379+
if err != nil {
1380+
return nil, err
1381+
}
1382+
1383+
return &clientrpc.WithdrawDepositsResponse{}, err
1384+
}
1385+
1386+
func toServerOutpoints(outpoints []*clientrpc.OutPoint) ([]wire.OutPoint,
1387+
error) {
1388+
1389+
var serverOutpoints []wire.OutPoint
1390+
for _, o := range outpoints {
1391+
outpointStr := fmt.Sprintf("%s:%d", o.TxidStr, o.OutputIndex)
1392+
newOutpoint, err := wire.NewOutPointFromString(outpointStr)
1393+
if err != nil {
1394+
return nil, err
1395+
}
1396+
1397+
serverOutpoints = append(serverOutpoints, *newOutpoint)
1398+
}
1399+
1400+
return serverOutpoints, nil
1401+
}
1402+
13391403
func rpcAutoloopReason(reason liquidity.Reason) (clientrpc.AutoReason, error) {
13401404
switch reason {
13411405
case liquidity.ReasonNone:

0 commit comments

Comments
 (0)