backend: add argument to force highest fee rate in tx proposal #3259
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
thisconnect
reviewed
Mar 27, 2025
benma
requested changes
Mar 27, 2025
backend/accounts/account.go
Outdated
| @@ -58,6 +58,7 @@ type TxProposalArgs struct { | |||
| SelectedUTXOs map[wire.OutPoint]struct{} | |||
| Note string | |||
| PaymentRequest *PaymentRequest | |||
| UseHighestFee bool | |||
There was a problem hiding this comment.
maybe it makes sense to move this up to the other fee fields and add a comment that CustomFee and FeeTargetCode don't apply when UseHighestFee is true.
| @@ -39,8 +39,7 @@ const unitSatoshi = 1e8 | |||
| // fee target (priority) if one is given, or the provided args.FeePerKb if the fee taret is | |||
| // `FeeTargetCodeCustom`. | |||
| func (account *Account) getFeePerKb(args *accounts.TxProposalArgs) (btcutil.Amount, error) { | |||
| isPaymentRequest := args.PaymentRequest != nil | |||
| if args.FeeTargetCode == accounts.FeeTargetCodeCustom && !isPaymentRequest { | |||
| if args.FeeTargetCode == accounts.FeeTargetCodeCustom && !args.UseHighestFee { | |||
There was a problem hiding this comment.
drop the first condition? not sure why it should be "custom".
There was a problem hiding this comment.
but that part is specifically to evaluate the custom fee rate, no? if args.UseHighestFee is further down
frontends/web/src/api/account.ts
Outdated
| @@ -325,6 +325,7 @@ export type TTxInput = { | |||
| sendAll: 'yes' | 'no'; | |||
| selectedUTXOs: string[]; | |||
| paymentRequest: Slip24 | null; | |||
| useHighestFee: boolean; | |||
There was a problem hiding this comment.
could be cool to make this type a union type to exclude illegal combinations, similar to
And prevent using e.g. customFee when useHighestFee is true.
| @@ -39,8 +39,7 @@ const unitSatoshi = 1e8 | |||
| // fee target (priority) if one is given, or the provided args.FeePerKb if the fee taret is | |||
| // `FeeTargetCodeCustom`. | |||
| func (account *Account) getFeePerKb(args *accounts.TxProposalArgs) (btcutil.Amount, error) { | |||
There was a problem hiding this comment.
This whole file is severly lacking unit tests. Some day 😭
sutterseba
force-pushed
the
tx-proposal-use-highest-fee
branch
from
0b8a5f3 to
b252f80
Compare
benma
reviewed
Mar 27, 2025
frontends/web/src/api/account.ts
Outdated
Comment on lines
333
to
334
| customFee?: never; | ||
| feeTarget?: never; |
There was a problem hiding this comment.
I think you can just remove those.
Previously, the highest fee rate was automatically applied to all transaction proposals with a SLIP-24 payment request. For selling and spending integrations that do not use SLIP-24 payment requests, there should also be an option to trigger this same behaviour. This commit replaces the previous conditioning on payment requests with a general boolean field that is set independently and can be used for other integrations. This also allows setting a custom fee rate for transaction proposals with payment requests, if needed. The TTxInput type excludes illegal combinations of this setting and feeTarget or customFee, as either the highest fee should automatically be used, or an explicitly specified fee target.
sutterseba
force-pushed
the
tx-proposal-use-highest-fee
branch
from
b252f80 to
986d3f2
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, the highest fee rate was automatically applied to all transaction proposals with a SLIP-24 payment request. For selling and spending integrations that do not use SLIP-24 payment requests, there should also be an option to trigger this same behaviour.
This commit replaces the previous conditioning on payment requests with a general boolean field that is set independently and can be used for other integrations. This also allows setting a custom fee rate for transaction proposals with payment requests, if needed.