Add tokenId denom conversion utils

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- added: Add tokenId-based denomination conversion utils to wallets
+- added: Add `payoutTokenId` to `EdgeTxSwap`
+
 ## 2.36.0 (2025-11-04)
 
 - added: Added `EdgeSubscribedAddress` type for `onSubscribeAddresses` and `startEngine`.

src/core/currency/currency-selectors.ts

@@ -1,10 +1,13 @@
 import {
   EdgeCurrencyInfo,
   EdgeCurrencyWallet,
+  EdgeToken,
+  EdgeTokenId,
   EdgeTokenMap
 } from '../../types/types'
 import { ApiInput, RootProps } from '../root-pixie'
 
+/** @deprecated Use `getTokenMultiplier` instead. */
 export function getCurrencyMultiplier(
   currencyInfo: EdgeCurrencyInfo,
   allTokens: EdgeTokenMap,
@@ -28,6 +31,31 @@ export function getCurrencyMultiplier(
   return '1'
 }
 
+export function getTokenMultiplier(
+  currencyInfo: EdgeCurrencyInfo,
+  allTokens: EdgeTokenMap,
+  tokenId: EdgeTokenId
+): string {
+  if (tokenId == null) {
+    for (const denomination of currencyInfo.denominations) {
+      if (denomination.name === currencyInfo.currencyCode) {
+        return denomination.multiplier
+      }
+    }
+  } else {
+    const token: EdgeToken | undefined = allTokens[tokenId]
+    if (token != null) {
+      for (const denomination of token.denominations) {
+        if (denomination.name === token.currencyCode) {
+          return denomination.multiplier
+        }
+      }
+    }
+  }
+
+  return '1'
+}
+
 export function waitForCurrencyWallet(
   ai: ApiInput,
   walletId: string

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

@@ -10,6 +10,7 @@ import {
 } from '../../../client-side'
 import {
   upgradeCurrencyCode,
+  upgradeSwapData,
   upgradeTxNetworkFees
 } from '../../../types/type-helpers'
 import {
@@ -42,7 +43,10 @@ import {
 import { makeMetaTokens } from '../../account/custom-tokens'
 import { toApiInput } from '../../root-pixie'
 import { makeStorageWalletApi } from '../../storage/storage-api'
-import { getCurrencyMultiplier } from '../currency-selectors'
+import {
+  getCurrencyMultiplier,
+  getTokenMultiplier
+} from '../currency-selectors'
 import { makeCurrencyWalletCallbacks } from './currency-wallet-callbacks'
 import {
   asEdgeAssetAction,
@@ -162,6 +166,28 @@ export function makeCurrencyWalletApi(
     get currencyInfo(): EdgeCurrencyInfo {
       return plugin.currencyInfo
     },
+    async convertDenominatedToNative(
+      denominatedAmount: string,
+      tokenId: EdgeTokenId
+    ): Promise<string> {
+      const multiplier = getTokenMultiplier(
+        plugin.currencyInfo,
+        input.props.state.accounts[accountId].allTokens[pluginId],
+        tokenId
+      )
+      return mul(denominatedAmount, multiplier)
+    },
+    async convertNativeToDenominated(
+      nativeAmount: string,
+      tokenId: EdgeTokenId
+    ): Promise<string> {
+      const multiplier = getTokenMultiplier(
+        plugin.currencyInfo,
+        input.props.state.accounts[accountId].allTokens[pluginId],
+        tokenId
+      )
+      return div(nativeAmount, multiplier, multiplier.length)
+    },
     async denominationToNative(
       denominatedAmount: string,
       currencyCode: string
@@ -597,9 +623,12 @@ export function makeCurrencyWalletApi(
       tx.currencyCode = upgradedCurrency.currencyCode
       tx.tokenId = upgradedCurrency.tokenId
       if (metadata != null) tx.metadata = metadata
-      if (swapData != null) tx.swapData = asEdgeTxSwap(swapData)
       if (savedAction != null) tx.savedAction = asEdgeTxAction(savedAction)
       if (assetAction != null) tx.assetAction = asEdgeAssetAction(assetAction)
+      if (swapData != null) {
+        tx.swapData = asEdgeTxSwap(swapData)
+        upgradeSwapData(tx)
+      }
       if (input.props.state.login.deviceDescription != null)
         tx.deviceDescription = input.props.state.login.deviceDescription
 

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

@@ -120,6 +120,8 @@ interface LegacyMapFile {
 // building-block cleaners
 // ---------------------------------------------------------------------
 
+export const asEdgeTokenId = asEither(asString, asNull)
+
 const asFeeRate: Cleaner<'high' | 'standard' | 'low'> = asValue(
   'high',
   'standard',
@@ -141,6 +143,7 @@ export const asEdgeTxSwap = asObject<EdgeTxSwap>({
   // Address information:
   payoutAddress: asString,
   payoutCurrencyCode: asString,
+  payoutTokenId: asEdgeTokenId,
   payoutNativeAmount: asString,
   payoutWalletId: asString,
   refundAddress: asOptional(asString)
@@ -158,8 +161,6 @@ export function asIntegerString(raw: unknown): string {
 // file cleaners
 // ---------------------------------------------------------------------
 
-export const asEdgeTokenId = asEither(asString, asNull)
-
 export const asEdgeAssetAmount = asObject<EdgeAssetAmount>({
   pluginId: asString,
   tokenId: asEdgeTokenId,

src/types/type-helpers.ts

@@ -56,3 +56,12 @@ export const upgradeTxNetworkFees = (tx: EdgeTransaction): void => {
     }
   }
 }
+
+// Swap data could be present without the payoutTokenId. We can add it if there's a swap savedAction present.
+export const upgradeSwapData = (tx: EdgeTransaction): void => {
+  if (tx.swapData != null && tx.swapData?.payoutTokenId === undefined) {
+    if (tx.savedAction != null && tx.savedAction.actionType === 'swap') {
+      tx.swapData.payoutTokenId = tx.savedAction.toAsset.tokenId
+    }
+  }
+}

src/types/types.ts

@@ -569,6 +569,7 @@ export interface EdgeTxSwap {
   payoutAddress: string
   payoutCurrencyCode: string
   payoutNativeAmount: string
+  payoutTokenId: EdgeTokenId
   payoutWalletId: string
   refundAddress?: string
 }
@@ -1368,6 +1369,16 @@ export interface EdgeCurrencyWallet {
   // Generic:
   readonly otherMethods: EdgeOtherMethods
 
+  readonly convertDenominatedToNative: (
+    denominatedAmount: string,
+    tokenId: EdgeTokenId
+  ) => Promise<string>
+
+  readonly convertNativeToDenominated: (
+    nativeAmount: string,
+    tokenId: EdgeTokenId
+  ) => Promise<string>
+
   /** @deprecated Use the information in EdgeCurrencyInfo / EdgeToken. */
   readonly denominationToNative: (
     denominatedAmount: string,

test/core/currency/wallet/currency-wallet.test.ts

@@ -558,6 +558,7 @@ describe('currency wallets', function () {
       },
       payoutAddress: 'get it here',
       payoutCurrencyCode: 'TOKEN',
+      payoutTokenId: 'TOKEN',
       payoutNativeAmount: '1',
       payoutWalletId: wallet.id
     }

test/fake/fake-transactions.ts

@@ -278,6 +278,7 @@ export const walletTxs: { [txid: string]: Partial<EdgeTransaction> } = {
       },
       payoutAddress: '0x1d21f26739b20caf898aa1d2c37007577309e466',
       payoutCurrencyCode: 'eth',
+      payoutTokenId: null,
       payoutNativeAmount: '85486000000000000',
       payoutWalletId: '2D6BLbfk/Ex8jIt8wvy/uuD2rRjGklj00gW0gUfxrnc=',
       refundAddress: '33zRiHEfmpt9Hirga6GQb8Xp71veiq3NhJ'
@@ -328,6 +329,7 @@ export const walletTxs: { [txid: string]: Partial<EdgeTransaction> } = {
       },
       payoutAddress: '0x1d21f26739b20caf898aa1d2c37007577309e466',
       payoutCurrencyCode: 'eth',
+      payoutTokenId: null,
       payoutNativeAmount: '45188000000000000',
       payoutWalletId: '2D6BLbfk/Ex8jIt8wvy/uuD2rRjGklj00gW0gUfxrnc=',
       refundAddress: '33eFPT8vFvgCHMijNR7LpqNZBMR2utcq1P'
@@ -378,6 +380,7 @@ export const walletTxs: { [txid: string]: Partial<EdgeTransaction> } = {
       },
       payoutAddress: 'MKC9DxwFjXCSprj6HNXBvvqDGviMrTmV9q',
       payoutCurrencyCode: 'ltc',
+      payoutTokenId: null,
       payoutNativeAmount: '12518100',
       payoutWalletId: 'aumm1+iQsXDXxiSYzuX8qToQpwQXX03CTVKomKPTLaQ=',
       refundAddress: '33eFPT8vFvgCHMijNR7LpqNZBMR2utcq1P'