-
Notifications
You must be signed in to change notification settings - Fork 28
fix: check invoice amounts against the order's signed terms #664
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
AndreaDiazCorreia
wants to merge
32
commits into
main
Choose a base branch
from
fix/bind-invoice-amounts-to-order-terms
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 10 commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
ce714a4
feat: add BOLT-11 invoice prefix parser for amount validation
AndreaDiazCorreia 971dcc3
fix(invoice): block payment when invoice terms disagree with the order
AndreaDiazCorreia d89cc1f
feat(invoice): anchor seller hold invoice to signed order amount and …
AndreaDiazCorreia 656cef0
feat(invoice): block buyer payout when invoice request disagrees with…
AndreaDiazCorreia e7d5490
fix(invoice): follow info event stream to prevent stale fee rate reads
AndreaDiazCorreia fb5a9c4
fix(invoice): show the invoice amount in the manual payment flow
AndreaDiazCorreia a54fd45
feat(invoice): say when a settlement could not be checked
AndreaDiazCorreia 883c69a
feat(invoice): hold a settlement to the terms pinned at commitment
AndreaDiazCorreia 431aeb6
feat(invoice): re-price market orders against an independent rate
AndreaDiazCorreia 0c35d7c
test(invoice): cover the settlement gating on both invoice screens
AndreaDiazCorreia 3ae7036
fix(invoice): keep a fee unavailable at commitment from becoming a term
AndreaDiazCorreia dfedb47
fix(invoice): pin the fee rate on range remainder sessions
AndreaDiazCorreia c2414f3
fix(invoice): await cancellation before leaving the payment screen
AndreaDiazCorreia 315e581
feat(invoice): refuse a settlement that runs off market against the user
AndreaDiazCorreia 1f7a877
fix(invoice): record that pinning ran instead of inferring it
AndreaDiazCorreia aa58196
fix(invoice): do not quote an unreadable premium as zero
AndreaDiazCorreia d4a3323
fix(invoice): stop sending an amount NIP-47 wallets may refuse
AndreaDiazCorreia 65fe829
fix(invoice): leave pre-pinning sessions out of the market check
AndreaDiazCorreia 40270fd
fix(invoice): refuse a fee rate that leaves the arithmetic's domain
AndreaDiazCorreia 8b5dac2
fix(invoice): bind the market override to the quote it was given for
AndreaDiazCorreia 6f550dd
fix(invoice): tell the market check's four outcomes apart
AndreaDiazCorreia 51eb490
fix(invoice): durably pin every term the settlement is checked against
AndreaDiazCorreia 4e01319
fix(invoice): stop refusing settlements the check has nothing against
AndreaDiazCorreia f54d219
fix(invoice): keep the market check from flapping, and its anchors in…
AndreaDiazCorreia bb1904b
fix(invoice): fail closed when the settlement terms cannot be stored
AndreaDiazCorreia 1400b6c
Merge remote-tracking branch 'origin/main' into fix/bind-invoice-amou…
AndreaDiazCorreia 2e1a3c1
fix(invoice): check the payout invoice against the order's signed ter…
AndreaDiazCorreia 606e9b9
fix(invoice): do not let a range remainder's anchor block a release
AndreaDiazCorreia 914438d
fix(l10n): standardize Spanish imperative forms to formal second person
AndreaDiazCorreia a15c227
fix(order): fetch node info event before the order book to pin fee ra…
AndreaDiazCorreia 98e7c8c
fix(order): cap the book subscription at 1000 events to bound startup…
AndreaDiazCorreia 030d7b1
fix(invoice): compare late-arriving fee rates against the commitment …
AndreaDiazCorreia File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| import 'package:flutter_riverpod/flutter_riverpod.dart'; | ||
| import 'package:mostro_mobile/data/models/nostr_event.dart'; | ||
| import 'package:mostro_mobile/features/order/providers/settlement_anchor_provider.dart'; | ||
| import 'package:mostro_mobile/services/exchange_service.dart'; | ||
| import 'package:mostro_mobile/services/logger_service.dart'; | ||
| import 'package:mostro_mobile/services/yadio_exchange_service.dart'; | ||
| import 'package:mostro_mobile/shared/providers/order_repository_provider.dart'; | ||
| import 'package:mostro_mobile/shared/providers/session_notifier_provider.dart'; | ||
| import 'package:mostro_mobile/shared/utils/market_quote.dart'; | ||
|
|
||
| /// A bitcoin price from a source the connected node does not control. | ||
| /// | ||
| /// Deliberately not [exchangeServiceProvider], which asks the node first: it | ||
| /// reads the node's own kind-30078 rates event and only falls back to Yadio if | ||
| /// that fails. That is the right order for pricing an order the user is | ||
| /// composing, and the wrong one for checking the node's arithmetic — a node | ||
| /// that skims a settlement can publish the rate that makes the skim look | ||
| /// correct. | ||
| final independentExchangeServiceProvider = Provider<ExchangeService>( | ||
| (ref) => YadioExchangeService(), | ||
| ); | ||
|
|
||
| /// Fiat units per bitcoin for [fiatCode], from the independent source. | ||
| /// | ||
| /// Null rather than an error when the rate cannot be had: this check is a | ||
| /// second opinion, and being offline is not evidence against a settlement. | ||
| final independentFiatPerBtcProvider = | ||
|
AndreaDiazCorreia marked this conversation as resolved.
|
||
| FutureProvider.family<double?, String>((ref, fiatCode) async { | ||
| if (fiatCode.isEmpty) return null; | ||
|
|
||
| try { | ||
| final service = ref.watch(independentExchangeServiceProvider); | ||
| return await service.getExchangeRate(fiatCode, 'BTC'); | ||
| } catch (e) { | ||
| logger.w('Independent rate for $fiatCode unavailable: $e'); | ||
| return null; | ||
| } | ||
| }); | ||
|
|
||
| /// Re-prices [orderId] against the independent rate, or null when the check | ||
| /// does not apply or cannot be made. | ||
| /// | ||
| /// Only runs where the client holds no figure of its own. A session that | ||
| /// pinned the sats amount at commitment is already held to what the user saw | ||
| /// on the take screen, and re-pricing it would only second-guess a number | ||
| /// they accepted with their eyes open: a fixed-amount order may sit off the | ||
| /// market on purpose. What is left is the market-price and range orders, | ||
| /// whose sats the node resolved after the commitment, and sessions from | ||
| /// before the pin existed. | ||
| final marketCheckProvider = | ||
| Provider.family<MarketCheck?, String>((ref, orderId) { | ||
| final session = ref.watch(sessionProvider(orderId)); | ||
| if (session?.pinnedAmountSats != null) return null; | ||
|
|
||
| final settledSats = ref.watch(signedOrderAmountProvider(orderId)); | ||
| if (settledSats == null) return null; | ||
|
|
||
| final event = ref.watch(eventProvider(orderId)); | ||
|
AndreaDiazCorreia marked this conversation as resolved.
Outdated
|
||
| if (event == null) return null; | ||
|
|
||
| final fiatCode = event.currency; | ||
| if (fiatCode == null || fiatCode.isEmpty) return null; | ||
|
|
||
| // A range order still advertising its band has not been resolved to the one | ||
| // fiat figure this trade is for, so there is nothing to re-price yet. | ||
| final fiat = event.fiatAmount; | ||
| if (fiat.isRange() || fiat.minimum <= 0) return null; | ||
|
|
||
| final premium = double.tryParse(event.premium ?? '') ?? 0.0; | ||
|
coderabbitai[bot] marked this conversation as resolved.
Outdated
|
||
|
|
||
| final fiatPerBtc = | ||
| ref.watch(independentFiatPerBtcProvider(fiatCode)).valueOrNull; | ||
| if (fiatPerBtc == null) return null; | ||
|
|
||
| return MarketCheck.of( | ||
| settledSats: settledSats, | ||
| fiatAmount: fiat.minimum, | ||
| fiatPerBtc: fiatPerBtc, | ||
| premium: premium, | ||
| ); | ||
|
AndreaDiazCorreia marked this conversation as resolved.
|
||
| }); | ||
130 changes: 130 additions & 0 deletions
130
lib/features/order/providers/settlement_anchor_provider.dart
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| import 'package:flutter_riverpod/flutter_riverpod.dart'; | ||
| import 'package:mostro_mobile/data/models/nostr_event.dart'; | ||
| import 'package:mostro_mobile/features/mostro/mostro_instance.dart'; | ||
| import 'package:mostro_mobile/features/settings/settings_provider.dart'; | ||
| import 'package:mostro_mobile/services/logger_service.dart'; | ||
| import 'package:mostro_mobile/shared/providers/order_repository_provider.dart'; | ||
| import 'package:mostro_mobile/shared/providers/session_notifier_provider.dart'; | ||
| import 'package:mostro_mobile/shared/utils/settlement_amounts.dart'; | ||
|
|
||
| /// The order amount the node currently publishes for [orderId], in satoshis. | ||
| /// | ||
| /// Read off the kind-38383 order event rather than the direct message that | ||
| /// asks for the payment. Both come from the node, but only one of them is the | ||
| /// order the user chose: the event is addressable and public, and it is what | ||
| /// the take screen showed. A market-price order carries no amount until it is | ||
| /// taken, and the node republishes the event with the resolved figure as part | ||
| /// of that flow, so by the time either side is asked to act the amount is | ||
| /// there. | ||
| /// | ||
| /// Being addressable cuts both ways: the node can republish it again at any | ||
| /// point, which is why a settlement is held to [signedOrderAmountProvider] | ||
| /// and not to this. | ||
| /// | ||
| /// Null when no event has arrived, or when it carries no usable amount. | ||
| final publishedOrderAmountProvider = | ||
| Provider.family<int?, String>((ref, orderId) { | ||
| final event = ref.watch(eventProvider(orderId)); | ||
| if (event == null) return null; | ||
|
|
||
| final amount = int.tryParse(event.amount ?? ''); | ||
| if (amount == null || amount <= 0) return null; | ||
| return amount; | ||
| }); | ||
|
|
||
| /// The order amount this settlement is held to, in satoshis. | ||
| /// | ||
| /// The figure pinned when the session committed to the trade, so republishing | ||
| /// the order event afterwards cannot move what the client will accept. Falls | ||
| /// back to the live event where nothing was pinned: sessions written before | ||
| /// the pin existed, and market-price and range orders, whose sats figure the | ||
| /// node only resolves after the commitment there was to make. | ||
| final signedOrderAmountProvider = Provider.family<int?, String>((ref, orderId) { | ||
| final pinned = ref.watch(sessionProvider(orderId))?.pinnedAmountSats; | ||
| if (pinned != null && pinned > 0) return pinned; | ||
|
|
||
| return ref.watch(publishedOrderAmountProvider(orderId)); | ||
| }); | ||
|
|
||
| /// The node's fee rate, from its kind-38385 info event. | ||
| /// | ||
| /// Followed rather than sampled: the info event arrives asynchronously after | ||
| /// the order subscription is opened, so a screen built first would otherwise | ||
| /// hold a null read for the rest of the session and keep falling back to the | ||
| /// weaker check. | ||
| /// | ||
| /// The event is pinned to the node currently selected. Switching instances | ||
| /// clears the repository's cached event without emitting the drop, so an | ||
| /// unpinned fee rate would go on deriving amounts from the previous node's | ||
| /// terms and refuse settlements that are in fact correct. | ||
| /// | ||
| /// Null when the info event has not arrived, belongs to another node, or does | ||
| /// not carry the tag. The getter parses eagerly and throws on a missing tag, | ||
| /// which is fine for the About screen it was written for and not for a | ||
| /// payment check. | ||
| final nodeFeeRateProvider = Provider<double?>((ref) { | ||
| final nodePubkey = ref.watch( | ||
| settingsProvider.select((settings) => settings.mostroPublicKey), | ||
| ); | ||
| final info = ref.watch(mostroInfoEventProvider).valueOrNull; | ||
| if (info == null || info.pubkey != nodePubkey) return null; | ||
| try { | ||
| return info.fee; | ||
| } catch (e) { | ||
| logger.w('Node info event carries no usable fee rate: $e'); | ||
| return null; | ||
| } | ||
| }); | ||
|
|
||
| /// The fee rate this settlement is held to. | ||
| /// | ||
| /// [nodeFeeRateProvider] tracks whatever the node currently advertises, which | ||
| /// it can change under a trade already in flight. This prefers the rate | ||
| /// pinned when the session committed, on the same terms as | ||
| /// [signedOrderAmountProvider]. | ||
| final orderFeeRateProvider = Provider.family<double?, String>((ref, orderId) { | ||
| final pinned = ref.watch(sessionProvider(orderId))?.pinnedFeeRate; | ||
| if (pinned != null) return pinned; | ||
|
|
||
| return ref.watch(nodeFeeRateProvider); | ||
| }); | ||
|
|
||
| /// What the seller's hold invoice for [orderId] should ask for, derived from | ||
| /// the signed order amount and the signed fee rate. | ||
| /// | ||
| /// Null when either input is missing. A caller that gets null has not learned | ||
| /// that the payment is wrong — only that it cannot re-derive what it should | ||
| /// be, and should fall back to the weaker check it can still make. | ||
| final anchoredSellerAmountProvider = | ||
| Provider.family<int?, String>((ref, orderId) { | ||
| final amountSats = ref.watch(signedOrderAmountProvider(orderId)); | ||
| final feeRate = ref.watch(orderFeeRateProvider(orderId)); | ||
| if (amountSats == null || feeRate == null) return null; | ||
|
|
||
| return SettlementAmounts.sellerPays( | ||
| amountSats: amountSats, | ||
| feeRate: feeRate, | ||
| ); | ||
| }); | ||
|
|
||
| /// What the buyer's payout invoice for [orderId] should ask for, derived from | ||
| /// the signed order amount and the signed fee rate. | ||
| /// | ||
| /// The figure is the order amount less the buyer's half of the fee, so it is | ||
| /// never the amount shown on the order — a client comparing against that | ||
| /// would refuse every correct payout. | ||
| /// | ||
| /// Null on the same terms as [anchoredSellerAmountProvider]: the caller has | ||
| /// learned nothing about whether the request is right, only that it cannot | ||
| /// re-derive what it should be. | ||
| final anchoredBuyerAmountProvider = | ||
| Provider.family<int?, String>((ref, orderId) { | ||
| final amountSats = ref.watch(signedOrderAmountProvider(orderId)); | ||
| final feeRate = ref.watch(orderFeeRateProvider(orderId)); | ||
| if (amountSats == null || feeRate == null) return null; | ||
|
|
||
| return SettlementAmounts.buyerReceives( | ||
| amountSats: amountSats, | ||
| feeRate: feeRate, | ||
| ); | ||
| }); |
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.