@shapeshiftoss/swapper 17.0.2 → 17.2.0

package/dist/swappers/thorchain/utils/makeSwapMemo/assertIsValidMemo.d.ts

@@ -0,0 +1,3 @@
+import { ChainId } from '@shapeshiftoss/caip';
+export declare const isValidMemoAddress: (chainId: ChainId, thorId: string, address: string) => boolean;
+export declare const assertIsValidMemo: (memo: string) => void;

package/dist/swappers/thorchain/utils/makeSwapMemo/assertIsValidMemo.js

@@ -0,0 +1,66 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertIsValidMemo = exports.isValidMemoAddress = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
+const multicoin_address_validator_1 = __importDefault(require("multicoin-address-validator"));
+const api_1 = require("../../../../api");
+const thorChainAssetToChainId = new Map([
+    ['ETH', caip_1.ethChainId],
+    ['AVAX', caip_1.avalancheChainId],
+    ['BTC', caip_1.btcChainId],
+    ['BCH', caip_1.bchChainId],
+    ['LTC', caip_1.ltcChainId],
+    ['BNB', caip_1.binanceChainId],
+    ['DOGE', caip_1.dogeChainId],
+    ['GAIA', caip_1.cosmosChainId],
+    ['RUNE', caip_1.thorchainChainId],
+]);
+const isValidMemoAddress = (chainId, thorId, address) => {
+    switch (true) {
+        case thorId.startsWith('ETH.'):
+        case thorId.startsWith('AVAX.'):
+        case thorId.startsWith('BTC.'):
+        case thorId.startsWith('BCH.'):
+        case thorId.startsWith('LTC.'):
+        case thorId.startsWith('BNB.'):
+        case thorId.startsWith('DOGE.'): {
+            const chainLabel = (0, chain_adapters_1.chainIdToChainLabel)(chainId);
+            return multicoin_address_validator_1.default.validate(address, chainLabel);
+        }
+        case thorId.startsWith('GAIA.'):
+            return address.startsWith('cosmos');
+        case thorId.startsWith('RUNE.'):
+            return address.startsWith('thor');
+        default:
+            return false;
+    }
+};
+exports.isValidMemoAddress = isValidMemoAddress;
+const assertIsValidMemo = (memo) => {
+    // BTC (and likely other utxo coins) can only support up to 80 character (byte) memos
+    const MAX_MEMO_LENGTH = 80;
+    const MEMO_PART_DELIMITER = ':';
+    const POOL_PART_DELIMITER = '.';
+    const memoParts = memo.split(MEMO_PART_DELIMITER);
+    const pool = memoParts[1];
+    const address = memoParts[2];
+    const buyAssetChainId = thorChainAssetToChainId.get(pool.split(POOL_PART_DELIMITER)[0]);
+    const isAddressValid = buyAssetChainId
+        ? (0, exports.isValidMemoAddress)(buyAssetChainId, pool, address)
+        : undefined;
+    if (!isAddressValid) {
+        throw new api_1.SwapError(`[makeSwapMemo] - memo ${memo} invalid`, {
+            code: api_1.SwapErrorType.MAKE_MEMO_FAILED,
+        });
+    }
+    if (memo.length > MAX_MEMO_LENGTH) {
+        throw new api_1.SwapError(`[makeSwapMemo] - memo length exceeds ${MAX_MEMO_LENGTH} characters`, {
+            code: api_1.SwapErrorType.MAKE_MEMO_FAILED,
+        });
+    }
+};
+exports.assertIsValidMemo = assertIsValidMemo;

package/dist/swappers/thorchain/utils/makeSwapMemo/makeSwapMemo.js

@@ -4,8 +4,7 @@ exports.makeSwapMemo = exports.abbreviateThorAssetId = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../../api");
 const constants_1 = require("../constants");
-// BTC (and likely other utxo coins) can only support up to 80 character (byte) memos
-const MAX_MEMO_LENGTH = 80;
+const assertIsValidMemo_1 = require("./assertIsValidMemo");
 /**
  * definition of THORChain asset notation
  * https://dev.thorchain.org/thorchain-dev/concepts/memos#asset-notation
@@ -63,11 +62,7 @@ const makeSwapMemo = ({ buyAssetId, destinationAddress, limit }) => {
         : destinationAddress;
     const abbreviatedThorAssetId = (0, exports.abbreviateThorAssetId)(fullThorAssetId);
     const memo = `s:${abbreviatedThorAssetId}:${parsedDestinationAddress}:${limit}:${constants_1.THORCHAIN_AFFILIATE_NAME}:${constants_1.THORCHAIN_AFFILIATE_BIPS}`;
-    if (memo.length > MAX_MEMO_LENGTH) {
-        throw new api_1.SwapError(`[makeSwapMemo] - memo length exceeds ${MAX_MEMO_LENGTH} characters`, {
-            code: api_1.SwapErrorType.MAKE_MEMO_FAILED,
-        });
-    }
+    (0, assertIsValidMemo_1.assertIsValidMemo)(memo);
     return memo;
 };
 exports.makeSwapMemo = makeSwapMemo;

package/dist/swappers/utils/constants.d.ts

@@ -1,3 +1,3 @@
 export declare const APPROVAL_GAS_LIMIT = "100000";
-export declare const DEFAULT_SLIPPAGE = "0.03";
+export declare const DEFAULT_SLIPPAGE = "0.002";
 export declare const ALLOWABLE_MARKET_MOVEMENT = "0.01";

package/dist/swappers/utils/constants.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ALLOWABLE_MARKET_MOVEMENT = exports.DEFAULT_SLIPPAGE = exports.APPROVAL_GAS_LIMIT = void 0;
 exports.APPROVAL_GAS_LIMIT = '100000'; // Most approvals are around 40k, we've seen 72k in the wild, so 100000 for safety.
-exports.DEFAULT_SLIPPAGE = '0.03'; // 3%
+exports.DEFAULT_SLIPPAGE = '0.002'; // .2%
 exports.ALLOWABLE_MARKET_MOVEMENT = '0.01'; // 1%

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "17.0.2",
+  "version": "17.2.0",
   "description": "An interface and implementations to trade coins via various protocols",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",