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

cmd/loop: improve displayed limits

Browse source
This commit is contained in:
Oliver Gugger 2020-04-20 18:14:43 +02:00
parent 4a714e0c96
commit 3b630667a5
No known key found for this signature in database
GPG key ID: 8E4256593F177720
3 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cmd/loop/loopin.go
View file

@ -119,7 +119,10 @@ func loopIn(ctx *cli.Context) error {
}
limits := getInLimits(amt, quote)
err = displayLimits(swap.TypeIn, amt, limits, external, "")
err = displayLimits(
swap.TypeIn, amt, btcutil.Amount(quote.MinerFee), limits,
external, "",
)
if err != nil {
return err
}

5
cmd/loop/loopout.go
View file

@ -135,7 +135,10 @@ func loopOut(ctx *cli.Context) error {
ctx.Int64("max_swap_routing_fee"),
)
}
err = displayLimits(swap.TypeOut, amt, limits, false, warning)
err = displayLimits(
swap.TypeOut, amt, btcutil.Amount(quote.MinerFee), limits,
false, warning,
)
if err != nil {
return err
}

35
cmd/loop/main.go
View file

@ -141,7 +141,7 @@ func getLimits(amt btcutil.Amount, quote *looprpc.QuoteResponse) *limits {
}
}
func displayLimits(swapType swap.Type, amt btcutil.Amount, l *limits,
func displayLimits(swapType swap.Type, amt, minerFees btcutil.Amount, l *limits,
externalHtlc bool, warning string) error {
totalSuccessMax := l.maxMinerFee + l.maxSwapFee
@ -159,7 +159,7 @@ func displayLimits(swapType swap.Type, amt btcutil.Amount, l *limits,
"wallet.\n\n")
}
fmt.Printf("Max swap fees for %d Loop %v: %d\n", amt, swapType,
fmt.Printf("Max swap fees for %d sat Loop %v: %d sat\n", amt, swapType,
totalSuccessMax)
if warning != "" {
@ -176,26 +176,35 @@ func displayLimits(swapType swap.Type, amt btcutil.Amount, l *limits,
return nil
case "x":
fmt.Println()
if swapType != swap.TypeIn || !externalHtlc {
fmt.Printf("Max on-chain fee: %d\n",
l.maxMinerFee)
f := "%-36s %d sat\n"
switch swapType {
case swap.TypeOut:
fmt.Printf(f, "Estimated on-chain sweep fee:",
minerFees)
fmt.Printf(f, "Max on-chain sweep fee:", l.maxMinerFee)
case swap.TypeIn:
if !externalHtlc {
fmt.Printf(f, "Estimated on-chain HTLC fee:",
minerFees)
}
}
if l.maxSwapRoutingFee != nil {
fmt.Printf("Max off-chain swap routing fee: %d\n",
fmt.Printf(f, "Max off-chain swap routing fee:",
*l.maxSwapRoutingFee)
}
if l.maxPrepayRoutingFee != nil {
fmt.Printf("Max off-chain prepay routing fee: %d\n",
*l.maxPrepayRoutingFee)
}
fmt.Printf("Max swap fee: %d\n", l.maxSwapFee)
if l.maxPrepayAmt != nil {
fmt.Printf("Max no show penalty: %d\n",
fmt.Printf(f, "Max no show penalty (prepay):",
*l.maxPrepayAmt)
}
if l.maxPrepayRoutingFee != nil {
fmt.Printf(f, "Max off-chain prepay routing fee:",
*l.maxPrepayRoutingFee)
}
fmt.Printf(f, "Max swap fee:", l.maxSwapFee)
fmt.Printf("CONTINUE SWAP? (y/n): ")
fmt.Scanln(&answer)