@xchainjs/xchain-thorchain-amm 2.0.20 → 2.0.22

package/lib/index.esm.js

@@ -1,7 +1,7 @@
 import { AssetAVAX, AVAXChain as AVAXChain$1, Client as Client$3, defaultAvaxParams } from '@xchainjs/xchain-avax';
 import { FeeOption, TxType, Network, ExplorerProvider, Protocol } from '@xchainjs/xchain-client';
 import { ClientKeystore as ClientKeystore$1, KeystoreSigner, abi, MAX_APPROVAL } from '@xchainjs/xchain-evm';
-import { AssetType, assetToString, baseAmount, bnOrZero, assetFromString, eqAsset, isSynthAsset, getContractAddressFromAsset, isTradeAsset, AssetCryptoAmount, CryptoAmount } from '@xchainjs/xchain-util';
+import { AssetType, assetToString, baseAmount, bnOrZero, assetFromString, eqAsset, isSynthAsset, getContractAddressFromAsset, isTradeAsset, isSecuredAsset, AssetCryptoAmount, CryptoAmount } from '@xchainjs/xchain-util';
 import { ethers, BigNumber } from 'ethers';
 import { BTCChain, Client as Client$8, defaultBTCParams } from '@xchainjs/xchain-bitcoin';
 import { BCHChain, Client as Client$7, defaultBchParams } from '@xchainjs/xchain-bitcoincash';
@@ -4610,14 +4610,16 @@ class ThorchainAction {
     static isNonProtocolParams(params) {
         if ((params.assetAmount.asset.chain === THORChain ||
             isSynthAsset(params.assetAmount.asset) ||
-            isTradeAsset(params.assetAmount.asset)) &&
+            isTradeAsset(params.assetAmount.asset) ||
+            isSecuredAsset(params.assetAmount.asset)) &&
             'address' in params &&
             !!params.address) {
             throw Error('Inconsistent params. Native actions do not support recipient');
         }
         return (params.assetAmount.asset.chain !== THORChain &&
             !isSynthAsset(params.assetAmount.asset) &&
-            !isTradeAsset(params.assetAmount.asset));
+            !isTradeAsset(params.assetAmount.asset) &&
+            !isSecuredAsset(params.assetAmount.asset));
     }
 }
 
@@ -4692,7 +4694,9 @@ class ThorchainAMM {
         return __awaiter$1(this, void 0, void 0, function* () {
             const errors = [];
             if (destinationAddress &&
-                !validateAddress(this.thorchainQuery.thorchainCache.midgardQuery.midgardCache.midgard.network, isSynthAsset(destinationAsset) || isTradeAsset(destinationAsset) ? THORChain : destinationAsset.chain, destinationAddress)) {
+                !validateAddress(this.thorchainQuery.thorchainCache.midgardQuery.midgardCache.midgard.network, isSynthAsset(destinationAsset) || isTradeAsset(destinationAsset) || isSecuredAsset(destinationAsset)
+                    ? THORChain
+                    : destinationAsset.chain, destinationAddress)) {
                 errors.push(`destinationAddress ${destinationAddress} is not a valid address`);
             }
             if (!isTradeAsset(fromAsset) && !eqAsset(fromAsset, AssetRuneNative) && isTradeAsset(destinationAsset)) {

package/lib/index.js

@@ -4612,14 +4612,16 @@ class ThorchainAction {
     static isNonProtocolParams(params) {
         if ((params.assetAmount.asset.chain === xchainThorchain.THORChain ||
             xchainUtil.isSynthAsset(params.assetAmount.asset) ||
-            xchainUtil.isTradeAsset(params.assetAmount.asset)) &&
+            xchainUtil.isTradeAsset(params.assetAmount.asset) ||
+            xchainUtil.isSecuredAsset(params.assetAmount.asset)) &&
             'address' in params &&
             !!params.address) {
             throw Error('Inconsistent params. Native actions do not support recipient');
         }
         return (params.assetAmount.asset.chain !== xchainThorchain.THORChain &&
             !xchainUtil.isSynthAsset(params.assetAmount.asset) &&
-            !xchainUtil.isTradeAsset(params.assetAmount.asset));
+            !xchainUtil.isTradeAsset(params.assetAmount.asset) &&
+            !xchainUtil.isSecuredAsset(params.assetAmount.asset));
     }
 }
 
@@ -4694,7 +4696,9 @@ class ThorchainAMM {
         return __awaiter$1(this, void 0, void 0, function* () {
             const errors = [];
             if (destinationAddress &&
-                !validateAddress(this.thorchainQuery.thorchainCache.midgardQuery.midgardCache.midgard.network, xchainUtil.isSynthAsset(destinationAsset) || xchainUtil.isTradeAsset(destinationAsset) ? xchainThorchain.THORChain : destinationAsset.chain, destinationAddress)) {
+                !validateAddress(this.thorchainQuery.thorchainCache.midgardQuery.midgardCache.midgard.network, xchainUtil.isSynthAsset(destinationAsset) || xchainUtil.isTradeAsset(destinationAsset) || xchainUtil.isSecuredAsset(destinationAsset)
+                    ? xchainThorchain.THORChain
+                    : destinationAsset.chain, destinationAddress)) {
                 errors.push(`destinationAddress ${destinationAddress} is not a valid address`);
             }
             if (!xchainUtil.isTradeAsset(fromAsset) && !xchainUtil.eqAsset(fromAsset, xchainThorchain.AssetRuneNative) && xchainUtil.isTradeAsset(destinationAsset)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-thorchain-amm",
-  "version": "2.0.20",
+  "version": "2.0.22",
   "description": "module that exposes estimating & swappping cryptocurrency assets on thorchain",
   "keywords": [
     "THORChain",
@@ -47,7 +47,7 @@
     "@xchainjs/xchain-evm": "1.0.13",
     "@xchainjs/xchain-litecoin": "1.0.9",
     "@xchainjs/xchain-thorchain": "2.0.12",
-    "@xchainjs/xchain-thorchain-query": "1.0.11",
+    "@xchainjs/xchain-thorchain-query": "1.0.12",
     "@xchainjs/xchain-util": "1.0.7",
     "@xchainjs/xchain-wallet": "1.1.4",
     "ethers": "5.7.2"