@xchainjs/xchain-mayachain-query 2.1.6 → 2.1.8

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-import { assetFromStringEx, assetToString, baseAmount, CryptoAmount, CachedValue, AssetCryptoAmount, eqAsset, isSynthAsset, TRADE_ASSET_DELIMITER, SYNTH_ASSET_DELIMITER, TradeCryptoAmount, TOKEN_ASSET_DELIMITER } from '@xchainjs/xchain-util';
+import { assetFromStringEx, baseAmount, CryptoAmount, assetToString, CachedValue, AssetCryptoAmount, eqAsset, isSynthAsset, TRADE_ASSET_DELIMITER, SYNTH_ASSET_DELIMITER, TOKEN_ASSET_DELIMITER, TradeCryptoAmount } from '@xchainjs/xchain-util';
 import { MidgardQuery } from '@xchainjs/xchain-mayamidgard-query';
 import BigNumber from 'bignumber.js';
 import { Network } from '@xchainjs/xchain-client';
@@ -662,6 +662,8 @@ class MayachainQuery {
                 name: MAYAName,
                 owner: details.owner,
                 expireBlockHeight: Number(details.expire),
+                preferredAsset: details.preferred_asset || '',
+                affiliateCollectorCacao: '0',
                 aliases: details.entries,
             };
         });
@@ -863,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');
@@ -884,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'}`,
             };
         });
     }

package/lib/index.js

@@ -670,6 +670,8 @@ class MayachainQuery {
                 name: MAYAName,
                 owner: details.owner,
                 expireBlockHeight: Number(details.expire),
+                preferredAsset: details.preferred_asset || '',
+                affiliateCollectorCacao: '0',
                 aliases: details.entries,
             };
         });
@@ -871,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');
@@ -892,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'}`,
             };
         });
     }

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

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-mayachain-query",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "license": "MIT",
   "description": "Mayachain query module that is responsible for estimating swap calculations and add/remove liquidity for thorchain",
   "keywords": [
@@ -33,14 +33,14 @@
     "postversion": "git push --follow-tags"
   },
   "dependencies": {
-    "@xchainjs/xchain-client": "2.0.10",
-    "@xchainjs/xchain-mayamidgard": "1.0.5",
-    "@xchainjs/xchain-mayamidgard-query": "1.0.11",
-    "@xchainjs/xchain-mayanode": "1.1.1",
-    "@xchainjs/xchain-util": "2.0.5",
+    "@xchainjs/xchain-client": "2.0.11",
+    "@xchainjs/xchain-mayamidgard": "1.1.0",
+    "@xchainjs/xchain-mayamidgard-query": "1.0.13",
+    "@xchainjs/xchain-mayanode": "1.2.0",
+    "@xchainjs/xchain-util": "2.0.6",
     "axios": "1.13.5",
     "axios-retry": "3.2.5",
-    "bignumber.js": "^9.1.2"
+    "bignumber.js": "^10.0.1"
   },
   "devDependencies": {
     "axios-mock-adapter": "2.1.0"