@xchainjs/xchain-mayachain-amm 4.1.18 → 4.1.19

package/lib/index.esm.js

@@ -1,4 +1,5 @@
 import { AssetAETH, ARBChain, Client as Client$1, defaultArbParams } from '@xchainjs/xchain-arbitrum';
+import { ADAChain, Client, defaultAdaParams } from '@xchainjs/xchain-cardano';
 import { ZECChain, Client as Client$2, defaultZECParams } from '@xchainjs/xchain-zcash';
 import { BTCChain, Client as Client$9, defaultBTCParams } from '@xchainjs/xchain-bitcoin';
 import { Network, Protocol } from '@xchainjs/xchain-client';
@@ -12,7 +13,6 @@ import { RadixChain, Client as Client$3, AssetXRD, generateAddressParam, generat
 import { AssetRuneNative, THORChain, Client as Client$5 } from '@xchainjs/xchain-thorchain';
 import { eqAsset, isSynthAsset, getContractAddressFromAsset, baseAmount, isTradeAsset, CryptoAmount, assetToString, AssetCryptoAmount, AssetType } from '@xchainjs/xchain-util';
 import { Wallet } from '@xchainjs/xchain-wallet';
-import { ADAChain, Client, defaultAdaParams } from '@xchainjs/xchain-cardano';
 import { getAddress, ZeroAddress, Contract } from 'ethers';
 
 /******************************************************************************
@@ -128,12 +128,13 @@ class MayachainAction {
         });
     }
     static makeProtocolAction(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ wallet, assetAmount, memo }) {
+        return __awaiter(this, arguments, void 0, function* ({ wallet, assetAmount, memo, walletIndex, }) {
             const hash = yield wallet.deposit({
                 chain: MAYAChain,
                 asset: assetAmount.asset,
                 amount: assetAmount.baseAmount,
                 memo,
+                walletIndex,
             });
             return {
                 hash,
@@ -142,15 +143,18 @@ class MayachainAction {
         });
     }
     static makeNonProtocolAction(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ wallet, assetAmount, recipient, memo, }) {
+        return __awaiter(this, arguments, void 0, function* ({ wallet, assetAmount, recipient, memo, walletIndex, }) {
             // Non EVM actions and non Radix action
             if (!isProtocolEVMChain(assetAmount.asset.chain) && !eqAsset(assetAmount.asset, AssetXRD)) {
-                if (isProtocolBFTChain(assetAmount.asset.chain)) {
+                // BFT/Cosmos chains and Cardano derive their fee internally (Cardano from on-chain
+                // protocol params) and do not accept a caller-supplied per-byte feeRate, unlike UTXO chains.
+                if (isProtocolBFTChain(assetAmount.asset.chain) || assetAmount.asset.chain === ADAChain) {
                     const hash = yield wallet.transfer({
                         asset: assetAmount.asset,
                         amount: assetAmount.baseAmount,
                         recipient,
                         memo,
+                        walletIndex,
                     });
                     return {
                         hash,
@@ -164,6 +168,7 @@ class MayachainAction {
                     recipient,
                     memo,
                     feeRate: feeRates.fast,
+                    walletIndex,
                 });
                 return {
                     hash,
@@ -191,6 +196,7 @@ class MayachainAction {
                             generateStringParam(memo),
                         ],
                     },
+                    walletIndex,
                 });
                 return {
                     hash,
@@ -223,7 +229,8 @@ class MayachainAction {
                 isMemoEncoded: true,
             };
             const gasLimit = yield wallet.estimateGasLimit(tx);
-            const hash = yield wallet.transfer(Object.assign(Object.assign({}, tx), { gasLimit }));
+            const hash = yield wallet.transfer(Object.assign(Object.assign({}, tx), { gasLimit,
+                walletIndex }));
             return {
                 hash,
                 url: yield wallet.getExplorerTxUrl(assetAmount.asset.chain, hash),
@@ -268,6 +275,7 @@ class MayachainAMM {
         MAYA: new Client$4({ network: Network.Mainnet }),
         XRD: new Client$3({ network: Network.Mainnet }),
         ZEC: new Client$2(Object.assign(Object.assign({}, defaultZECParams), { network: Network.Mainnet })),
+        ADA: new Client(Object.assign(Object.assign({}, defaultAdaParams), { network: Network.Mainnet })),
     })) {
         this.mayachainQuery = mayachainQuery;
         this.wallet = wallet;

package/lib/index.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var xchainArbitrum = require('@xchainjs/xchain-arbitrum');
+var xchainCardano = require('@xchainjs/xchain-cardano');
 var xchainZcash = require('@xchainjs/xchain-zcash');
 var xchainBitcoin = require('@xchainjs/xchain-bitcoin');
 var xchainClient = require('@xchainjs/xchain-client');
@@ -14,7 +15,6 @@ var xchainRadix = require('@xchainjs/xchain-radix');
 var xchainThorchain = require('@xchainjs/xchain-thorchain');
 var xchainUtil = require('@xchainjs/xchain-util');
 var xchainWallet = require('@xchainjs/xchain-wallet');
-var xchainCardano = require('@xchainjs/xchain-cardano');
 var ethers = require('ethers');
 
 /******************************************************************************
@@ -130,12 +130,13 @@ class MayachainAction {
         });
     }
     static makeProtocolAction(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ wallet, assetAmount, memo }) {
+        return __awaiter(this, arguments, void 0, function* ({ wallet, assetAmount, memo, walletIndex, }) {
             const hash = yield wallet.deposit({
                 chain: xchainMayachain.MAYAChain,
                 asset: assetAmount.asset,
                 amount: assetAmount.baseAmount,
                 memo,
+                walletIndex,
             });
             return {
                 hash,
@@ -144,15 +145,18 @@ class MayachainAction {
         });
     }
     static makeNonProtocolAction(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ wallet, assetAmount, recipient, memo, }) {
+        return __awaiter(this, arguments, void 0, function* ({ wallet, assetAmount, recipient, memo, walletIndex, }) {
             // Non EVM actions and non Radix action
             if (!isProtocolEVMChain(assetAmount.asset.chain) && !xchainUtil.eqAsset(assetAmount.asset, xchainRadix.AssetXRD)) {
-                if (isProtocolBFTChain(assetAmount.asset.chain)) {
+                // BFT/Cosmos chains and Cardano derive their fee internally (Cardano from on-chain
+                // protocol params) and do not accept a caller-supplied per-byte feeRate, unlike UTXO chains.
+                if (isProtocolBFTChain(assetAmount.asset.chain) || assetAmount.asset.chain === xchainCardano.ADAChain) {
                     const hash = yield wallet.transfer({
                         asset: assetAmount.asset,
                         amount: assetAmount.baseAmount,
                         recipient,
                         memo,
+                        walletIndex,
                     });
                     return {
                         hash,
@@ -166,6 +170,7 @@ class MayachainAction {
                     recipient,
                     memo,
                     feeRate: feeRates.fast,
+                    walletIndex,
                 });
                 return {
                     hash,
@@ -193,6 +198,7 @@ class MayachainAction {
                             xchainRadix.generateStringParam(memo),
                         ],
                     },
+                    walletIndex,
                 });
                 return {
                     hash,
@@ -225,7 +231,8 @@ class MayachainAction {
                 isMemoEncoded: true,
             };
             const gasLimit = yield wallet.estimateGasLimit(tx);
-            const hash = yield wallet.transfer(Object.assign(Object.assign({}, tx), { gasLimit }));
+            const hash = yield wallet.transfer(Object.assign(Object.assign({}, tx), { gasLimit,
+                walletIndex }));
             return {
                 hash,
                 url: yield wallet.getExplorerTxUrl(assetAmount.asset.chain, hash),
@@ -270,6 +277,7 @@ class MayachainAMM {
         MAYA: new xchainMayachain.Client({ network: xchainClient.Network.Mainnet }),
         XRD: new xchainRadix.Client({ network: xchainClient.Network.Mainnet }),
         ZEC: new xchainZcash.Client(Object.assign(Object.assign({}, xchainZcash.defaultZECParams), { network: xchainClient.Network.Mainnet })),
+        ADA: new xchainCardano.Client(Object.assign(Object.assign({}, xchainCardano.defaultAdaParams), { network: xchainClient.Network.Mainnet })),
     })) {
         this.mayachainQuery = mayachainQuery;
         this.wallet = wallet;

package/lib/mayachain-action.d.ts

@@ -7,11 +7,13 @@ export type NonProtocolActionParams = {
     assetAmount: CryptoAmount<Asset | TokenAsset>;
     recipient: Address;
     memo: string;
+    walletIndex?: number;
 };
 export type ProtocolActionParams = {
     wallet: Wallet;
     assetAmount: CryptoAmount<CompatibleAsset>;
     memo: string;
+    walletIndex?: number;
 };
 export type ActionParams = ProtocolActionParams | NonProtocolActionParams;
 export declare class MayachainAction {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-mayachain-amm",
-  "version": "4.1.18",
+  "version": "4.1.19",
   "description": "module that exposes estimating & swapping cryptocurrency assets on mayachain",
   "keywords": [
     "MAYAChain",
@@ -36,27 +36,27 @@
     "url": "https://github.com/xchainjs/xchainjs-lib/issues"
   },
   "dependencies": {
-    "@xchainjs/xchain-arbitrum": "2.1.3",
-    "@xchainjs/xchain-bitcoin": "2.2.4",
-    "@xchainjs/xchain-cardano": "1.2.0",
-    "@xchainjs/xchain-client": "2.0.13",
+    "@xchainjs/xchain-arbitrum": "2.1.4",
+    "@xchainjs/xchain-bitcoin": "2.2.5",
+    "@xchainjs/xchain-cardano": "1.2.1",
+    "@xchainjs/xchain-client": "2.0.14",
     "@xchainjs/xchain-crypto": "1.0.6",
-    "@xchainjs/xchain-dash": "2.2.4",
-    "@xchainjs/xchain-ethereum": "2.0.18",
-    "@xchainjs/xchain-evm": "2.0.17",
-    "@xchainjs/xchain-kujira": "2.0.13",
-    "@xchainjs/xchain-mayachain": "4.1.4",
-    "@xchainjs/xchain-mayachain-query": "2.1.10",
-    "@xchainjs/xchain-radix": "2.0.14",
-    "@xchainjs/xchain-thorchain": "3.0.17",
+    "@xchainjs/xchain-dash": "2.2.5",
+    "@xchainjs/xchain-ethereum": "2.0.19",
+    "@xchainjs/xchain-evm": "2.0.18",
+    "@xchainjs/xchain-kujira": "2.0.14",
+    "@xchainjs/xchain-mayachain": "4.1.5",
+    "@xchainjs/xchain-mayachain-query": "2.1.11",
+    "@xchainjs/xchain-radix": "2.0.15",
+    "@xchainjs/xchain-thorchain": "3.0.18",
     "@xchainjs/xchain-util": "2.0.7",
-    "@xchainjs/xchain-wallet": "2.0.27",
-    "@xchainjs/xchain-zcash": "1.3.5",
+    "@xchainjs/xchain-wallet": "2.0.28",
+    "@xchainjs/xchain-zcash": "1.3.6",
     "ethers": "^6.14.3"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport-node-hid": "^6.28.6",
-    "axios": "1.15.2",
+    "axios": "1.16.1",
     "axios-mock-adapter": "^2.1.0"
   },
   "publishConfig": {