Merge pull request #696 from EdgeApp/jon/fix/xmr-confs

Author: Jon Tzeng

CHANGELOG.md

@@ -8,6 +8,7 @@
 
 - added: Add `appVersion`, `osType`, and `osVersion` to `EdgeContextOptions` for v2 coreRollup endpoint support.
 - changed: Use `/v2/coreRollup` endpoint when device info is available, with `/v1/coreRollup` as fallback.
+- fixed: Fixed confirmations bug in `shouldCoreDetermineConfirmations`
 
 ## 2.38.4 (2026-01-12)
 

src/core/currency/wallet/currency-wallet-api.ts

@@ -43,7 +43,11 @@ import { makeMetaTokens } from '../../account/custom-tokens'
 import { toApiInput } from '../../root-pixie'
 import { makeStorageWalletApi } from '../../storage/storage-api'
 import { getCurrencyMultiplier } from '../currency-selectors'
-import { makeCurrencyWalletCallbacks } from './currency-wallet-callbacks'
+import {
+  determineConfirmations,
+  makeCurrencyWalletCallbacks,
+  shouldCoreDetermineConfirmations
+} from './currency-wallet-callbacks'
 import {
   asEdgeAssetAction,
   asEdgeTxAction,
@@ -763,7 +767,8 @@ export function combineTxWithFile(
   input: CurrencyWalletInput,
   tx: MergedTransaction,
   file: TransactionFile | undefined,
-  tokenId: EdgeTokenId
+  tokenId: EdgeTokenId,
+  blockHeight?: number
 ): EdgeTransaction {
   const walletId = input.props.walletId
   const { accountId, currencyInfo, pluginId } = input.props.walletState
@@ -772,12 +777,20 @@ export function combineTxWithFile(
   const { currencyCode } = tokenId == null ? currencyInfo : allTokens[tokenId]
   const walletCurrency = currencyInfo.currencyCode
 
+  // Use provided blockHeight or fall back to state (for callers outside onBlockHeightChanged):
+  const height = blockHeight ?? input.props.walletState.height
+
+  // Calculate confirmations on-the-fly if engine didn't provide valid value:
+  const confirmations = shouldCoreDetermineConfirmations(tx.confirmations)
+    ? determineConfirmations(tx, height, currencyInfo.requiredConfirmations)
+    : tx.confirmations
+
   // Copy the tx properties to the output:
   const out: EdgeTransaction = {
     chainAction: tx.chainAction,
     chainAssetAction: tx.chainAssetAction.get(tokenId),
     blockHeight: tx.blockHeight,
-    confirmations: tx.confirmations,
+    confirmations,
     currencyCode,
     feeRateUsed: tx.feeRateUsed,
     date: tx.date,

src/core/currency/wallet/currency-wallet-callbacks.ts

@@ -227,45 +227,32 @@ export function makeCurrencyWalletCallbacks(
         id: walletId,
         action: 'onBlockHeightChanged',
         updateFunc: () => {
-          // Update transaction confirmation status
-          const { txs } = input.props.walletState
+          // Notify GUI of transactions whose confirmations may have changed.
+          const { txs, files } = input.props.walletState
+          const changedTxs: EdgeTransaction[] = []
           for (const txid of Object.keys(txs)) {
             const reduxTx = txs[txid]
             if (shouldCoreDetermineConfirmations(reduxTx.confirmations)) {
-              const { requiredConfirmations } =
-                input.props.walletState.currencyInfo
-              const { height } = input.props.walletState
-
-              reduxTx.confirmations = determineConfirmations(
-                reduxTx,
-                height,
-                requiredConfirmations
-              )
-
-              // Recreate the EdgeTransaction object
               const txidHash = hashStorageWalletFilename(
                 input.props.state,
                 walletId,
                 reduxTx.txid
               )
-              const { files } = input.props.walletState
               const changedTx = combineTxWithFile(
                 input,
                 reduxTx,
                 files[txidHash],
-                null
+                null,
+                height
               )
-
-              // Dispatch event to update the redux transaction object
-              input.props.dispatch({
-                type: 'CHANGE_MERGE_TX',
-                payload: { tx: reduxTx }
-              })
-              // Dispatch event to update the EdgeTransaction object
-              throttledOnTxChanged([changedTx])
+              changedTxs.push(changedTx)
             }
           }
+          if (changedTxs.length > 0) {
+            throttledOnTxChanged(changedTxs)
+          }
 
+          // Update redux state for other consumers:
           input.props.dispatch({
             type: 'CURRENCY_ENGINE_CHANGED_HEIGHT',
             payload: { height, walletId }
@@ -380,18 +367,6 @@ export function makeCurrencyWalletCallbacks(
         const { isNew, transaction: tx } = txEvent
         const { txid } = tx
 
-        // DEPRECATE: After all currency plugins implement new Confirmations API
-        if (shouldCoreDetermineConfirmations(tx.confirmations)) {
-          const { requiredConfirmations } = input.props.walletState.currencyInfo
-          const { height } = input.props.walletState
-
-          tx.confirmations = determineConfirmations(
-            tx,
-            height,
-            requiredConfirmations
-          )
-        }
-
         // Verify that something has changed:
         const reduxTx = mergeTx(tx, reduxTxs[txid])
         if (compare(reduxTx, reduxTxs[txid]) && tx.metadata == null) continue
@@ -492,7 +467,7 @@ export function watchCurrencyWallet(input: CurrencyWalletInput): void {
  *
  * @deprecated Remove once all currency plugins support the new confirmations API.
  */
-const shouldCoreDetermineConfirmations = (
+export const shouldCoreDetermineConfirmations = (
   confirmations: EdgeConfirmationState | undefined
 ): boolean => {
   return (