@xchainjs/xchain-thorchain-query 0.1.10 → 0.1.11

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-import { assetToBase, formatAssetAmountCurrency, baseToAsset, eqAsset, assetToString, assetFromString, baseAmount, AssetRuneNative, Chain, AssetAtom, AssetAVAX, AssetETH, AssetBNB, AssetDOGE, AssetLTC, AssetBCH, AssetBTC, AvalancheChain, DOGEChain, LTCChain, BCHChain, CosmosChain, THORChain, ETHChain, BTCChain, BNBChain, assetFromStringEx, isAssetRuneNative, assetAmount } from '@xchainjs/xchain-util';
+import { assetToBase, formatAssetAmountCurrency, baseToAsset, eqAsset, assetToString, assetFromString, baseAmount, AssetRuneNative, Chain, AssetAtom, AssetAVAX, AssetETH, AssetBNB, AssetDOGE, AssetLTC, AssetBCH, AssetBTC, AvalancheChain, DOGEChain, LTCChain, BCHChain, CosmosChain, THORChain, ETHChain, BTCChain, BNBChain, assetFromStringEx, isAssetRuneNative, getContractAddressFromAsset, assetAmount } from '@xchainjs/xchain-util';
 import { BigNumber } from 'bignumber.js';
 import { Network } from '@xchainjs/xchain-client';
 import { MidgardApi, Configuration } from '@xchainjs/xchain-midgard';
@@ -1597,6 +1597,15 @@ class ThorchainQuery {
             return swapEstimate;
         });
     }
+    abbreviateAssetString(asset) {
+        const contractAddress = getContractAddressFromAsset(asset);
+        if (contractAddress && contractAddress.length > 5) {
+            const abrev = contractAddress.substring(contractAddress.length - 5);
+            const sep = asset.chain !== Chain.THORChain && asset.synth ? '/' : '.';
+            return `${asset.chain}${sep}${asset.ticker}-${abrev}`;
+        }
+        return assetToString(asset);
+    }
     /**
      *
      * @param params - swap object
@@ -1605,21 +1614,16 @@ class ThorchainQuery {
     constructSwapMemo(params) {
         var _a;
         const limstring = params.limit.amount().toFixed();
-        // create LIM with interface ID
         const lim = limstring.substring(0, limstring.length - 3).concat(params.interfaceID);
-        // create the full memo
-        let memo = `=:${assetToString(params.destinationAsset)}`;
+        let memo = `=:${this.abbreviateAssetString(params.destinationAsset)}:${params.destinationAddress}:${lim}`;
         // NOTE: we should validate affiliate address is EITHER: a thorname or valid thorchain address, currently we cannot do this without importing xchain-thorchain
         if (((_a = params.affiliateAddress) === null || _a === void 0 ? void 0 : _a.length) > 0) {
             // NOTE: we should validate destinationAddress address is valid destination address for the asset type requested
-            memo = memo.concat(`:${params.destinationAddress}:${lim}:${params.affiliateAddress}:${params.affiliateFeeBasisPoints}`);
-        }
-        else {
-            memo = memo.concat(`:${params.destinationAddress}:${lim}`);
+            memo = memo.concat(`:${params.affiliateAddress}:${params.affiliateFeeBasisPoints}`);
         }
         // If memo length is too long for BTC, trim it
         if (eqAsset(params.input.asset, AssetBTC) && memo.length > 80) {
-            memo = `=:${assetToString(params.destinationAsset)}:${params.destinationAddress}`;
+            memo = `=:${this.abbreviateAssetString(params.destinationAsset)}:${params.destinationAddress}:${lim}`;
         }
         return memo;
     }

package/lib/index.js

@@ -1606,6 +1606,15 @@ class ThorchainQuery {
             return swapEstimate;
         });
     }
+    abbreviateAssetString(asset) {
+        const contractAddress = xchainUtil.getContractAddressFromAsset(asset);
+        if (contractAddress && contractAddress.length > 5) {
+            const abrev = contractAddress.substring(contractAddress.length - 5);
+            const sep = asset.chain !== xchainUtil.Chain.THORChain && asset.synth ? '/' : '.';
+            return `${asset.chain}${sep}${asset.ticker}-${abrev}`;
+        }
+        return xchainUtil.assetToString(asset);
+    }
     /**
      *
      * @param params - swap object
@@ -1614,21 +1623,16 @@ class ThorchainQuery {
     constructSwapMemo(params) {
         var _a;
         const limstring = params.limit.amount().toFixed();
-        // create LIM with interface ID
         const lim = limstring.substring(0, limstring.length - 3).concat(params.interfaceID);
-        // create the full memo
-        let memo = `=:${xchainUtil.assetToString(params.destinationAsset)}`;
+        let memo = `=:${this.abbreviateAssetString(params.destinationAsset)}:${params.destinationAddress}:${lim}`;
         // NOTE: we should validate affiliate address is EITHER: a thorname or valid thorchain address, currently we cannot do this without importing xchain-thorchain
         if (((_a = params.affiliateAddress) === null || _a === void 0 ? void 0 : _a.length) > 0) {
             // NOTE: we should validate destinationAddress address is valid destination address for the asset type requested
-            memo = memo.concat(`:${params.destinationAddress}:${lim}:${params.affiliateAddress}:${params.affiliateFeeBasisPoints}`);
-        }
-        else {
-            memo = memo.concat(`:${params.destinationAddress}:${lim}`);
+            memo = memo.concat(`:${params.affiliateAddress}:${params.affiliateFeeBasisPoints}`);
         }
         // If memo length is too long for BTC, trim it
         if (xchainUtil.eqAsset(params.input.asset, xchainUtil.AssetBTC) && memo.length > 80) {
-            memo = `=:${xchainUtil.assetToString(params.destinationAsset)}:${params.destinationAddress}`;
+            memo = `=:${this.abbreviateAssetString(params.destinationAsset)}:${params.destinationAddress}:${lim}`;
         }
         return memo;
     }

package/lib/thorchain-query.d.ts

@@ -45,6 +45,7 @@ export declare class ThorchainQuery {
      * @returns
      */
     private calcSwapEstimate;
+    private abbreviateAssetString;
     /**
      *
      * @param params - swap object

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-thorchain-query",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "license": "MIT",
   "description": "Thorchain query module that is resposible for estimating swap calculations and add/remove liquidity for thorchain ",
   "keywords": [