@xchainjs/xchain-thorchain-query 0.6.8 → 0.6.10

package/lib/index.esm.js

@@ -1160,12 +1160,11 @@ class ThorchainQuery {
      */
     quoteSwap({ fromAsset, destinationAsset, amount, destinationAddress, streamingInterval, streamingQuantity, fromAddress, toleranceBps, affiliateBps, affiliateAddress, height, }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const errors = [];
-            const validAssetDecimals = yield this.isValidAssetDecimals(fromAsset, amount);
             // validates swap, and pushes error if there is one
-            if (validAssetDecimals) {
-                errors.push(`${validAssetDecimals}`);
-            }
+            const errors = [];
+            const error = yield this.validateAmount(amount);
+            if (error)
+                errors.push(error.message);
             const fromAssetString = assetToString(fromAsset);
             const toAssetString = assetToString(destinationAsset);
             const inputAmount = getBaseAmountWithDiffDecimals(amount, 8);
@@ -1245,24 +1244,15 @@ class ThorchainQuery {
         });
     }
     /**
-     *
-     * @param params - quote swap params
-     * @returns boolean
+     * Validate a cryptoAmount is well formed
+     * @param {CryptoAmount} cryptoAmount - CryptoAmount to validate
+     * @returns {void | Error} Error if the cryptoAmount is not well formed
      */
-    isValidAssetDecimals(fromAsset, inputAmount) {
+    validateAmount(cryptoAmount) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (isAssetRuneNative(fromAsset) || fromAsset.synth) {
-                if (inputAmount.baseAmount.decimal !== 8) {
-                    return `input asset ${assetToString(fromAsset)} must have decimals of 8`;
-                }
-            }
-            else {
-                const nativeDecimals = yield this.thorchainCache.midgardQuery.getDecimalForAsset(fromAsset);
-                if (nativeDecimals && nativeDecimals !== -1 && inputAmount.baseAmount.decimal !== nativeDecimals) {
-                    return `input asset ${assetToString(fromAsset)} must have decimals of ${nativeDecimals}`;
-                }
-            }
-            return undefined; // Explicitly return undefined if no conditions are met
+            const assetDecimals = yield this.thorchainCache.midgardQuery.getDecimalForAsset(cryptoAmount.asset);
+            if (cryptoAmount.baseAmount.decimal !== assetDecimals)
+                return new Error(`Invalid number of decimals: ${assetToString(cryptoAmount.asset)} must have ${assetDecimals} decimals`);
         });
     }
     /**
@@ -2116,7 +2106,7 @@ class ThorchainQuery {
             const oneTimeFee = params.isUpdate ? baseAmount(0) : baseAmount(constantsDetails['TNSRegisterFee']);
             const totalFeePerBlock = baseAmount(constantsDetails['TNSFeePerBlock']).times(numberOfBlocksToAddToExpirity > 0 ? numberOfBlocksToAddToExpirity : 0);
             const totalCost = new CryptoAmount(oneTimeFee.plus(totalFeePerBlock), AssetRuneNative);
-            const thornameMemo = `~:${params.thorname}:${params.chain}:${params.chainAddress}:${params.owner ? params.owner : ''}:${params.preferredAsset ? assetToString(params.preferredAsset) : ''}:${params.isUpdate ? '' : currentHeightForExpirity + numberOfBlocksToAddToExpirity}`;
+            const thornameMemo = `~:${params.thorname}:${params.chain}:${params.chainAddress}:${params.owner ? params.owner : ''}:${params.preferredAsset ? assetToString(params.preferredAsset) : ''}:${params.isUpdate ? '' : currentHeightForExpirity + numberOfBlocksToAddToExpirity}`.replace(/^:+|:+$/g, '');
             return {
                 memo: thornameMemo,
                 value: totalCost,