Update deposit and withdraw memo (#911)

* fix: affiliate info taking place of pair addr when pair address is not present * fix: remove affiliate info from withdraw memos * chore: changeset
thorswap · Jul 17, 2024 · ebe27fa · ebe27fa
1 parent f763277
commit ebe27fa
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/.changeset/bright-pianos-occur.md b/.changeset/bright-pianos-occur.md
@@ -0,0 +1,5 @@
+---
+"@swapkit/helpers": patch
+---
+
+remove affiliate info from withdraw memos, and fix pair address spot being taken buy affiliate info.
diff --git a/packages/swapkit/helpers/src/helpers/__tests__/memo.test.ts b/packages/swapkit/helpers/src/helpers/__tests__/memo.test.ts
@@ -73,6 +73,16 @@ describe("getMemoForDeposit", () => {
     const result = getMemoForDeposit({ chain: Chain.Ethereum, symbol: "ETH" });
     expect(result).toBe("+:ETH.ETH");
   });
+
+  test("returns correct memo when paired address is not available but affiliate info is present", () => {
+    const result = getMemoForDeposit({
+      chain: Chain.Ethereum,
+      symbol: "ETH",
+      affiliateAddress: "thor1abc123",
+      affiliateBasisPoints: 500,
+    });
+    expect(result).toBe("+:ETH.ETH::thor1abc123:500");
+  });
 });
 
 describe("getMemoForWithdraw", () => {

diff --git a/packages/swapkit/helpers/src/helpers/memo.ts b/packages/swapkit/helpers/src/helpers/memo.ts
@@ -128,7 +128,8 @@ export function getMemoForDeposit({
   address?: string;
 }>) {
   const poolIdentifier = getPoolIdentifier({ chain, symbol });
-  const addressPart = address ? `:${address}` : "";
+  const hasAffiliateInfo = !!affiliate.affiliateAddress;
+  const addressPart = address ? `:${address}` : hasAffiliateInfo ? ":" : "";
 
   return addAffiliate(`${MemoType.DEPOSIT}:${poolIdentifier}${addressPart}`, affiliate);
 }
@@ -137,9 +138,8 @@ export function getMemoForSaverWithdraw({
   chain,
   symbol,
   basisPoints,
-  ...affiliate
-}: WithAffiliate<{ chain: Chain; symbol: string; basisPoints: number }>) {
-  return addAffiliate(`${MemoType.WITHDRAW}:${chain}/${symbol}:${basisPoints}`, affiliate);
+}: { chain: Chain; symbol: string; basisPoints: number }) {
+  return `${MemoType.WITHDRAW}:${chain}/${symbol}:${basisPoints}`;
 }
 
 export function getMemoForWithdraw({
@@ -148,22 +148,18 @@ export function getMemoForWithdraw({
   ticker,
   basisPoints,
   targetAsset,
-  ...affiliate
-}: WithAffiliate<{
+}: {
   chain: Chain;
   symbol: string;
   ticker: string;
   basisPoints: number;
   targetAsset?: string;
-}>) {
+}) {
   const shortenedSymbol =
     chain === "ETH" && ticker !== "ETH" ? `${ticker}-${symbol.slice(-3)}` : symbol;
   const targetPart = targetAsset ? `:${targetAsset}` : "";
 
-  return addAffiliate(
-    `${MemoType.WITHDRAW}:${chain}.${shortenedSymbol}:${basisPoints}${targetPart}`,
-    affiliate,
-  );
+  return `${MemoType.WITHDRAW}:${chain}.${shortenedSymbol}:${basisPoints}${targetPart}`;
 }
 
 /**