Implement saveTxAction

EdgeApp · Dec 6, 2023 · 20449ef · 20449ef
1 parent 24fdc13
commit 20449ef
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 7 deletions.
diff --git a/src/core/currency/wallet/currency-wallet-api.ts b/src/core/currency/wallet/currency-wallet-api.ts
@@ -9,6 +9,7 @@ import {
 } from '../../../client-side'
 import { upgradeCurrencyCode } from '../../../types/type-helpers'
 import {
+  EdgeAssetAction,
   EdgeBalances,
   EdgeCurrencyCodeOptions,
   EdgeCurrencyConfig,
@@ -31,6 +32,7 @@ import {
   EdgeStakingStatus,
   EdgeStreamTransactionOptions,
   EdgeTransaction,
+  EdgeTxAction,
   EdgeWalletInfo
 } from '../../../types/types'
 import { mergeDeeply } from '../../../util/util'
@@ -561,6 +563,28 @@ export function makeCurrencyWalletApi(
       await engine.saveTx(tx)
       fakeCallbacks.onTransactionsChanged([tx])
     },
+    async saveTxAction(
+      txid: string,
+      tokenId: string | null,
+      assetAction: EdgeAssetAction,
+      savedAction: EdgeTxAction
+    ): Promise<void> {
+      const { accountApi } = input.props.output.accounts[accountId]
+      const { allTokens, currencyInfo } = accountApi.currencyConfig[pluginId]
+      const { currencyCode } =
+        tokenId == null ? currencyInfo : allTokens[tokenId]
+
+      await setCurrencyWalletTxMetadata(
+        input,
+        txid,
+        currencyCode,
+        tokenId,
+        fakeCallbacks,
+        undefined,
+        assetAction,
+        savedAction
+      )
+    },
     async saveTxMetadata(
       txid: string,
       currencyCode: string,
@@ -580,8 +604,8 @@ export function makeCurrencyWalletApi(
         txid,
         currencyCode,
         tokenId,
-        packMetadata(metadata, input.props.walletState.fiat),
-        fakeCallbacks
+        fakeCallbacks,
+        packMetadata(metadata, input.props.walletState.fiat)
       )
     },
     async signMessage(

diff --git a/src/core/currency/wallet/currency-wallet-files.ts b/src/core/currency/wallet/currency-wallet-files.ts
@@ -2,8 +2,10 @@ import { number as currencyFromNumber } from 'currency-codes'
 import { Disklet, justFiles, navigateDisklet } from 'disklet'
 
 import {
+  EdgeAssetAction,
   EdgeCurrencyEngineCallbacks,
-  EdgeTransaction
+  EdgeTransaction,
+  EdgeTxAction
 } from '../../../types/types'
 import { makeJsonFile } from '../../../util/file-helpers'
 import { mergeDeeply } from '../../../util/util'
@@ -419,8 +421,10 @@ export async function setCurrencyWalletTxMetadata(
   txid: string,
   currencyCode: string,
   tokenId: string | null,
-  metadata: DiskMetadata,
-  fakeCallbacks: EdgeCurrencyEngineCallbacks
+  fakeCallbacks: EdgeCurrencyEngineCallbacks,
+  metadata?: DiskMetadata,
+  assetAction?: EdgeAssetAction,
+  savedAction?: EdgeTxAction
 ): Promise<void> {
   const { dispatch, state, walletId } = input.props
   const disklet = getStorageWalletDisklet(state, walletId)
@@ -459,12 +463,22 @@ export async function setCurrencyWalletTxMetadata(
     txid,
     internal: false,
     creationDate,
+    savedAction,
     currencies: {},
     tokens: {}
   }
-  newFile.currencies[currencyCode] = {
-    metadata
+  if (metadata != null) {
+    newFile.currencies[currencyCode] = {
+      metadata
+    }
+  }
+
+  if (assetAction != null) {
+    newFile.tokens[tokenId ?? PARENT_TOKEN_ID] = {
+      assetAction
+    }
   }
+
   const json = mergeDeeply(oldFile, newFile)
 
   // Save the new file:

diff --git a/src/types/types.ts b/src/types/types.ts
@@ -1123,6 +1123,13 @@ export interface EdgeCurrencyWallet {
   ) => Promise<EdgePaymentProtocolInfo>
   readonly makeSpend: (spendInfo: EdgeSpendInfo) => Promise<EdgeTransaction>
   readonly saveTx: (tx: EdgeTransaction) => Promise<void>
+  readonly saveTxAction: (
+    txid: string,
+    tokenId: string | null,
+    assetAction: EdgeAssetAction,
+    savedAction: EdgeTxAction
+  ) => Promise<void>
+
   readonly saveTxMetadata: (
     txid: string,
     currencyCode: string,

diff --git a/test/core/currency/wallet/currency-wallet.test.ts b/test/core/currency/wallet/currency-wallet.test.ts
@@ -529,8 +529,28 @@ describe('currency wallets', function () {
       name: 'me',
       amountFiat: 0.75
     }
+    const assetAction: EdgeAssetAction = {
+      assetActionType: 'swap'
+    }
+    const savedAction: EdgeTxAction = {
+      actionType: 'swap',
+      orderId: 'myorderid',
+      canBePartial: false,
+      sourceAsset: {
+        pluginId: 'bitcoin',
+        tokenId: undefined,
+        nativeAmount: '1234'
+      },
+      destAsset: {
+        pluginId: 'ethereum',
+        tokenId: 'mytokenid',
+        nativeAmount: '2345'
+      }
+    }
+
     await config.changeUserSettings({ txs: { a: { nativeAmount: '25' } } })
     await wallet.saveTxMetadata('a', 'FAKE', metadata)
+    await wallet.saveTxAction('a', null, assetAction, savedAction)
 
     const txs = await wallet.getTransactions({})
     expect(txs.length).equals(1)
@@ -542,6 +562,7 @@ describe('currency wallets', function () {
       exchangeAmount: { 'iso:USD': 0.75 },
       ...metadata
     })
+    expect(txs[0].savedAction).deep.equals(savedAction)
   })
 
   it('can be paused and un-paused', async function () {