Move EVM data to EdgeMemo

EdgeApp · Sep 15, 2023 · 37f6143 · 37f6143
1 parent 85911ca
commit 37f6143
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 18 deletions.
diff --git a/src/swap/defi/defiUtils.ts b/src/swap/defi/defiUtils.ts
@@ -1,4 +1,4 @@
-import { EdgeCurrencyInfo, EdgeMetaToken } from 'edge-core-js/types'
+import { EdgeCurrencyInfo, EdgeMemo, EdgeMetaToken } from 'edge-core-js/types'
 import { ethers } from 'ethers'
 
 import abi from './abi/THORCHAIN_SWAP_ABI'
@@ -139,3 +139,10 @@ export const getEvmTokenData = async (params: {
   if (tx.data == null) throw new Error('No data in tx object')
   return tx.data
 }
+
+export const makeDataEdgeMemo = (data: string): EdgeMemo => ({
+  type: 'hex',
+  value: data,
+  hidden: true,
+  memoName: 'data'
+})
diff --git a/src/swap/defi/lifi.ts b/src/swap/defi/lifi.ts
@@ -29,7 +29,7 @@ import {
   promiseWithTimeout
 } from '../../util/utils'
 import { asNumberString, EdgeSwapRequestPlugin, StringMap } from '../types'
-import { getEvmApprovalData } from './defiUtils'
+import { getEvmApprovalData, makeDataEdgeMemo } from './defiUtils'
 
 const pluginId = 'lifi'
 const swapInfo: EdgeSwapInfo = {
@@ -311,11 +311,11 @@ export function makeLifiPlugin(opts: EdgeCorePluginOptions): EdgeSwapPlugin {
         currencyCode: request.fromCurrencyCode,
         spendTargets: [
           {
-            memo: approvalData,
             nativeAmount: '0',
             publicAddress: fromContractAddress
           }
         ],
+        memos: approvalData != null ? [makeDataEdgeMemo(approvalData)] : [],
         networkFeeOption: 'custom',
         customNetworkFee: {
           gasPrice: gasPriceGwei
@@ -332,11 +332,11 @@ export function makeLifiPlugin(opts: EdgeCorePluginOptions): EdgeSwapPlugin {
       currencyCode: request.fromCurrencyCode,
       spendTargets: [
         {
-          memo: data,
           nativeAmount: mul(transactionRequest.value, '1'),
           publicAddress: approvalAddress
         }
       ],
+      memos: [makeDataEdgeMemo(data)],
       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
@@ -40,7 +40,11 @@ import {
   QueryParams
 } from '../../util/utils'
 import { EdgeSwapRequestPlugin } from '../types'
-import { getEvmApprovalData, getEvmTokenData } from './defiUtils'
+import {
+  getEvmApprovalData,
+  getEvmTokenData,
+  makeDataEdgeMemo
+} from './defiUtils'
 
 const pluginId = 'thorchain'
 const swapInfo: EdgeSwapInfo = {
@@ -564,11 +568,11 @@ export function makeThorchainPlugin(
         currencyCode: request.fromCurrencyCode,
         spendTargets: [
           {
-            memo: approvalData,
             nativeAmount: '0',
             publicAddress: sourceTokenContractAddress
           }
         ],
+        memos: [makeDataEdgeMemo(approvalData)],
         metadata: {
           name: 'Thorchain',
           category: 'expense:Token Approval'
@@ -581,12 +585,11 @@ export function makeThorchainPlugin(
       currencyCode: request.fromCurrencyCode,
       spendTargets: [
         {
-          memo,
           nativeAmount: ethNativeAmount,
           publicAddress
         }
       ],
-
+      memos: [makeDataEdgeMemo(memo)],
       swapData: {
         isEstimate: false,
         payoutAddress: toAddress,

diff --git a/src/swap/defi/thorchainDa.ts b/src/swap/defi/thorchainDa.ts
@@ -39,7 +39,11 @@ import {
 } from '../../util/utils'
 import { EdgeSwapRequestPlugin } from '../types'
 import { abiMap } from './abi/abiMap'
-import { getEvmApprovalData, getEvmTokenData } from './defiUtils'
+import {
+  getEvmApprovalData,
+  getEvmTokenData,
+  makeDataEdgeMemo
+} from './defiUtils'
 import {
   asExchangeInfo,
   asInboundAddresses,
@@ -409,11 +413,11 @@ export function makeThorchainDaPlugin(
         currencyCode: fromMainnetCode,
         spendTargets: [
           {
-            memo: approvalData,
             nativeAmount: '0',
             publicAddress: sourceTokenContractAddress
           }
         ],
+        memos: [makeDataEdgeMemo(approvalData)],
         metadata: {
           name: 'Thorchain DEX Aggregator',
           category: 'expense:Token Approval'
@@ -426,12 +430,11 @@ export function makeThorchainDaPlugin(
       currencyCode: request.fromCurrencyCode,
       spendTargets: [
         {
-          memo,
           nativeAmount: ethNativeAmount,
           publicAddress
         }
       ],
-
+      memos: [makeDataEdgeMemo(memo)],
       swapData: {
         isEstimate,
         payoutAddress: toAddress,

diff --git a/src/swap/defi/uni-v2-based/plugins/spookySwap.ts b/src/swap/defi/uni-v2-based/plugins/spookySwap.ts
@@ -18,7 +18,11 @@ import {
 } from '../../../../swap-helpers'
 import { convertRequest } from '../../../../util/utils'
 import { EdgeSwapRequestPlugin } from '../../../types'
-import { getInOutTokenAddresses, InOutTokenAddresses } from '../../defiUtils'
+import {
+  getInOutTokenAddresses,
+  InOutTokenAddresses,
+  makeDataEdgeMemo
+} from '../../defiUtils'
 import {
   getFtmProvider,
   makeSpookySwapRouterContract,
@@ -113,7 +117,6 @@ export function makeSpookySwapPlugin(
         currencyCode: request.fromCurrencyCode, // what is being sent out, only if token. Blank if not token
         spendTargets: [
           {
-            memo: swapTx.data,
             nativeAmount: swapTx.value != null ? swapTx.value.toString() : '0', // biggy/number string integer
             publicAddress: swapTx.to
           }
@@ -125,6 +128,7 @@ export function makeSpookySwapPlugin(
               : '0',
           gasLimit: swapTx.gasLimit?.toString() ?? '0'
         },
+        memos: swapTx.data != null ? [makeDataEdgeMemo(swapTx.data)] : [],
         networkFeeOption: 'custom',
         swapData: {
           isEstimate: false,

diff --git a/src/swap/defi/uni-v2-based/plugins/tombSwap.ts b/src/swap/defi/uni-v2-based/plugins/tombSwap.ts
@@ -18,7 +18,11 @@ import {
 } from '../../../../swap-helpers'
 import { convertRequest } from '../../../../util/utils'
 import { EdgeSwapRequestPlugin } from '../../../types'
-import { getInOutTokenAddresses, InOutTokenAddresses } from '../../defiUtils'
+import {
+  getInOutTokenAddresses,
+  InOutTokenAddresses,
+  makeDataEdgeMemo
+} from '../../defiUtils'
 import {
   getFtmProvider,
   makeTombSwapRouterContract,
@@ -113,7 +117,6 @@ export function makeTombSwapPlugin(
         currencyCode: request.fromCurrencyCode, // what is being sent out, only if token. Blank if not token
         spendTargets: [
           {
-            memo: swapTx.data,
             nativeAmount: swapTx.value != null ? swapTx.value.toString() : '0', // biggy/number string integer
             publicAddress: swapTx.to
           }
@@ -125,6 +128,7 @@ export function makeTombSwapPlugin(
               : '0',
           gasLimit: swapTx.gasLimit?.toString() ?? '0'
         },
+        memos: swapTx.data != null ? [makeDataEdgeMemo(swapTx.data)] : [],
         networkFeeOption: 'custom',
         swapData: {
           isEstimate: false,

diff --git a/src/swap/defi/uni-v2-based/plugins/velodrome.ts b/src/swap/defi/uni-v2-based/plugins/velodrome.ts
@@ -20,7 +20,7 @@ import { convertRequest } from '../../../../util/utils'
 import { EdgeSwapRequestPlugin } from '../../../types'
 import VELODROME_V1_ROUTER_ABI from '../../abi/VELODROME_V1_ROUTER_ABI'
 import WRAPPED_OPTIMISM_ETH_ABI from '../../abi/WRAPPED_OPTIMISM_ETH_ABI'
-import { getInOutTokenAddresses } from '../../defiUtils'
+import { getInOutTokenAddresses, makeDataEdgeMemo } from '../../defiUtils'
 import { getSwapAmounts, getSwapTransactions } from '../uniV2Utils'
 
 const swapInfo: EdgeSwapInfo = {
@@ -128,7 +128,6 @@ export function makeVelodromePlugin(
         currencyCode: request.fromCurrencyCode, // what is being sent out, only if token. Blank if not token
         spendTargets: [
           {
-            memo: swapTx.data,
             nativeAmount: swapTx.value != null ? swapTx.value.toString() : '0', // biggy/number string integer
             publicAddress: swapTx.to
           }
@@ -140,6 +139,7 @@ export function makeVelodromePlugin(
               : '0',
           gasLimit: swapTx.gasLimit?.toString() ?? '0'
         },
+        memos: swapTx.data != null ? [makeDataEdgeMemo(swapTx.data)] : [],
         networkFeeOption: 'custom',
         swapData: {
           isEstimate: false,