@xchainjs/xchain-mayachain-amm 2.0.14 → 3.0.0

package/lib/index.esm.js

@@ -8752,6 +8752,17 @@ var Denomination;
     Denomination["Asset"] = "ASSET";
 })(Denomination || (Denomination = {}));
 
+/**
+ * Asset type
+ */
+var AssetType;
+(function (AssetType) {
+    AssetType[AssetType["NATIVE"] = 0] = "NATIVE";
+    AssetType[AssetType["TOKEN"] = 1] = "TOKEN";
+    AssetType[AssetType["SYNTH"] = 2] = "SYNTH";
+    AssetType[AssetType["TRADE"] = 3] = "TRADE";
+})(AssetType || (AssetType = {}));
+
 /**
  * Guard to check whether value is a BigNumber.Value or not
  *
@@ -8770,6 +8781,22 @@ const isBigNumberValue = (v) => typeof v === 'string' || typeof v === 'number' |
  * ```
  * */
 const ASSET_DECIMAL = 8;
+/**
+ * Native asset delimiter
+ */
+const NATIVE_ASSET_DELIMITER = '.';
+/**
+ * Token asset delimiter
+ */
+const TOKEN_ASSET_DELIMITER = '.';
+/**
+ * Synth asset delimiter
+ */
+const SYNTH_ASSET_DELIMITER = '/';
+/**
+ * Trade asset delimiter
+ */
+const TRADE_ASSET_DELIMITER = '~';
 /**
  * Factory to create values of assets (e.g. RUNE)
  *
@@ -8874,16 +8901,21 @@ const formatBaseAmount = (amount) => formatBN(amount.amount(), 0);
  * Based on definition in Thorchain `common`
  * @see https://gitlab.com/thorchain/thornode/-/blob/master/common/asset.go#L12-24
  */
-const AssetBTC = { chain: 'BTC', symbol: 'BTC', ticker: 'BTC', synth: false };
+const AssetBTC = { chain: 'BTC', symbol: 'BTC', ticker: 'BTC', type: AssetType.NATIVE };
 /**
  * Base "chain" asset on ethereum main net.
  *
  * Based on definition in Thorchain `common`
  * @see https://gitlab.com/thorchain/thornode/-/blob/master/common/asset.go#L12-24
  */
-const AssetETH = { chain: 'ETH', symbol: 'ETH', ticker: 'ETH', synth: false };
-const SYNTH_DELIMITER = '/';
-const NON_SYNTH_DELIMITER = '.';
+const AssetETH = { chain: 'ETH', symbol: 'ETH', ticker: 'ETH', type: AssetType.NATIVE };
+/**
+ * Helper to check whether an asset is synth asset
+ *
+ * @param {Asset} asset
+ * @returns {boolean} `true` or `false`
+ */
+const isSynthAsset = (asset) => asset.type === AssetType.SYNTH;
 /**
  * Returns an `Asset` as a string using following naming convention:
  *
@@ -8899,9 +8931,17 @@ const NON_SYNTH_DELIMITER = '.';
  * @param {Asset} asset The given asset.
  * @returns {string} The string from the given asset.
  */
-const assetToString = ({ chain, symbol, synth }) => {
-    const delimiter = synth ? SYNTH_DELIMITER : NON_SYNTH_DELIMITER;
-    return `${chain}${delimiter}${symbol}`;
+const assetToString = ({ chain, symbol, type }) => {
+    switch (type) {
+        case AssetType.SYNTH:
+            return `${chain}${SYNTH_ASSET_DELIMITER}${symbol}`;
+        case AssetType.TOKEN:
+            return `${chain}${TOKEN_ASSET_DELIMITER}${symbol}`;
+        case AssetType.TRADE:
+            return `${chain}${TRADE_ASSET_DELIMITER}${symbol}`;
+        default:
+            return `${chain}${NATIVE_ASSET_DELIMITER}${symbol}`;
+    }
 };
 /**
  * Currency symbols currently supported
@@ -8982,7 +9022,7 @@ const formatAssetAmountCurrency = ({ amount, asset, decimal, trimZeros: shouldTr
  * @param {Asset} b Asset two
  * @return {boolean} Result of equality check
  */
-const eqAsset = (a, b) => a.chain === b.chain && a.symbol === b.symbol && a.ticker === b.ticker && a.synth === b.synth;
+const eqAsset = (a, b) => a.chain === b.chain && a.symbol === b.symbol && a.ticker === b.ticker && a.type === b.type;
 /**
  * Removes `0x` or `0X` from address
  */
@@ -8996,7 +9036,7 @@ const getContractAddressFromAsset = (asset) => {
  * Utility Class to combine an amount (asset/base) with the Asset
  *
  */
-class CryptoAmount {
+class BaseCryptoAmount {
     constructor(amount, asset) {
         this.asset = asset;
         this.baseAmount = amount;
@@ -9004,33 +9044,33 @@ class CryptoAmount {
     plus(v) {
         this.check(v);
         const assetAmountResult = assetToBase(this.assetAmount.plus(v.assetAmount));
-        return new CryptoAmount(assetAmountResult, this.asset);
+        return new BaseCryptoAmount(assetAmountResult, this.asset);
     }
     minus(v) {
         this.check(v);
         const assetAmountResult = assetToBase(this.assetAmount.minus(v.assetAmount));
-        return new CryptoAmount(assetAmountResult, this.asset);
+        return new BaseCryptoAmount(assetAmountResult, this.asset);
     }
     times(v) {
         this.check(v);
-        if (v instanceof CryptoAmount) {
+        if (v instanceof BaseCryptoAmount) {
             const assetAmountResult = assetToBase(this.assetAmount.times(v.assetAmount));
-            return new CryptoAmount(assetAmountResult, this.asset);
+            return new BaseCryptoAmount(assetAmountResult, this.asset);
         }
         else {
             const assetAmountResult = assetToBase(this.assetAmount.times(v));
-            return new CryptoAmount(assetAmountResult, this.asset);
+            return new BaseCryptoAmount(assetAmountResult, this.asset);
         }
     }
     div(v) {
         this.check(v);
-        if (v instanceof CryptoAmount) {
+        if (v instanceof BaseCryptoAmount) {
             const assetAmountResult = assetToBase(this.assetAmount.div(v.assetAmount));
-            return new CryptoAmount(assetAmountResult, this.asset);
+            return new BaseCryptoAmount(assetAmountResult, this.asset);
         }
         else {
             const assetAmountResult = assetToBase(this.assetAmount.div(v));
-            return new CryptoAmount(assetAmountResult, this.asset);
+            return new BaseCryptoAmount(assetAmountResult, this.asset);
         }
     }
     lt(v) {
@@ -9078,13 +9118,17 @@ class CryptoAmount {
      * @param v - CryptoNumeric
      */
     check(v) {
-        if (v instanceof CryptoAmount) {
+        if (v instanceof BaseCryptoAmount) {
             if (!eqAsset(this.asset, v.asset)) {
                 throw Error(`cannot perform math on 2 diff assets ${assetToString(this.asset)} ${assetToString(v.asset)}`);
             }
         }
     }
 }
+class CryptoAmount extends BaseCryptoAmount {
+}
+class AssetCryptoAmount extends BaseCryptoAmount {
+}
 
 var commonjsGlobal$1 = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -89542,7 +89586,18 @@ const isProtocolEVMChain = (chain) => {
  */
 const isProtocolERC20Asset = (asset) => {
     return isProtocolEVMChain(asset.chain)
-        ? [AssetETH$1, AssetAETH].findIndex((nativeEVMAsset) => eqAsset(nativeEVMAsset, asset)) === -1 && !asset.synth
+        ? [AssetETH$1, AssetAETH].findIndex((nativeEVMAsset) => eqAsset(nativeEVMAsset, asset)) === -1 && !isSynthAsset(asset)
+        : false;
+};
+/**
+ * Check if asset is ERC20
+ * @param {Asset} asset to check
+ * @returns true if asset is ERC20, otherwise, false
+ */
+const isTokenCryptoAmount = (amount) => {
+    return isProtocolEVMChain(amount.asset.chain)
+        ? [AssetETH$1, AssetAETH].findIndex((nativeEVMAsset) => eqAsset(nativeEVMAsset, amount.asset)) === -1 &&
+            !isSynthAsset(amount.asset)
         : false;
 };
 /**
@@ -89660,12 +89715,12 @@ class MayachainAction {
         });
     }
     static isNonProtocolParams(params) {
-        if ((params.assetAmount.asset.chain === MAYAChain || params.assetAmount.asset.synth) &&
+        if ((params.assetAmount.asset.chain === MAYAChain || isSynthAsset(params.assetAmount.asset)) &&
             'address' in params &&
             !!params.address) {
             throw Error('Inconsistent params. Native actions do not support recipient');
         }
-        return params.assetAmount.asset.chain !== MAYAChain && !params.assetAmount.asset.synth;
+        return params.assetAmount.asset.chain !== MAYAChain && !isSynthAsset(params.assetAmount.asset);
     }
 }
 
@@ -89764,7 +89819,7 @@ class MayachainAMM {
             const errors = [];
             // Validate destination address if provided
             if (destinationAddress &&
-                !validateAddress(this.mayachainQuery.getNetwork(), destinationAsset.synth ? MAYAChain : destinationAsset.chain, destinationAddress)) {
+                !validateAddress(this.mayachainQuery.getNetwork(), isSynthAsset(destinationAsset) ? MAYAChain : destinationAsset.chain, destinationAddress)) {
                 errors.push(`destinationAddress ${destinationAddress} is not a valid address`);
             }
             // Validate affiliate address if provided
@@ -89780,12 +89835,17 @@ class MayachainAMM {
             }
             // Validate approval if asset is an ERC20 token and fromAddress is provided
             if (isProtocolERC20Asset(fromAsset) && fromAddress) {
-                const approveErrors = yield this.isRouterApprovedToSpend({
-                    asset: fromAsset,
-                    address: fromAddress,
-                    amount,
-                });
-                errors.push(...approveErrors);
+                if (!isTokenCryptoAmount(amount)) {
+                    errors.push(`${assetToString(amount.asset)} is not Token asset amount`);
+                }
+                else {
+                    const approveErrors = yield this.isRouterApprovedToSpend({
+                        asset: fromAsset,
+                        address: fromAddress,
+                        amount,
+                    });
+                    errors.push(...approveErrors);
+                }
             }
             if (streamingQuantity && streamingQuantity < 0) {
                 errors.push('streaming quantity can not be lower than 0');
@@ -89901,7 +89961,7 @@ class MayachainAMM {
                 return {
                     memo: '',
                     errors,
-                    value: new CryptoAmount(baseAmount(0, CACAO_DECIMAL), AssetCacao),
+                    value: new AssetCryptoAmount(baseAmount(0, CACAO_DECIMAL), AssetCacao),
                     allowed: false,
                 };
             }
@@ -89914,7 +89974,7 @@ class MayachainAMM {
                 return {
                     memo: '',
                     errors: ['message' in e ? e.message : `Unknown error: ${e}`],
-                    value: new CryptoAmount(baseAmount(0, CACAO_DECIMAL), AssetCacao),
+                    value: new AssetCryptoAmount(baseAmount(0, CACAO_DECIMAL), AssetCacao),
                     allowed: false,
                 };
             }
@@ -89943,7 +90003,7 @@ class MayachainAMM {
                 return {
                     memo: '',
                     errors,
-                    value: new CryptoAmount(baseAmount(0, CACAO_DECIMAL), AssetCacao),
+                    value: new AssetCryptoAmount(baseAmount(0, CACAO_DECIMAL), AssetCacao),
                     allowed: false,
                 };
             }
@@ -89956,7 +90016,7 @@ class MayachainAMM {
                 return {
                     memo: '',
                     errors: ['message' in e ? e.message : `Unknown error: ${e}`],
-                    value: new CryptoAmount(baseAmount(0, CACAO_DECIMAL), AssetCacao),
+                    value: new AssetCryptoAmount(baseAmount(0, CACAO_DECIMAL), AssetCacao),
                     allowed: false,
                 };
             }

package/lib/index.js

@@ -8760,6 +8760,17 @@ var Denomination;
     Denomination["Asset"] = "ASSET";
 })(Denomination || (Denomination = {}));
 
+/**
+ * Asset type
+ */
+var AssetType;
+(function (AssetType) {
+    AssetType[AssetType["NATIVE"] = 0] = "NATIVE";
+    AssetType[AssetType["TOKEN"] = 1] = "TOKEN";
+    AssetType[AssetType["SYNTH"] = 2] = "SYNTH";
+    AssetType[AssetType["TRADE"] = 3] = "TRADE";
+})(AssetType || (AssetType = {}));
+
 /**
  * Guard to check whether value is a BigNumber.Value or not
  *
@@ -8778,6 +8789,22 @@ const isBigNumberValue = (v) => typeof v === 'string' || typeof v === 'number' |
  * ```
  * */
 const ASSET_DECIMAL = 8;
+/**
+ * Native asset delimiter
+ */
+const NATIVE_ASSET_DELIMITER = '.';
+/**
+ * Token asset delimiter
+ */
+const TOKEN_ASSET_DELIMITER = '.';
+/**
+ * Synth asset delimiter
+ */
+const SYNTH_ASSET_DELIMITER = '/';
+/**
+ * Trade asset delimiter
+ */
+const TRADE_ASSET_DELIMITER = '~';
 /**
  * Factory to create values of assets (e.g. RUNE)
  *
@@ -8882,16 +8909,21 @@ const formatBaseAmount = (amount) => formatBN(amount.amount(), 0);
  * Based on definition in Thorchain `common`
  * @see https://gitlab.com/thorchain/thornode/-/blob/master/common/asset.go#L12-24
  */
-const AssetBTC = { chain: 'BTC', symbol: 'BTC', ticker: 'BTC', synth: false };
+const AssetBTC = { chain: 'BTC', symbol: 'BTC', ticker: 'BTC', type: AssetType.NATIVE };
 /**
  * Base "chain" asset on ethereum main net.
  *
  * Based on definition in Thorchain `common`
  * @see https://gitlab.com/thorchain/thornode/-/blob/master/common/asset.go#L12-24
  */
-const AssetETH = { chain: 'ETH', symbol: 'ETH', ticker: 'ETH', synth: false };
-const SYNTH_DELIMITER = '/';
-const NON_SYNTH_DELIMITER = '.';
+const AssetETH = { chain: 'ETH', symbol: 'ETH', ticker: 'ETH', type: AssetType.NATIVE };
+/**
+ * Helper to check whether an asset is synth asset
+ *
+ * @param {Asset} asset
+ * @returns {boolean} `true` or `false`
+ */
+const isSynthAsset = (asset) => asset.type === AssetType.SYNTH;
 /**
  * Returns an `Asset` as a string using following naming convention:
  *
@@ -8907,9 +8939,17 @@ const NON_SYNTH_DELIMITER = '.';
  * @param {Asset} asset The given asset.
  * @returns {string} The string from the given asset.
  */
-const assetToString = ({ chain, symbol, synth }) => {
-    const delimiter = synth ? SYNTH_DELIMITER : NON_SYNTH_DELIMITER;
-    return `${chain}${delimiter}${symbol}`;
+const assetToString = ({ chain, symbol, type }) => {
+    switch (type) {
+        case AssetType.SYNTH:
+            return `${chain}${SYNTH_ASSET_DELIMITER}${symbol}`;
+        case AssetType.TOKEN:
+            return `${chain}${TOKEN_ASSET_DELIMITER}${symbol}`;
+        case AssetType.TRADE:
+            return `${chain}${TRADE_ASSET_DELIMITER}${symbol}`;
+        default:
+            return `${chain}${NATIVE_ASSET_DELIMITER}${symbol}`;
+    }
 };
 /**
  * Currency symbols currently supported
@@ -8990,7 +9030,7 @@ const formatAssetAmountCurrency = ({ amount, asset, decimal, trimZeros: shouldTr
  * @param {Asset} b Asset two
  * @return {boolean} Result of equality check
  */
-const eqAsset = (a, b) => a.chain === b.chain && a.symbol === b.symbol && a.ticker === b.ticker && a.synth === b.synth;
+const eqAsset = (a, b) => a.chain === b.chain && a.symbol === b.symbol && a.ticker === b.ticker && a.type === b.type;
 /**
  * Removes `0x` or `0X` from address
  */
@@ -9004,7 +9044,7 @@ const getContractAddressFromAsset = (asset) => {
  * Utility Class to combine an amount (asset/base) with the Asset
  *
  */
-class CryptoAmount {
+class BaseCryptoAmount {
     constructor(amount, asset) {
         this.asset = asset;
         this.baseAmount = amount;
@@ -9012,33 +9052,33 @@ class CryptoAmount {
     plus(v) {
         this.check(v);
         const assetAmountResult = assetToBase(this.assetAmount.plus(v.assetAmount));
-        return new CryptoAmount(assetAmountResult, this.asset);
+        return new BaseCryptoAmount(assetAmountResult, this.asset);
     }
     minus(v) {
         this.check(v);
         const assetAmountResult = assetToBase(this.assetAmount.minus(v.assetAmount));
-        return new CryptoAmount(assetAmountResult, this.asset);
+        return new BaseCryptoAmount(assetAmountResult, this.asset);
     }
     times(v) {
         this.check(v);
-        if (v instanceof CryptoAmount) {
+        if (v instanceof BaseCryptoAmount) {
             const assetAmountResult = assetToBase(this.assetAmount.times(v.assetAmount));
-            return new CryptoAmount(assetAmountResult, this.asset);
+            return new BaseCryptoAmount(assetAmountResult, this.asset);
         }
         else {
             const assetAmountResult = assetToBase(this.assetAmount.times(v));
-            return new CryptoAmount(assetAmountResult, this.asset);
+            return new BaseCryptoAmount(assetAmountResult, this.asset);
         }
     }
     div(v) {
         this.check(v);
-        if (v instanceof CryptoAmount) {
+        if (v instanceof BaseCryptoAmount) {
             const assetAmountResult = assetToBase(this.assetAmount.div(v.assetAmount));
-            return new CryptoAmount(assetAmountResult, this.asset);
+            return new BaseCryptoAmount(assetAmountResult, this.asset);
         }
         else {
             const assetAmountResult = assetToBase(this.assetAmount.div(v));
-            return new CryptoAmount(assetAmountResult, this.asset);
+            return new BaseCryptoAmount(assetAmountResult, this.asset);
         }
     }
     lt(v) {
@@ -9086,13 +9126,17 @@ class CryptoAmount {
      * @param v - CryptoNumeric
      */
     check(v) {
-        if (v instanceof CryptoAmount) {
+        if (v instanceof BaseCryptoAmount) {
             if (!eqAsset(this.asset, v.asset)) {
                 throw Error(`cannot perform math on 2 diff assets ${assetToString(this.asset)} ${assetToString(v.asset)}`);
             }
         }
     }
 }
+class CryptoAmount extends BaseCryptoAmount {
+}
+class AssetCryptoAmount extends BaseCryptoAmount {
+}
 
 var commonjsGlobal$1 = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -89550,7 +89594,18 @@ const isProtocolEVMChain = (chain) => {
  */
 const isProtocolERC20Asset = (asset) => {
     return isProtocolEVMChain(asset.chain)
-        ? [xchainEthereum.AssetETH, xchainArbitrum.AssetAETH].findIndex((nativeEVMAsset) => eqAsset(nativeEVMAsset, asset)) === -1 && !asset.synth
+        ? [xchainEthereum.AssetETH, xchainArbitrum.AssetAETH].findIndex((nativeEVMAsset) => eqAsset(nativeEVMAsset, asset)) === -1 && !isSynthAsset(asset)
+        : false;
+};
+/**
+ * Check if asset is ERC20
+ * @param {Asset} asset to check
+ * @returns true if asset is ERC20, otherwise, false
+ */
+const isTokenCryptoAmount = (amount) => {
+    return isProtocolEVMChain(amount.asset.chain)
+        ? [xchainEthereum.AssetETH, xchainArbitrum.AssetAETH].findIndex((nativeEVMAsset) => eqAsset(nativeEVMAsset, amount.asset)) === -1 &&
+            !isSynthAsset(amount.asset)
         : false;
 };
 /**
@@ -89668,12 +89723,12 @@ class MayachainAction {
         });
     }
     static isNonProtocolParams(params) {
-        if ((params.assetAmount.asset.chain === xchainMayachain.MAYAChain || params.assetAmount.asset.synth) &&
+        if ((params.assetAmount.asset.chain === xchainMayachain.MAYAChain || isSynthAsset(params.assetAmount.asset)) &&
             'address' in params &&
             !!params.address) {
             throw Error('Inconsistent params. Native actions do not support recipient');
         }
-        return params.assetAmount.asset.chain !== xchainMayachain.MAYAChain && !params.assetAmount.asset.synth;
+        return params.assetAmount.asset.chain !== xchainMayachain.MAYAChain && !isSynthAsset(params.assetAmount.asset);
     }
 }
 
@@ -89772,7 +89827,7 @@ class MayachainAMM {
             const errors = [];
             // Validate destination address if provided
             if (destinationAddress &&
-                !validateAddress(this.mayachainQuery.getNetwork(), destinationAsset.synth ? xchainMayachain.MAYAChain : destinationAsset.chain, destinationAddress)) {
+                !validateAddress(this.mayachainQuery.getNetwork(), isSynthAsset(destinationAsset) ? xchainMayachain.MAYAChain : destinationAsset.chain, destinationAddress)) {
                 errors.push(`destinationAddress ${destinationAddress} is not a valid address`);
             }
             // Validate affiliate address if provided
@@ -89788,12 +89843,17 @@ class MayachainAMM {
             }
             // Validate approval if asset is an ERC20 token and fromAddress is provided
             if (isProtocolERC20Asset(fromAsset) && fromAddress) {
-                const approveErrors = yield this.isRouterApprovedToSpend({
-                    asset: fromAsset,
-                    address: fromAddress,
-                    amount,
-                });
-                errors.push(...approveErrors);
+                if (!isTokenCryptoAmount(amount)) {
+                    errors.push(`${assetToString(amount.asset)} is not Token asset amount`);
+                }
+                else {
+                    const approveErrors = yield this.isRouterApprovedToSpend({
+                        asset: fromAsset,
+                        address: fromAddress,
+                        amount,
+                    });
+                    errors.push(...approveErrors);
+                }
             }
             if (streamingQuantity && streamingQuantity < 0) {
                 errors.push('streaming quantity can not be lower than 0');
@@ -89909,7 +89969,7 @@ class MayachainAMM {
                 return {
                     memo: '',
                     errors,
-                    value: new CryptoAmount(baseAmount(0, xchainMayachain.CACAO_DECIMAL), xchainMayachain.AssetCacao),
+                    value: new AssetCryptoAmount(baseAmount(0, xchainMayachain.CACAO_DECIMAL), xchainMayachain.AssetCacao),
                     allowed: false,
                 };
             }
@@ -89922,7 +89982,7 @@ class MayachainAMM {
                 return {
                     memo: '',
                     errors: ['message' in e ? e.message : `Unknown error: ${e}`],
-                    value: new CryptoAmount(baseAmount(0, xchainMayachain.CACAO_DECIMAL), xchainMayachain.AssetCacao),
+                    value: new AssetCryptoAmount(baseAmount(0, xchainMayachain.CACAO_DECIMAL), xchainMayachain.AssetCacao),
                     allowed: false,
                 };
             }
@@ -89951,7 +90011,7 @@ class MayachainAMM {
                 return {
                     memo: '',
                     errors,
-                    value: new CryptoAmount(baseAmount(0, xchainMayachain.CACAO_DECIMAL), xchainMayachain.AssetCacao),
+                    value: new AssetCryptoAmount(baseAmount(0, xchainMayachain.CACAO_DECIMAL), xchainMayachain.AssetCacao),
                     allowed: false,
                 };
             }
@@ -89964,7 +90024,7 @@ class MayachainAMM {
                 return {
                     memo: '',
                     errors: ['message' in e ? e.message : `Unknown error: ${e}`],
-                    value: new CryptoAmount(baseAmount(0, xchainMayachain.CACAO_DECIMAL), xchainMayachain.AssetCacao),
+                    value: new AssetCryptoAmount(baseAmount(0, xchainMayachain.CACAO_DECIMAL), xchainMayachain.AssetCacao),
                     allowed: false,
                 };
             }

package/lib/mayachain-action.d.ts

@@ -1,15 +1,16 @@
-import { Address, CryptoAmount } from '@xchainjs/xchain-util';
+import { CompatibleAsset } from '@xchainjs/xchain-mayachain-query';
+import { Address, Asset, CryptoAmount, TokenAsset } from '@xchainjs/xchain-util';
 import { Wallet } from '@xchainjs/xchain-wallet';
 import { TxSubmitted } from './types';
 export type NonProtocolActionParams = {
     wallet: Wallet;
-    assetAmount: CryptoAmount;
+    assetAmount: CryptoAmount<Asset | TokenAsset>;
     recipient: Address;
     memo: string;
 };
 export type ProtocolActionParams = {
     wallet: Wallet;
-    assetAmount: CryptoAmount;
+    assetAmount: CryptoAmount<CompatibleAsset>;
     memo: string;
 };
 export type ActionParams = ProtocolActionParams | NonProtocolActionParams;

package/lib/types.d.ts

@@ -1,16 +1,16 @@
 import { QuoteMAYAName as BaseQuoteMAYAName } from '@xchainjs/xchain-mayachain-query';
-import { Address, Asset, CryptoAmount } from '@xchainjs/xchain-util';
+import { Address, TokenAsset, TokenCryptoAmount } from '@xchainjs/xchain-util';
 export type TxSubmitted = {
     hash: string;
     url: string;
 };
 export type ApproveParams = {
-    asset: Asset;
-    amount: CryptoAmount | undefined;
+    asset: TokenAsset;
+    amount?: TokenCryptoAmount;
 };
 export type IsApprovedParams = {
-    asset: Asset;
-    amount: CryptoAmount;
+    asset: TokenAsset;
+    amount: TokenCryptoAmount;
     address: Address;
 };
 /**

package/lib/utils.d.ts

@@ -1,5 +1,6 @@
 import { Network } from '@xchainjs/xchain-client';
-import { Address, Asset, Chain } from '@xchainjs/xchain-util';
+import { CompatibleAsset } from '@xchainjs/xchain-mayachain-query';
+import { Address, Chain, CryptoAmount, TokenAsset, TokenCryptoAmount } from '@xchainjs/xchain-util';
 /**
  * Check if a chain is EVM and supported by the protocol
  * @param {Chain} chain to check
@@ -11,7 +12,13 @@ export declare const isProtocolEVMChain: (chain: Chain) => boolean;
  * @param {Asset} asset to check
  * @returns true if asset is ERC20, otherwise, false
  */
-export declare const isProtocolERC20Asset: (asset: Asset) => boolean;
+export declare const isProtocolERC20Asset: (asset: CompatibleAsset) => asset is TokenAsset;
+/**
+ * Check if asset is ERC20
+ * @param {Asset} asset to check
+ * @returns true if asset is ERC20, otherwise, false
+ */
+export declare const isTokenCryptoAmount: (amount: CryptoAmount) => amount is TokenCryptoAmount;
 /**
  * Check if a chain is EVM and supported by the protocol
  * @param {Chain} chain to check

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-mayachain-amm",
-  "version": "2.0.14",
+  "version": "3.0.0",
   "description": "module that exposes estimating & swapping cryptocurrency assets on mayachain",
   "keywords": [
     "MAYAChain",
@@ -36,16 +36,16 @@
     "url": "https://github.com/xchainjs/xchainjs-lib/issues"
   },
   "dependencies": {
-    "@xchainjs/xchain-arbitrum": "0.1.14",
-    "@xchainjs/xchain-bitcoin": "0.23.19",
-    "@xchainjs/xchain-client": "0.16.8",
-    "@xchainjs/xchain-dash": "0.3.6",
-    "@xchainjs/xchain-ethereum": "0.32.6",
-    "@xchainjs/xchain-kujira": "0.1.21",
-    "@xchainjs/xchain-mayachain": "1.0.11",
-    "@xchainjs/xchain-mayachain-query": "0.1.21",
-    "@xchainjs/xchain-thorchain": "1.1.1",
-    "@xchainjs/xchain-wallet": "0.1.19",
+    "@xchainjs/xchain-arbitrum": "1.0.0",
+    "@xchainjs/xchain-bitcoin": "1.0.0",
+    "@xchainjs/xchain-client": "1.0.0",
+    "@xchainjs/xchain-dash": "1.0.0",
+    "@xchainjs/xchain-ethereum": "1.0.0",
+    "@xchainjs/xchain-kujira": "1.0.0",
+    "@xchainjs/xchain-mayachain": "2.0.0",
+    "@xchainjs/xchain-mayachain-query": "1.0.0",
+    "@xchainjs/xchain-thorchain": "2.0.0",
+    "@xchainjs/xchain-wallet": "1.0.0",
     "ethers": "5.7.2"
   },
   "devDependencies": {