laantungir/minibits_wallet
1
0
Fork 0
mirror of https://github.com/minibits-cash/minibits_wallet.git synced 2026-08-12 09:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Format onchain fee tiers through formatCurrency, and log the mint's real tiers

Browse Source 
fee_reserve is an absolute MAXIMUM the mint may spend on miner fees, denominated
in the quote's unit — not a feerate. NUT-30 never exposes sat/vB, and whatever
the mint does not spend comes back as NUT-08 change, which is why every tier
reads "up to".

It arrives in the unit's BASE denomination, and I was printing it raw with
numbro. For sat that is identical (precision 1, mantissa 0) so it looked correct,
but on a usd-denominated mint a fee_reserve of 400 means $4.00 and would have
rendered as "400 USD" — a fee claimed a hundred times too large. The min/max
amount gates and the insufficient-funds message had the same bug. All now go
through formatCurrency, as the rest of the wallet does.

Also log the tiers the mint actually returned, so what the screen shows can be
checked against what the mint said without reverse-engineering it from the UI —
fakewallet scales its reserve with the amount, so the number moves.

87 tsc (unchanged baseline), 328/328.
This commit is contained in:
minibits-cash
2026-07-14 23:27:43 +02:00
parent 346e07cf8b
commit 2a21321ab2
1 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/screens/OnchainTransferScreen.tsx
+34 -13
View File
@@ -44,7 +44,7 @@ import {translate} from '../i18n'
import AppError, {Err} from '../utils/AppError'
import {round, toNumber} from '../utils/number'
import useIsInternetReachable from '../utils/useIsInternetReachable'
import {MintUnit, getCurrency} from '../services/wallet/currency'
import {MintUnit, formatCurrency, getCurrency} from '../services/wallet/currency'
import {
OnchainFeeOption,
mockOnchainFeeTiers,
@@ -345,7 +345,7 @@ export const OnchainTransferScreen = observer(function OnchainTransferScreen({ro
dispatch({
type: 'SET_INFO',
message: translate('payCommon_minimumPay', {
amount: minAmount,
amount: formatCurrency(minAmount, currencyCode),
currency: currencyCode,
}),
})
@@ -356,7 +356,7 @@ export const OnchainTransferScreen = observer(function OnchainTransferScreen({ro
dispatch({
type: 'SET_INFO',
message: translate('payCommon_maximumPay', {
amount: maxAmount,
amount: formatCurrency(maxAmount, currencyCode),
currency: currencyCode,
}),
})
@@ -374,11 +374,26 @@ export const OnchainTransferScreen = observer(function OnchainTransferScreen({ro
let options = normalizeFeeOptions(quote.fee_options ?? [])
log.debug('[requestQuote] Mint fee options', {
// `fee_reserve` is an absolute MAXIMUM fee in the quote's unit, not a
// feerate — logged raw so what the mint said can be checked against what
// the screen shows.
mintTiers: options.map(o => ({
feeIndex: o.feeIndex,
feeReserve: o.feeReserve,
estimatedBlocks: o.estimatedBlocks,
})),
})
if (MOCK_FEE_TIERS && __DEV__) {
options = mockOnchainFeeTiers(options)
log.warn('[requestQuote] MOCKED fee tiers — the mint offered', {
real: quote.fee_options?.length ?? 0,
})
const mocked = mockOnchainFeeTiers(options)
if (mocked !== options) {
log.warn('[requestQuote] MOCKED fee tiers — only the real one is payable', {
mintTiers: options.map(o => o.feeReserve),
shownTiers: mocked.map(o => `${o.feeReserve}${o.isMock ? ' (mock)' : ''}`),
})
}
options = mocked
}
const defaultOption = selectDefaultFeeOption(options)
@@ -408,7 +423,7 @@ export const OnchainTransferScreen = observer(function OnchainTransferScreen({ro
type: 'QUOTE_INSUFFICIENT',
message: translate('transferScreen_insufficientFunds', {
currency: currencyCode,
amount: totalRequired,
amount: formatCurrency(totalRequired, currencyCode),
}),
})
return
@@ -525,7 +540,15 @@ export const OnchainTransferScreen = observer(function OnchainTransferScreen({ro
const hasQuote = !!meltQuote && !!selectedFee
/**
* A tier's "~N blocks · up to X sat" line.
* A tier's "~N blocks · up to X SAT" line.
*
* `fee_reserve` is an absolute MAXIMUM the mint may spend on miner fees, denominated in
* the quote's unit — NOT a feerate. NUT-30 never exposes sat/vB. Whatever the mint does
* not spend comes back as NUT-08 change, which is why every tier reads "up to".
*
* Formatted through `formatCurrency` rather than printed raw: the reserve arrives in the
* unit's base denomination, so on a usd-denominated mint a reserve of 400 means $4.00,
* and printing the integer would claim a fee a hundred times too large.
*
* A fabricated tier says so, loudly and in plain text. It only exists in a debug build,
* but an unmarked invented fee reserve sitting next to real ones is exactly the kind of
@@ -534,7 +557,7 @@ export const OnchainTransferScreen = observer(function OnchainTransferScreen({ro
const feeTierLabel = (option: OnchainFeeOption) =>
translate('onchainTransferScreen_feeTierSubtext', {
blocks: option.estimatedBlocks,
amount: numbro(option.feeReserve).format({thousandSeparated: true}),
amount: formatCurrency(option.feeReserve, currencyCode),
currency: currencyCode,
}) + (option.isMock ? ' ⚠️ MOCK — pays at the mint\'s real fee' : '')
const isSettled =
@@ -760,9 +783,7 @@ export const OnchainTransferScreen = observer(function OnchainTransferScreen({ro
})}
subText={
translate('onchainTransferScreen_feeTierReserve', {
amount: numbro(option.feeReserve).format({
thousandSeparated: true,
}),
amount: formatCurrency(option.feeReserve, currencyCode),
currency: currencyCode,
}) + (option.isMock ? ' ⚠️ MOCK' : '')
}