From 9f3d997d14a3765125b8e4025a1a7b9b053aa642 Mon Sep 17 00:00:00 2001 From: Alex Bosworth Date: Sat, 25 Oct 2025 08:24:53 -0700 Subject: [PATCH 1/2] version: bump version to v0.31.5-beta --- version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.go b/version.go index 122505305..1be28bcfe 100644 --- a/version.go +++ b/version.go @@ -38,7 +38,7 @@ const ( // Note: please update release_notes.md when you change these values. appMajor uint = 0 appMinor uint = 31 - appPatch uint = 4 + appPatch uint = 5 // appPreRelease MUST only contain characters from semanticAlphabet per // the semantic versioning spec. From b5b9eafa6e34c023da13a10bc3980de5b7581294 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 26 Oct 2025 00:41:37 -0300 Subject: [PATCH 2/2] cli: rename --amount to --amt in static loop static in --amt loop static withdraw --amt This is done to make it consistent with other commands and products. Keep --amount flag as an alias. --- cmd/loop/staticaddr.go | 10 ++++++---- docs/loop.1 | 4 ++-- docs/loop.md | 44 +++++++++++++++++++++--------------------- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/cmd/loop/staticaddr.go b/cmd/loop/staticaddr.go index 5437d165b..f68febb33 100644 --- a/cmd/loop/staticaddr.go +++ b/cmd/loop/staticaddr.go @@ -158,7 +158,8 @@ var withdrawalCommand = &cli.Command{ "the transaction", }, &cli.Uint64Flag{ - Name: "amount", + Name: "amt", + Aliases: []string{"amount"}, Usage: "the number of satoshis that should be " + "withdrawn from the selected deposits. The " + "change is sent back to the static address", @@ -211,7 +212,7 @@ func withdraw(ctx context.Context, cmd *cli.Command) error { All: isAllSelected, DestAddr: destAddr, SatPerVbyte: int64(cmd.Uint64("sat_per_vbyte")), - Amount: int64(cmd.Uint64("amount")), + Amount: int64(cmd.Uint64("amt")), }) if err != nil { return err @@ -473,7 +474,8 @@ var staticAddressLoopInCommand = &cli.Command{ "parameters after the payment timed out.", }, &cli.Uint64Flag{ - Name: "amount", + Name: "amt", + Aliases: []string{"amount"}, Usage: "the number of satoshis that should be " + "swapped from the selected deposits. If there" + "is change it is sent back to the static " + @@ -514,7 +516,7 @@ func staticAddressLoopIn(ctx context.Context, cmd *cli.Command) error { "allowed") default: - selectedAmount = int64(cmd.Uint64("amount")) + selectedAmount = int64(cmd.Uint64("amt")) } client, cleanup, err := getClient(ctx, cmd) diff --git a/docs/loop.1 b/docs/loop.1 index 3971105ab..26f346e5c 100644 --- a/docs/loop.1 +++ b/docs/loop.1 @@ -503,7 +503,7 @@ Withdraw from static address deposits. \fB--all\fP: withdraws all static address deposits. .PP -\fB--amount\fP="": the number of satoshis that should be withdrawn from the selected deposits. The change is sent back to the static address (default: 0) +\fB--amt, --amount\fP="": the number of satoshis that should be withdrawn from the selected deposits. The change is sent back to the static address (default: 0) .PP \fB--dest_addr\fP="": the optional address that the withdrawn funds should be sent to, if let blank the funds will go to lnd's wallet @@ -532,7 +532,7 @@ Loop in funds from static address deposits. \fB--all\fP: loop in all static address deposits. .PP -\fB--amount\fP="": the number of satoshis that should be swapped from the selected deposits. If thereis change it is sent back to the static address. (default: 0) +\fB--amt, --amount\fP="": the number of satoshis that should be swapped from the selected deposits. If thereis change it is sent back to the static address. (default: 0) .PP \fB--fast\fP: Usage: complete the swap faster by paying a higher fee, so the change output is available sooner diff --git a/docs/loop.md b/docs/loop.md index 99e55843d..3908eed09 100644 --- a/docs/loop.md +++ b/docs/loop.md @@ -585,14 +585,14 @@ $ loop [GLOBAL FLAGS] static withdraw [COMMAND FLAGS] [ARGUMENTS...] The following flags are supported: -| Name | Description | Type | Default value | -|-----------------------|---------------------------------------------------------------------------------------------------------------------------|--------|:-------------:| -| `--utxo="…"` | specify utxos as outpoints(tx:idx) which willbe withdrawn | string | `[]` | -| `--all` | withdraws all static address deposits | bool | `false` | -| `--dest_addr="…"` | the optional address that the withdrawn funds should be sent to, if let blank the funds will go to lnd's wallet | string | -| `--sat_per_vbyte="…"` | (optional) a manual fee expressed in sat/vbyte that should be used when crafting the transaction | uint | `0` | -| `--amount="…"` | the number of satoshis that should be withdrawn from the selected deposits. The change is sent back to the static address | uint | `0` | -| `--help` (`-h`) | show help | bool | `false` | +| Name | Description | Type | Default value | +|--------------------------|---------------------------------------------------------------------------------------------------------------------------|--------|:-------------:| +| `--utxo="…"` | specify utxos as outpoints(tx:idx) which willbe withdrawn | string | `[]` | +| `--all` | withdraws all static address deposits | bool | `false` | +| `--dest_addr="…"` | the optional address that the withdrawn funds should be sent to, if let blank the funds will go to lnd's wallet | string | +| `--sat_per_vbyte="…"` | (optional) a manual fee expressed in sat/vbyte that should be used when crafting the transaction | uint | `0` | +| `--amt="…"` (`--amount`) | the number of satoshis that should be withdrawn from the selected deposits. The change is sent back to the static address | uint | `0` | +| `--help` (`-h`) | show help | bool | `false` | ### `static summary` subcommand (aliases: `s`) @@ -626,18 +626,18 @@ $ loop [GLOBAL FLAGS] static in [COMMAND FLAGS] [amt] [--all | --utxo xxx:xx] The following flags are supported: -| Name | Description | Type | Default value | -|-------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|:-------------:| -| `--utxo="…"` | specify the utxos of deposits as outpoints(tx:idx) that should be looped in | string | `[]` | -| `--all` | loop in all static address deposits | bool | `false` | -| `--payment_timeout="…"` | the maximum time in seconds that the server is allowed to take for the swap payment. The client can retry the swap with adjusted parameters after the payment timed out | duration | `0s` | -| `--amount="…"` | the number of satoshis that should be swapped from the selected deposits. If thereis change it is sent back to the static address | uint | `0` | -| `--fast` | Usage: complete the swap faster by paying a higher fee, so the change output is available sooner | bool | `false` | -| `--last_hop="…"` | the pubkey of the last hop to use for this swap | string | -| `--label="…"` | an optional label for this swap,limited to 500 characters. The label may not start with our reserved prefix: [reserved] | string | -| `--route_hints="…"` | route hints that can each be individually used to assist in reaching the invoice's destination | string | `[]` | -| `--private` | generates and passes routehints. Should be used if the connected node is only reachable via private channels | bool | `false` | -| `--force` | Assumes yes during confirmation. Using this option will result in an immediate swap | bool | `false` | -| `--verbose` (`-v`) | show expanded details | bool | `false` | -| `--help` (`-h`) | show help | bool | `false` | +| Name | Description | Type | Default value | +|--------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|:-------------:| +| `--utxo="…"` | specify the utxos of deposits as outpoints(tx:idx) that should be looped in | string | `[]` | +| `--all` | loop in all static address deposits | bool | `false` | +| `--payment_timeout="…"` | the maximum time in seconds that the server is allowed to take for the swap payment. The client can retry the swap with adjusted parameters after the payment timed out | duration | `0s` | +| `--amt="…"` (`--amount`) | the number of satoshis that should be swapped from the selected deposits. If thereis change it is sent back to the static address | uint | `0` | +| `--fast` | Usage: complete the swap faster by paying a higher fee, so the change output is available sooner | bool | `false` | +| `--last_hop="…"` | the pubkey of the last hop to use for this swap | string | +| `--label="…"` | an optional label for this swap,limited to 500 characters. The label may not start with our reserved prefix: [reserved] | string | +| `--route_hints="…"` | route hints that can each be individually used to assist in reaching the invoice's destination | string | `[]` | +| `--private` | generates and passes routehints. Should be used if the connected node is only reachable via private channels | bool | `false` | +| `--force` | Assumes yes during confirmation. Using this option will result in an immediate swap | bool | `false` | +| `--verbose` (`-v`) | show expanded details | bool | `false` | +| `--help` (`-h`) | show help | bool | `false` |