GlcoinCore/loop
1
0
Fork 0
mirror of https://github.com/lightninglabs/loop.git synced 2026-08-20 13:27:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd/loop: delay swap by 30 minutes by default, add --fast to loopout command

Browse source 
We now delay the swap by up to 30 minutes by deafult. To keep the
current imemdiate swap, --fast flag is added.
This commit is contained in:
Johan T. Halseth 2019-11-14 10:35:32 +01:00
parent ea1f9ff8ba
commit 7ea0e35299
No known key found for this signature in database
GPG key ID: 15BAADA29DA20D26
3 changed files with 48 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

51
cmd/loop/loopout.go
View file

@ -3,6 +3,7 @@ package main
import (
"context"
"fmt"
"time"
"github.com/lightninglabs/loop"
"github.com/lightninglabs/loop/looprpc"
@ -44,6 +45,16 @@ var loopOutCommand = cli.Command{
"should be swept within",
Value: uint64(loop.DefaultSweepConfTarget),
},
cli.BoolFlag{
Name: "fast",
Usage: "Indicate you want to swap immediately, " +
"paying potentially a higher fee. If not " +
"set the swap server might choose to wait up " +
"to 30 minutes before publishing the swap " +
"HTLC on-chain, to save on chain fees. Not " +
"setting this flag might result in a lower " +
"swap fee.",
},
},
Action: loopOut,
}
@ -92,9 +103,19 @@ func loopOut(ctx *cli.Context) error {
return err
}
limits := getLimits(amt, quote)
// Show a warning if a slow swap was requested.
fast := ctx.Bool("fast")
warning := ""
if fast {
warning = "Fast swap requested."
} else {
warning = fmt.Sprintf("Regular swap speed requested, it "+
"might take up to %v for the swap to be executed.",
defaultSwapWaitTime)
}
err = displayLimits(swap.TypeOut, amt, limits, false)
limits := getLimits(amt, quote)
err = displayLimits(swap.TypeOut, amt, limits, false, warning)
if err != nil {
return err
}
@ -104,16 +125,24 @@ func loopOut(ctx *cli.Context) error {
unchargeChannel = ctx.Uint64("channel")
}
// Set our maximum swap wait time. If a fast swap is requested we set
// it to now, otherwise to 30 minutes in the future.
swapDeadline := time.Now()
if !fast {
swapDeadline = time.Now().Add(defaultSwapWaitTime)
}
resp, err := client.LoopOut(context.Background(), &looprpc.LoopOutRequest{
Amt: int64(amt),
Dest: destAddr,
MaxMinerFee: int64(limits.maxMinerFee),
MaxPrepayAmt: int64(*limits.maxPrepayAmt),
MaxSwapFee: int64(limits.maxSwapFee),
MaxPrepayRoutingFee: int64(*limits.maxPrepayRoutingFee),
MaxSwapRoutingFee: int64(*limits.maxSwapRoutingFee),
LoopOutChannel: unchargeChannel,
SweepConfTarget: sweepConfTarget,
Amt: int64(amt),
Dest: destAddr,
MaxMinerFee: int64(limits.maxMinerFee),
MaxPrepayAmt: int64(*limits.maxPrepayAmt),
MaxSwapFee: int64(limits.maxSwapFee),
MaxPrepayRoutingFee: int64(*limits.maxPrepayRoutingFee),
MaxSwapRoutingFee: int64(*limits.maxSwapRoutingFee),
LoopOutChannel: unchargeChannel,
SweepConfTarget: sweepConfTarget,
SwapPublicationDeadline: uint64(swapDeadline.Unix()),
})
if err != nil {
return err