Merge pull request #299 from EdgeApp/matthew/fixSpendTargetAmount

Fix spend target native amount
EdgeApp · Nov 8, 2023 · 0ae93d7 · 0ae93d7
2 parents 626da91 + 92ac078
commit 0ae93d7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # edge-exchange-plugins
 
+## Unreleased
+
+- fixed: Use appropriate send amount in spend targets for Uniswap-based providers
+
 ## 1.0.2 (2023-11-06)
 
 - fixed: Check max spendable amount of source wallet in xrpdex quote

diff --git a/src/swap/defi/uni-v2-based/plugins/spookySwap.ts b/src/swap/defi/uni-v2-based/plugins/spookySwap.ts
@@ -56,8 +56,8 @@ export function makeSpookySwapPlugin(
 
     // Sanity check: Both wallets should be of the same chain.
     if (
-      fromWallet.currencyInfo.currencyCode !== 'fantom' ||
-      toWallet.currencyInfo.currencyCode !== 'fantom'
+      fromWallet.currencyInfo.pluginId !== 'fantom' ||
+      toWallet.currencyInfo.pluginId !== 'fantom'
     )
       throw new SwapCurrencyError(swapInfo, request)
 
@@ -104,14 +104,17 @@ export function makeSpookySwapPlugin(
 
     const fromAddress = (await fromWallet.getReceiveAddress()).publicAddress
     // toEdgeUnsignedTxs
-    const edgeSpendInfos = swapTxs.map(swapTx => {
+    const edgeSpendInfos = swapTxs.map((swapTx, i) => {
       // Convert to our spendInfo
       const edgeSpendInfo: EdgeSpendInfo = {
         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
+            nativeAmount:
+              swapTxs.length === 2 && i === 0
+                ? '0' // approval transactions don't have a value
+                : amountToSwap,
             publicAddress: swapTx.to
           }
         ],

diff --git a/src/swap/defi/uni-v2-based/plugins/tombSwap.ts b/src/swap/defi/uni-v2-based/plugins/tombSwap.ts
@@ -56,8 +56,8 @@ export function makeTombSwapPlugin(
 
     // Sanity check: Both wallets should be of the same chain.
     if (
-      fromWallet.currencyInfo.currencyCode !== 'fantom' ||
-      toWallet.currencyInfo.currencyCode !== 'fantom'
+      fromWallet.currencyInfo.pluginId !== 'fantom' ||
+      toWallet.currencyInfo.pluginId !== 'fantom'
     )
       throw new SwapCurrencyError(swapInfo, request)
 
@@ -104,14 +104,17 @@ export function makeTombSwapPlugin(
 
     const fromAddress = (await fromWallet.getReceiveAddress()).publicAddress
     // toEdgeUnsignedTxs
-    const edgeSpendInfos = swapTxs.map(swapTx => {
+    const edgeSpendInfos = swapTxs.map((swapTx, i) => {
       // Convert to our spendInfo
       const edgeSpendInfo: EdgeSpendInfo = {
         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
+            nativeAmount:
+              swapTxs.length === 2 && i === 0
+                ? '0' // approval transactions don't have a value
+                : amountToSwap,
             publicAddress: swapTx.to
           }
         ],

diff --git a/src/swap/defi/uni-v2-based/plugins/velodrome.ts b/src/swap/defi/uni-v2-based/plugins/velodrome.ts
@@ -117,14 +117,17 @@ export function makeVelodromePlugin(
     )
     const fromAddress = (await fromWallet.getReceiveAddress()).publicAddress
     // toEdgeUnsignedTxs
-    const edgeSpendInfos = swapTxs.map(swapTx => {
+    const edgeSpendInfos = swapTxs.map((swapTx, i) => {
       // Convert to our spendInfo
       const edgeSpendInfo: EdgeSpendInfo = {
         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
+            nativeAmount:
+              swapTxs.length === 2 && i === 0
+                ? '0' // approval transactions don't have a value
+                : amountToSwap,
             publicAddress: swapTx.to
           }
         ],