Remove use of legacy memos

Latest edge-currency-accountbased removed use so we must use the new `memos` field or risk having memos dropped
EdgeApp · Apr 5, 2024 · e6083de · e6083de
1 parent 46d3f87
commit e6083de
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/src/swap/defi/lifi.ts b/src/swap/defi/lifi.ts
@@ -353,11 +353,11 @@ export function makeLifiPlugin(opts: EdgeCorePluginOptions): EdgeSwapPlugin {
       tokenId: request.fromTokenId,
       spendTargets: [
         {
-          memo: data,
           nativeAmount: fromNativeAmount,
           publicAddress: approvalAddress
         }
       ],
+      memos: [{ type: 'hex', value: data.replace('0x', '') }],
       networkFeeOption: 'custom',
       customNetworkFee: {
         // XXX Hack. Lifi doesn't properly estimate ethereum gas limits. Increase by 40%

diff --git a/src/swap/defi/thorchain.ts b/src/swap/defi/thorchain.ts
@@ -625,9 +625,12 @@ export function makeThorchainPlugin(
         expirationDate: new Date(Date.now() + EXPIRATION_MS)
       }
     } else {
+      // For UTXO chains, we send the memo as text which gets
+      // encoded by the plugins
       memoType = 'text'
-      // Cannot yet do tokens on non-EVM chains
+
       if (fromTokenId != null) {
+        // Cannot yet do tokens on utxo chains
         throw new SwapCurrencyError(swapInfo, request)
       }
     }

diff --git a/src/swap/defi/thorchainDa.ts b/src/swap/defi/thorchainDa.ts
@@ -447,7 +447,9 @@ export function makeThorchainDaPlugin(
         assetActionType: 'swap'
       },
       memos:
-        memo == null ? [] : [{ type: memoType, value: memo.replace('0x', '') }],
+        memo == null
+          ? undefined
+          : [{ type: memoType, value: memo.replace('0x', '') }],
       savedAction: {
         actionType: 'swap',
         swapInfo,

diff --git a/src/swap/defi/uni-v2-based/plugins/spookySwap.ts b/src/swap/defi/uni-v2-based/plugins/spookySwap.ts
@@ -112,14 +112,17 @@ export function makeSpookySwapPlugin(
         tokenId: request.fromTokenId,
         spendTargets: [
           {
-            memo: swapTx.data,
             nativeAmount:
               swapTxs.length === 2 && i === 0
                 ? '0' // approval transactions don't have a value
                 : amountToSwap,
             publicAddress: swapTx.to
           }
         ],
+        memos:
+          swapTx.data != null
+            ? [{ type: 'hex', value: swapTx.data?.replace('0x', '') }]
+            : undefined,
         customNetworkFee: {
           gasPrice:
             swapTx.gasPrice != null

diff --git a/src/swap/defi/uni-v2-based/plugins/tombSwap.ts b/src/swap/defi/uni-v2-based/plugins/tombSwap.ts
@@ -112,14 +112,17 @@ export function makeTombSwapPlugin(
         tokenId: request.fromTokenId,
         spendTargets: [
           {
-            memo: swapTx.data,
             nativeAmount:
               swapTxs.length === 2 && i === 0
                 ? '0' // approval transactions don't have a value
                 : amountToSwap,
             publicAddress: swapTx.to
           }
         ],
+        memos:
+          swapTx.data != null
+            ? [{ type: 'hex', value: swapTx.data?.replace('0x', '') }]
+            : undefined,
         customNetworkFee: {
           gasPrice:
             swapTx.gasPrice != null

diff --git a/src/swap/defi/uni-v2-based/plugins/velodrome.ts b/src/swap/defi/uni-v2-based/plugins/velodrome.ts
@@ -125,14 +125,17 @@ export function makeVelodromePlugin(
         tokenId: request.fromTokenId,
         spendTargets: [
           {
-            memo: swapTx.data,
             nativeAmount:
               swapTxs.length === 2 && i === 0
                 ? '0' // approval transactions don't have a value
                 : amountToSwap,
             publicAddress: swapTx.to
           }
         ],
+        memos:
+          swapTx.data != null
+            ? [{ type: 'hex', value: swapTx.data?.replace('0x', '') }]
+            : undefined,
         customNetworkFee: {
           gasPrice:
             swapTx.gasPrice != null