Merge pull request #289 from EdgeApp/matthew/moveData

Fix data field placement
EdgeApp · Sep 14, 2023 · 220e213 · 220e213
2 parents 051968a + 21f4eca
commit 220e213
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/src/swap/defi/uni-v2-based/plugins/spookySwap.ts b/src/swap/defi/uni-v2-based/plugins/spookySwap.ts
@@ -113,20 +113,17 @@ 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,
-
-            otherParams: {
-              data: swapTx.data
-            }
+            publicAddress: swapTx.to
           }
         ],
         customNetworkFee: {
           gasPrice:
             swapTx.gasPrice != null
               ? ethers.utils.formatUnits(swapTx.gasPrice, 'gwei').toString()
               : '0',
-          gasLimits: swapTx.gasLimit?.toString() ?? '0'
+          gasLimit: swapTx.gasLimit?.toString() ?? '0'
         },
         networkFeeOption: 'custom',
         swapData: {

diff --git a/src/swap/defi/uni-v2-based/plugins/tombSwap.ts b/src/swap/defi/uni-v2-based/plugins/tombSwap.ts
@@ -113,12 +113,9 @@ 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,
-
-            otherParams: {
-              data: swapTx.data
-            }
+            publicAddress: swapTx.to
           }
         ],
         customNetworkFee: {

diff --git a/src/swap/defi/uni-v2-based/plugins/velodrome.ts b/src/swap/defi/uni-v2-based/plugins/velodrome.ts
@@ -128,12 +128,9 @@ 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,
-
-            otherParams: {
-              data: swapTx.data
-            }
+            publicAddress: swapTx.to
           }
         ],
         customNetworkFee: {