Merge pull request #323 from EdgeApp/matthew/memoTypes

Add special memo types for Ripple and Stellar
EdgeApp · Apr 19, 2024 · 5a60800 · 5a60800
2 parents 4a4e16d + c52bb68
commit 5a60800
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- added: Special case Ripple and Stellar memo types
+
 ## 2.4.0 (2024-04-05)
 
 - added: Login info to testconfig for testpartners.ts

diff --git a/src/swap/central/changehero.ts b/src/swap/central/changehero.ts
@@ -30,7 +30,7 @@ import {
   makeSwapPluginQuote,
   SwapOrder
 } from '../../util/swapHelpers'
-import { convertRequest, getAddress } from '../../util/utils'
+import { convertRequest, getAddress, memoType } from '../../util/utils'
 import { EdgeSwapRequestPlugin, StringMap } from '../types'
 
 const pluginId = 'changehero'
@@ -323,7 +323,12 @@ export function makeChangeHeroPlugin(
     const memos: EdgeMemo[] =
       quoteInfo.payinExtraId == null
         ? []
-        : [{ type: 'text', value: quoteInfo.payinExtraId }]
+        : [
+            {
+              type: memoType(request.fromWallet.currencyInfo.pluginId),
+              value: quoteInfo.payinExtraId
+            }
+          ]
 
     const spendInfo: EdgeSpendInfo = {
       tokenId: request.fromTokenId,

diff --git a/src/swap/central/changenow.ts b/src/swap/central/changenow.ts
@@ -32,7 +32,7 @@ import {
   makeSwapPluginQuote,
   SwapOrder
 } from '../../util/swapHelpers'
-import { convertRequest, getAddress } from '../../util/utils'
+import { convertRequest, getAddress, memoType } from '../../util/utils'
 import { EdgeSwapRequestPlugin } from '../types'
 const pluginId = 'changenow'
 
@@ -272,7 +272,14 @@ export function makeChangeNowPlugin(
       )
 
       const memos: EdgeMemo[] =
-        payinExtraId == null ? [] : [{ type: 'text', value: payinExtraId }]
+        payinExtraId == null
+          ? []
+          : [
+              {
+                type: memoType(request.fromWallet.currencyInfo.pluginId),
+                value: payinExtraId
+              }
+            ]
 
       const spendInfo: EdgeSpendInfo = {
         tokenId: request.fromTokenId,
@@ -342,7 +349,14 @@ export function makeChangeNowPlugin(
       )
 
       const memos: EdgeMemo[] =
-        payinExtraId == null ? [] : [{ type: 'text', value: payinExtraId }]
+        payinExtraId == null
+          ? []
+          : [
+              {
+                type: memoType(request.fromWallet.currencyInfo.pluginId),
+                value: payinExtraId
+              }
+            ]
 
       const spendInfo: EdgeSpendInfo = {
         tokenId: request.fromTokenId,

diff --git a/src/swap/central/exolix.ts b/src/swap/central/exolix.ts
@@ -30,7 +30,7 @@ import {
   makeSwapPluginQuote,
   SwapOrder
 } from '../../util/swapHelpers'
-import { convertRequest, getAddress } from '../../util/utils'
+import { convertRequest, getAddress, memoType } from '../../util/utils'
 import { EdgeSwapRequestPlugin } from '../types'
 
 const pluginId = 'exolix'
@@ -291,7 +291,12 @@ export function makeExolixPlugin(opts: EdgeCorePluginOptions): EdgeSwapPlugin {
     const memos: EdgeMemo[] =
       quoteInfo.depositExtraId == null
         ? []
-        : [{ type: 'text', value: quoteInfo.depositExtraId }]
+        : [
+            {
+              type: memoType(request.fromWallet.currencyInfo.pluginId),
+              value: quoteInfo.depositExtraId
+            }
+          ]
 
     const spendInfo: EdgeSpendInfo = {
       tokenId: request.fromTokenId,

diff --git a/src/swap/central/godex.ts b/src/swap/central/godex.ts
@@ -30,7 +30,7 @@ import {
   makeSwapPluginQuote,
   SwapOrder
 } from '../../util/swapHelpers'
-import { convertRequest, getAddress } from '../../util/utils'
+import { convertRequest, getAddress, memoType } from '../../util/utils'
 import { asNumberString, EdgeSwapRequestPlugin } from '../types'
 
 const pluginId = 'godex'
@@ -307,7 +307,12 @@ export function makeGodexPlugin(opts: EdgeCorePluginOptions): EdgeSwapPlugin {
     const memos: EdgeMemo[] =
       quoteInfo.deposit_extra_id == null
         ? []
-        : [{ type: 'text', value: quoteInfo.deposit_extra_id }]
+        : [
+            {
+              type: memoType(request.fromWallet.currencyInfo.pluginId),
+              value: quoteInfo.deposit_extra_id
+            }
+          ]
 
     // Make the transaction:
     const spendInfo: EdgeSpendInfo = {

diff --git a/src/swap/central/letsexchange.ts b/src/swap/central/letsexchange.ts
@@ -24,7 +24,7 @@ import {
   makeSwapPluginQuote,
   SwapOrder
 } from '../../util/swapHelpers'
-import { convertRequest, getAddress } from '../../util/utils'
+import { convertRequest, getAddress, memoType } from '../../util/utils'
 import { asNumberString, EdgeSwapRequestPlugin } from '../types'
 import { asOptionalBlank } from './changenow'
 
@@ -318,7 +318,12 @@ export function makeLetsExchangePlugin(
     const memos: EdgeMemo[] =
       quoteInfo.deposit_extra_id == null
         ? []
-        : [{ type: 'text', value: quoteInfo.deposit_extra_id }]
+        : [
+            {
+              type: memoType(request.fromWallet.currencyInfo.pluginId),
+              value: quoteInfo.deposit_extra_id
+            }
+          ]
 
     // Make the transaction:
     const spendInfo: EdgeSpendInfo = {

diff --git a/src/swap/central/sideshift.ts b/src/swap/central/sideshift.ts
@@ -25,7 +25,7 @@ import {
   makeSwapPluginQuote,
   SwapOrder
 } from '../../util/swapHelpers'
-import { convertRequest, getAddress } from '../../util/utils'
+import { convertRequest, getAddress, memoType } from '../../util/utils'
 import { EdgeSwapRequestPlugin } from '../types'
 
 // See https://help.sideshift.ai/en/articles/4559664-which-coins-and-tokens-are-listed for list of supported currencies
@@ -279,7 +279,12 @@ const fetchSwapQuoteInner = async (
   const memos: EdgeMemo[] =
     order.depositMemo == null
       ? []
-      : [{ type: 'text', value: order.depositMemo }]
+      : [
+          {
+            type: memoType(request.fromWallet.currencyInfo.pluginId),
+            value: order.depositMemo
+          }
+        ]
 
   const spendInfo: EdgeSpendInfo = {
     tokenId: request.fromTokenId,

diff --git a/src/swap/central/swapuz.ts b/src/swap/central/swapuz.ts
@@ -32,7 +32,7 @@ import {
   makeSwapPluginQuote,
   SwapOrder
 } from '../../util/swapHelpers'
-import { convertRequest, getAddress } from '../../util/utils'
+import { convertRequest, getAddress, memoType } from '../../util/utils'
 import { EdgeSwapRequestPlugin } from '../types'
 
 const pluginId = 'swapuz'
@@ -255,7 +255,14 @@ export function makeSwapuzPlugin(opts: EdgeCorePluginOptions): EdgeSwapPlugin {
       )
 
       const memos: EdgeMemo[] =
-        memoFrom == null ? [] : [{ type: 'text', value: memoFrom }]
+        memoFrom == null
+          ? []
+          : [
+              {
+                type: memoType(request.fromWallet.currencyInfo.pluginId),
+                value: memoFrom
+              }
+            ]
 
       const spendInfo: EdgeSpendInfo = {
         tokenId: request.fromTokenId,

diff --git a/src/util/utils.ts b/src/util/utils.ts
@@ -3,6 +3,7 @@ import {
   EdgeCurrencyWallet,
   EdgeFetchFunction,
   EdgeFetchResponse,
+  EdgeMemoOption,
   EdgeSwapRequest
 } from 'edge-core-js'
 
@@ -192,3 +193,11 @@ export const hexToDecimal = (hex: string): string => {
     return add(`0x${hex}`, '0')
   }
 }
+
+const pluginIdMemoTypes: { [pluginId: string]: EdgeMemoOption['type'] } = {
+  ripple: 'number',
+  stellar: 'number'
+}
+export const memoType = (pluginId: string): EdgeMemoOption['type'] => {
+  return pluginIdMemoTypes[pluginId] ?? 'text'
+}