@xchainjs/xchain-mayachain-query 2.1.4 → 2.1.7

package/lib/index.esm.js

@@ -232,6 +232,7 @@ class Mayanode {
 const BtcAsset = assetFromStringEx('BTC.BTC');
 const EthAsset = assetFromStringEx('ETH.ETH');
 const CacaoAsset = assetFromStringEx('MAYA.CACAO');
+const MayaAsset = assetFromStringEx('MAYA.MAYA');
 const RuneAsset = assetFromStringEx('THOR.RUNE');
 const DashAsset = assetFromStringEx('DASH.DASH');
 const KujiraAsset = assetFromStringEx('KUJI.KUJI');
@@ -248,6 +249,8 @@ const ArbChain = 'ARB';
 const XdrChain = 'XRD';
 const ZecChain = 'ZEC';
 const DEFAULT_MAYACHAIN_DECIMALS = 8;
+const MAYA_DECIMAL = 4;
+const CACAO_DECIMAL = 10;
 
 const isCacaoAsset = (asset) => assetToString(asset) === assetToString(CacaoAsset);
 const getBaseAmountWithDiffDecimals = (inputAmount, outDecimals) => {
@@ -659,6 +662,8 @@ class MayachainQuery {
                 name: MAYAName,
                 owner: details.owner,
                 expireBlockHeight: Number(details.expire),
+                preferredAsset: details.preferred_asset || '',
+                affiliateCollectorCacao: '0',
                 aliases: details.entries,
             };
         });
@@ -860,7 +865,7 @@ class MayachainQuery {
      * @returns {QuoteMAYAName} Memo to make the update or the registration and the estimation of the operation
      */
     estimateMAYAName(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ name, owner, isUpdate, expiry, chain, chainAddress, }) {
+        return __awaiter(this, arguments, void 0, function* ({ name, owner, isUpdate, expiry, chain, chainAddress, preferredAsset, }) {
             const details = yield this.getMAYANameDetails(name);
             if (!details && isUpdate) {
                 throw Error('Can not update an unregistered MAYAName');
@@ -881,11 +886,11 @@ class MayachainQuery {
             const oneTimeFee = isUpdate
                 ? baseAmount(0, assetDecimals[assetToString(CacaoAsset)])
                 : baseAmount(constantsDetails['TNSREGISTERFEE'], assetDecimals[assetToString(CacaoAsset)]);
-            const totalFeePerBlock = baseAmount(constantsDetails['TNSFEEPERBLOCK']).times(numberOfBlocksToAddToExpiry > 0 ? numberOfBlocksToAddToExpiry : 0);
+            const totalFeePerBlock = baseAmount(constantsDetails['TNSFEEPERBLOCK'], assetDecimals[assetToString(CacaoAsset)]).times(numberOfBlocksToAddToExpiry > 0 ? numberOfBlocksToAddToExpiry : 0);
             const txFee = baseAmount(constantsDetails['NATIVETRANSACTIONFEE'], assetDecimals[assetToString(CacaoAsset)]);
             return {
                 value: new AssetCryptoAmount(oneTimeFee.plus(totalFeePerBlock).plus(txFee), CacaoAsset),
-                memo: `~:${name}:${isUpdate ? chain || (details === null || details === void 0 ? void 0 : details.aliases[0].chain) : chain}:${isUpdate ? chainAddress || (details === null || details === void 0 ? void 0 : details.aliases[0].address) : chainAddress}:${isUpdate ? owner || (details === null || details === void 0 ? void 0 : details.owner) : owner}:MAYA.CACAO`,
+                memo: `~:${name}:${isUpdate ? chain || (details === null || details === void 0 ? void 0 : details.aliases[0].chain) : chain}:${isUpdate ? chainAddress || (details === null || details === void 0 ? void 0 : details.aliases[0].address) : chainAddress}:${isUpdate ? owner || (details === null || details === void 0 ? void 0 : details.owner) : owner}:${preferredAsset ? assetToString(preferredAsset) : 'MAYA.CACAO'}`,
             };
         });
     }
@@ -967,11 +972,15 @@ class MayachainQuery {
     /**
      * Get the hardcoded decimal precision for quote calculations
      * @param asset The asset to get decimals for
-     * @returns 10 for Cacao, 8 for other assets (used in quote calculations)
+     * @returns 10 for Cacao, 4 for Maya, 8 for other assets (used in quote calculations)
      */
     getQuoteAssetDecimals(asset) {
-        return eqAsset(asset, CacaoAsset) ? 10 : 8;
+        if (eqAsset(asset, CacaoAsset))
+            return CACAO_DECIMAL;
+        if (eqAsset(asset, MayaAsset))
+            return MAYA_DECIMAL;
+        return DEFAULT_MAYACHAIN_DECIMALS;
     }
 }
 
-export { ArbAsset, ArbChain, BtcAsset, BtcChain, CacaoAsset, DEFAULT_MAYACHAIN_DECIMALS, DashAsset, DashChain, EthAsset, EthChain, KujiraAsset, KujiraChain, MayaChain, MayachainCache, MayachainQuery, Mayanode, RuneAsset, ThorChain, XdrAsset, XdrChain, ZecAsset, ZecChain, getBaseAmountWithDiffDecimals, getCryptoAmountWithNotation, isCacaoAsset };
+export { ArbAsset, ArbChain, BtcAsset, BtcChain, CACAO_DECIMAL, CacaoAsset, DEFAULT_MAYACHAIN_DECIMALS, DashAsset, DashChain, EthAsset, EthChain, KujiraAsset, KujiraChain, MAYA_DECIMAL, MayaAsset, MayaChain, MayachainCache, MayachainQuery, Mayanode, RuneAsset, ThorChain, XdrAsset, XdrChain, ZecAsset, ZecChain, getBaseAmountWithDiffDecimals, getCryptoAmountWithNotation, isCacaoAsset };

package/lib/index.js

@@ -240,6 +240,7 @@ class Mayanode {
 const BtcAsset = xchainUtil.assetFromStringEx('BTC.BTC');
 const EthAsset = xchainUtil.assetFromStringEx('ETH.ETH');
 const CacaoAsset = xchainUtil.assetFromStringEx('MAYA.CACAO');
+const MayaAsset = xchainUtil.assetFromStringEx('MAYA.MAYA');
 const RuneAsset = xchainUtil.assetFromStringEx('THOR.RUNE');
 const DashAsset = xchainUtil.assetFromStringEx('DASH.DASH');
 const KujiraAsset = xchainUtil.assetFromStringEx('KUJI.KUJI');
@@ -256,6 +257,8 @@ const ArbChain = 'ARB';
 const XdrChain = 'XRD';
 const ZecChain = 'ZEC';
 const DEFAULT_MAYACHAIN_DECIMALS = 8;
+const MAYA_DECIMAL = 4;
+const CACAO_DECIMAL = 10;
 
 const isCacaoAsset = (asset) => xchainUtil.assetToString(asset) === xchainUtil.assetToString(CacaoAsset);
 const getBaseAmountWithDiffDecimals = (inputAmount, outDecimals) => {
@@ -667,6 +670,8 @@ class MayachainQuery {
                 name: MAYAName,
                 owner: details.owner,
                 expireBlockHeight: Number(details.expire),
+                preferredAsset: details.preferred_asset || '',
+                affiliateCollectorCacao: '0',
                 aliases: details.entries,
             };
         });
@@ -868,7 +873,7 @@ class MayachainQuery {
      * @returns {QuoteMAYAName} Memo to make the update or the registration and the estimation of the operation
      */
     estimateMAYAName(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ name, owner, isUpdate, expiry, chain, chainAddress, }) {
+        return __awaiter(this, arguments, void 0, function* ({ name, owner, isUpdate, expiry, chain, chainAddress, preferredAsset, }) {
             const details = yield this.getMAYANameDetails(name);
             if (!details && isUpdate) {
                 throw Error('Can not update an unregistered MAYAName');
@@ -889,11 +894,11 @@ class MayachainQuery {
             const oneTimeFee = isUpdate
                 ? xchainUtil.baseAmount(0, assetDecimals[xchainUtil.assetToString(CacaoAsset)])
                 : xchainUtil.baseAmount(constantsDetails['TNSREGISTERFEE'], assetDecimals[xchainUtil.assetToString(CacaoAsset)]);
-            const totalFeePerBlock = xchainUtil.baseAmount(constantsDetails['TNSFEEPERBLOCK']).times(numberOfBlocksToAddToExpiry > 0 ? numberOfBlocksToAddToExpiry : 0);
+            const totalFeePerBlock = xchainUtil.baseAmount(constantsDetails['TNSFEEPERBLOCK'], assetDecimals[xchainUtil.assetToString(CacaoAsset)]).times(numberOfBlocksToAddToExpiry > 0 ? numberOfBlocksToAddToExpiry : 0);
             const txFee = xchainUtil.baseAmount(constantsDetails['NATIVETRANSACTIONFEE'], assetDecimals[xchainUtil.assetToString(CacaoAsset)]);
             return {
                 value: new xchainUtil.AssetCryptoAmount(oneTimeFee.plus(totalFeePerBlock).plus(txFee), CacaoAsset),
-                memo: `~:${name}:${isUpdate ? chain || (details === null || details === void 0 ? void 0 : details.aliases[0].chain) : chain}:${isUpdate ? chainAddress || (details === null || details === void 0 ? void 0 : details.aliases[0].address) : chainAddress}:${isUpdate ? owner || (details === null || details === void 0 ? void 0 : details.owner) : owner}:MAYA.CACAO`,
+                memo: `~:${name}:${isUpdate ? chain || (details === null || details === void 0 ? void 0 : details.aliases[0].chain) : chain}:${isUpdate ? chainAddress || (details === null || details === void 0 ? void 0 : details.aliases[0].address) : chainAddress}:${isUpdate ? owner || (details === null || details === void 0 ? void 0 : details.owner) : owner}:${preferredAsset ? xchainUtil.assetToString(preferredAsset) : 'MAYA.CACAO'}`,
             };
         });
     }
@@ -975,10 +980,14 @@ class MayachainQuery {
     /**
      * Get the hardcoded decimal precision for quote calculations
      * @param asset The asset to get decimals for
-     * @returns 10 for Cacao, 8 for other assets (used in quote calculations)
+     * @returns 10 for Cacao, 4 for Maya, 8 for other assets (used in quote calculations)
      */
     getQuoteAssetDecimals(asset) {
-        return xchainUtil.eqAsset(asset, CacaoAsset) ? 10 : 8;
+        if (xchainUtil.eqAsset(asset, CacaoAsset))
+            return CACAO_DECIMAL;
+        if (xchainUtil.eqAsset(asset, MayaAsset))
+            return MAYA_DECIMAL;
+        return DEFAULT_MAYACHAIN_DECIMALS;
     }
 }
 
@@ -986,6 +995,7 @@ exports.ArbAsset = ArbAsset;
 exports.ArbChain = ArbChain;
 exports.BtcAsset = BtcAsset;
 exports.BtcChain = BtcChain;
+exports.CACAO_DECIMAL = CACAO_DECIMAL;
 exports.CacaoAsset = CacaoAsset;
 exports.DEFAULT_MAYACHAIN_DECIMALS = DEFAULT_MAYACHAIN_DECIMALS;
 exports.DashAsset = DashAsset;
@@ -994,6 +1004,8 @@ exports.EthAsset = EthAsset;
 exports.EthChain = EthChain;
 exports.KujiraAsset = KujiraAsset;
 exports.KujiraChain = KujiraChain;
+exports.MAYA_DECIMAL = MAYA_DECIMAL;
+exports.MayaAsset = MayaAsset;
 exports.MayaChain = MayaChain;
 exports.MayachainCache = MayachainCache;
 exports.MayachainQuery = MayachainQuery;

package/lib/mayachain-query.d.ts

@@ -97,7 +97,7 @@ export declare class MayachainQuery {
      * @param {QuoteMAYANameParams} params Params to make the update or the registration
      * @returns {QuoteMAYAName} Memo to make the update or the registration and the estimation of the operation
      */
-    estimateMAYAName({ name, owner, isUpdate, expiry, chain, chainAddress, }: QuoteMAYANameParams): Promise<QuoteMAYAName>;
+    estimateMAYAName({ name, owner, isUpdate, expiry, chain, chainAddress, preferredAsset, }: QuoteMAYANameParams): Promise<QuoteMAYAName>;
     /**
      * Get trade asset units
      * @param {TradeAssetUnitsParams} params Trade asset units params
@@ -125,7 +125,7 @@ export declare class MayachainQuery {
     /**
      * Get the hardcoded decimal precision for quote calculations
      * @param asset The asset to get decimals for
-     * @returns 10 for Cacao, 8 for other assets (used in quote calculations)
+     * @returns 10 for Cacao, 4 for Maya, 8 for other assets (used in quote calculations)
      */
     private getQuoteAssetDecimals;
 }

package/lib/types.d.ts

@@ -1,7 +1,7 @@
 import { TxHash } from '@xchainjs/xchain-client';
-import { Address, Asset, AssetCryptoAmount, Chain, CryptoAmount, SynthAsset, TokenAsset, TradeAsset, TradeCryptoAmount } from '@xchainjs/xchain-util';
+import { Address, Asset, AssetCryptoAmount, Chain, CryptoAmount, SecuredAsset, SynthAsset, TokenAsset, TradeAsset, TradeCryptoAmount } from '@xchainjs/xchain-util';
 import type BigNumber from 'bignumber.js';
-export type CompatibleAsset = Asset | TokenAsset | SynthAsset | TradeAsset;
+export type CompatibleAsset = Asset | TokenAsset | SynthAsset | TradeAsset | SecuredAsset;
 /**
  * Represents fees associated with a swap.
  */
@@ -167,6 +167,14 @@ export type MAYANameDetails = {
      * The owner of the MAYAName
      */
     owner: string;
+    /**
+     * The preferred asset
+     */
+    preferredAsset?: string;
+    /**
+     * The affiliate collector CACAO
+     */
+    affiliateCollectorCacao?: string;
     /**
      * List of MAYAName aliases
      */
@@ -196,6 +204,10 @@ export type RegisterMAYAName = {
      * Address of the chain provided to create the alias of the MAYAName
      */
     chainAddress: Address;
+    /**
+     * Preferred asset for the MAYAName owner to receive fees in
+     */
+    preferredAsset?: Asset;
 };
 /**
  * Update MAYAName parameters
@@ -221,6 +233,10 @@ export type UpdateMAYAName = {
      * Address of the chain provided to update the alias of the MAYAName, if not provided, memo response will have the address of the chain returned
      */
     chainAddress?: Address;
+    /**
+     * Preferred asset for the MAYAName owner to receive fees in
+     */
+    preferredAsset?: Asset;
 };
 export type QuoteMAYANameParams = (RegisterMAYAName & {
     isUpdate?: false;

package/lib/utils/const.d.ts

@@ -2,6 +2,7 @@ import { Asset } from '@xchainjs/xchain-util';
 export declare const BtcAsset: Asset;
 export declare const EthAsset: Asset;
 export declare const CacaoAsset: Asset;
+export declare const MayaAsset: Asset;
 export declare const RuneAsset: Asset;
 export declare const DashAsset: Asset;
 export declare const KujiraAsset: Asset;
@@ -18,3 +19,5 @@ export declare const ArbChain = "ARB";
 export declare const XdrChain = "XRD";
 export declare const ZecChain = "ZEC";
 export declare const DEFAULT_MAYACHAIN_DECIMALS = 8;
+export declare const MAYA_DECIMAL = 4;
+export declare const CACAO_DECIMAL = 10;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-mayachain-query",
-  "version": "2.1.4",
+  "version": "2.1.7",
   "license": "MIT",
   "description": "Mayachain query module that is responsible for estimating swap calculations and add/remove liquidity for thorchain",
   "keywords": [
@@ -33,12 +33,12 @@
     "postversion": "git push --follow-tags"
   },
   "dependencies": {
-    "@xchainjs/xchain-client": "2.0.9",
-    "@xchainjs/xchain-mayamidgard": "1.0.4",
-    "@xchainjs/xchain-mayamidgard-query": "1.0.10",
-    "@xchainjs/xchain-mayanode": "1.1.0",
+    "@xchainjs/xchain-client": "2.0.10",
+    "@xchainjs/xchain-mayamidgard": "1.1.0",
+    "@xchainjs/xchain-mayamidgard-query": "1.0.12",
+    "@xchainjs/xchain-mayanode": "1.2.0",
     "@xchainjs/xchain-util": "2.0.5",
-    "axios": "1.12.1",
+    "axios": "1.13.5",
     "axios-retry": "3.2.5",
     "bignumber.js": "^9.1.2"
   },