@xchainjs/xchain-mayachain-amm 3.0.5 → 3.0.7

package/lib/index.esm.js

@@ -1,15 +1,16 @@
-import { AssetAETH, Client as Client$6, defaultArbParams } from '@xchainjs/xchain-arbitrum';
-import { BTCChain, Client as Client$5, defaultBTCParams } from '@xchainjs/xchain-bitcoin';
+import { AssetAETH, Client as Client$7, defaultArbParams } from '@xchainjs/xchain-arbitrum';
+import { BTCChain, Client as Client$6, defaultBTCParams } from '@xchainjs/xchain-bitcoin';
 import { Network } from '@xchainjs/xchain-client';
-import { DASHChain, Client as Client$3, defaultDashParams } from '@xchainjs/xchain-dash';
-import { AssetETH as AssetETH$1, ETHChain, Client as Client$4, defaultEthParams } from '@xchainjs/xchain-ethereum';
+import { DASHChain, Client as Client$4, defaultDashParams } from '@xchainjs/xchain-dash';
+import { AssetETH as AssetETH$1, ETHChain, Client as Client$5, defaultEthParams } from '@xchainjs/xchain-ethereum';
 import 'crypto';
 import require$$0$4$1 from 'buffer';
 import { ethers } from 'ethers';
-import { KUJIChain, Client as Client$2, defaultKujiParams, AssetKUJI } from '@xchainjs/xchain-kujira';
-import { MAYAChain, Client, AssetCacao, CACAO_DECIMAL } from '@xchainjs/xchain-mayachain';
+import { KUJIChain, Client as Client$3, defaultKujiParams, AssetKUJI } from '@xchainjs/xchain-kujira';
+import { MAYAChain, Client as Client$1, AssetCacao, CACAO_DECIMAL } from '@xchainjs/xchain-mayachain';
 import { MayachainQuery } from '@xchainjs/xchain-mayachain-query';
-import { THORChain, Client as Client$1, AssetRuneNative } from '@xchainjs/xchain-thorchain';
+import { RadixChain, Client, generateAddressParam, AssetXRD, generateBucketParam, generateStringParam } from '@xchainjs/xchain-radix';
+import { THORChain, Client as Client$2, AssetRuneNative } from '@xchainjs/xchain-thorchain';
 import { Wallet as Wallet$1 } from '@xchainjs/xchain-wallet';
 
 /******************************************************************************
@@ -89608,19 +89609,29 @@ const isTokenCryptoAmount = (amount) => {
 const isProtocolBFTChain = (chain) => {
     return [AssetKUJI.chain, AssetRuneNative.chain].includes(chain);
 };
+/**
+ * Check if a chain is Radix chain
+ * @param {Chain} chain to check
+ * @returns true if chain is Radix, otherwise, false
+ */
+const isRadixChain = (chain) => {
+    return chain === RadixChain;
+};
 const validateAddress = (network, chain, address) => {
     switch (chain) {
         case BTCChain:
-            return new Client$5(Object.assign(Object.assign({}, defaultBTCParams), { network })).validateAddress(address);
+            return new Client$6(Object.assign(Object.assign({}, defaultBTCParams), { network })).validateAddress(address);
         case ETHChain:
-            return new Client$4(Object.assign(Object.assign({}, defaultEthParams), { network })).validateAddress(address);
+            return new Client$5(Object.assign(Object.assign({}, defaultEthParams), { network })).validateAddress(address);
         case DASHChain:
-            return new Client$3(Object.assign(Object.assign({}, defaultDashParams), { network })).validateAddress(address);
+            return new Client$4(Object.assign(Object.assign({}, defaultDashParams), { network })).validateAddress(address);
         case KUJIChain:
-            return new Client$2(Object.assign(Object.assign({}, defaultKujiParams), { network })).validateAddress(address);
+            return new Client$3(Object.assign(Object.assign({}, defaultKujiParams), { network })).validateAddress(address);
         case THORChain:
-            return new Client$1({ network }).validateAddress(address);
+            return new Client$2({ network }).validateAddress(address);
         case MAYAChain:
+            return new Client$1({ network }).validateAddress(address);
+        case RadixChain:
             return new Client({ network }).validateAddress(address);
         default:
             throw Error('Unsupported chain');
@@ -89651,8 +89662,8 @@ class MayachainAction {
     }
     static makeNonProtocolAction({ wallet, assetAmount, recipient, memo, }) {
         return __awaiter$8(this, void 0, void 0, function* () {
-            // Non EVM actions
-            if (!isProtocolEVMChain(assetAmount.asset.chain)) {
+            // Non EVM actions and non Radix action
+            if (!isProtocolEVMChain(assetAmount.asset.chain) && !eqAsset(assetAmount.asset, AssetXRD)) {
                 if (isProtocolBFTChain(assetAmount.asset.chain)) {
                     const hash = yield wallet.transfer({
                         asset: assetAmount.asset,
@@ -89665,7 +89676,12 @@ class MayachainAction {
                         url: yield wallet.getExplorerTxUrl(assetAmount.asset.chain, hash),
                     };
                 }
-                const feeRates = yield wallet.getFeeRates(assetAmount.asset.chain);
+                const feeRates = yield wallet.estimateTransferFees({
+                    asset: assetAmount.asset,
+                    amount: assetAmount.baseAmount,
+                    recipient,
+                    memo,
+                });
                 const hash = yield wallet.transfer({
                     asset: assetAmount.asset,
                     amount: assetAmount.baseAmount,
@@ -89678,11 +89694,34 @@ class MayachainAction {
                     url: yield wallet.getExplorerTxUrl(assetAmount.asset.chain, hash),
                 };
             }
-            // EVM actions
+            // EVM actions and Radix go through the router
             const mayachainQuery = new MayachainQuery();
             const inboundDetails = yield mayachainQuery.getChainInboundDetails(assetAmount.asset.chain);
             if (!inboundDetails.router)
                 throw Error(`Unknown router for ${assetAmount.asset.chain} chain`);
+            if (isRadixChain(assetAmount.asset.chain)) {
+                // Radix
+                const hash = yield wallet.transfer({
+                    asset: assetAmount.asset,
+                    recipient: inboundDetails.router,
+                    amount: assetAmount.baseAmount,
+                    methodToCall: {
+                        address: inboundDetails.router,
+                        methodName: 'user_deposit',
+                        params: [
+                            generateAddressParam(yield wallet.getAddress(AssetXRD.chain)),
+                            generateAddressParam(recipient),
+                            generateBucketParam(0),
+                            generateStringParam(memo),
+                        ],
+                    },
+                });
+                return {
+                    hash,
+                    url: yield wallet.getExplorerTxUrl(assetAmount.asset.chain, hash),
+                };
+            }
+            // Evm
             const isERC20 = isProtocolERC20Asset(assetAmount.asset);
             const checkSummedContractAddress = isERC20
                 ? ethers.utils.getAddress(getContractAddressFromAsset(assetAmount.asset))
@@ -89739,13 +89778,14 @@ class MayachainAMM {
      * @returns {MayachainAMM} Returns the MayachainAMM instance.
      */
     constructor(mayachainQuery = new MayachainQuery(), wallet = new Wallet$1({
-        BTC: new Client$5(Object.assign(Object.assign({}, defaultBTCParams), { network: Network.Mainnet })),
-        ETH: new Client$4(Object.assign(Object.assign({}, defaultEthParams), { network: Network.Mainnet })),
-        DASH: new Client$3(Object.assign(Object.assign({}, defaultDashParams), { network: Network.Mainnet })),
-        KUJI: new Client$2(Object.assign(Object.assign({}, defaultKujiParams), { network: Network.Mainnet })),
-        ARB: new Client$6(Object.assign(Object.assign({}, defaultArbParams), { network: Network.Mainnet })),
-        THOR: new Client$1({ network: Network.Mainnet }),
-        MAYA: new Client({ network: Network.Mainnet }),
+        BTC: new Client$6(Object.assign(Object.assign({}, defaultBTCParams), { network: Network.Mainnet })),
+        ETH: new Client$5(Object.assign(Object.assign({}, defaultEthParams), { network: Network.Mainnet })),
+        DASH: new Client$4(Object.assign(Object.assign({}, defaultDashParams), { network: Network.Mainnet })),
+        KUJI: new Client$3(Object.assign(Object.assign({}, defaultKujiParams), { network: Network.Mainnet })),
+        ARB: new Client$7(Object.assign(Object.assign({}, defaultArbParams), { network: Network.Mainnet })),
+        THOR: new Client$2({ network: Network.Mainnet }),
+        MAYA: new Client$1({ network: Network.Mainnet }),
+        XRD: new Client({ network: Network.Mainnet }),
     })) {
         this.mayachainQuery = mayachainQuery;
         this.wallet = wallet;

package/lib/index.js

@@ -13,6 +13,7 @@ var ethers = require('ethers');
 var xchainKujira = require('@xchainjs/xchain-kujira');
 var xchainMayachain = require('@xchainjs/xchain-mayachain');
 var xchainMayachainQuery = require('@xchainjs/xchain-mayachain-query');
+var xchainRadix = require('@xchainjs/xchain-radix');
 var xchainThorchain = require('@xchainjs/xchain-thorchain');
 var xchainWallet = require('@xchainjs/xchain-wallet');
 
@@ -89616,6 +89617,14 @@ const isTokenCryptoAmount = (amount) => {
 const isProtocolBFTChain = (chain) => {
     return [xchainKujira.AssetKUJI.chain, xchainThorchain.AssetRuneNative.chain].includes(chain);
 };
+/**
+ * Check if a chain is Radix chain
+ * @param {Chain} chain to check
+ * @returns true if chain is Radix, otherwise, false
+ */
+const isRadixChain = (chain) => {
+    return chain === xchainRadix.RadixChain;
+};
 const validateAddress = (network, chain, address) => {
     switch (chain) {
         case xchainBitcoin.BTCChain:
@@ -89630,6 +89639,8 @@ const validateAddress = (network, chain, address) => {
             return new xchainThorchain.Client({ network }).validateAddress(address);
         case xchainMayachain.MAYAChain:
             return new xchainMayachain.Client({ network }).validateAddress(address);
+        case xchainRadix.RadixChain:
+            return new xchainRadix.Client({ network }).validateAddress(address);
         default:
             throw Error('Unsupported chain');
     }
@@ -89659,8 +89670,8 @@ class MayachainAction {
     }
     static makeNonProtocolAction({ wallet, assetAmount, recipient, memo, }) {
         return __awaiter$8(this, void 0, void 0, function* () {
-            // Non EVM actions
-            if (!isProtocolEVMChain(assetAmount.asset.chain)) {
+            // Non EVM actions and non Radix action
+            if (!isProtocolEVMChain(assetAmount.asset.chain) && !eqAsset(assetAmount.asset, xchainRadix.AssetXRD)) {
                 if (isProtocolBFTChain(assetAmount.asset.chain)) {
                     const hash = yield wallet.transfer({
                         asset: assetAmount.asset,
@@ -89673,7 +89684,12 @@ class MayachainAction {
                         url: yield wallet.getExplorerTxUrl(assetAmount.asset.chain, hash),
                     };
                 }
-                const feeRates = yield wallet.getFeeRates(assetAmount.asset.chain);
+                const feeRates = yield wallet.estimateTransferFees({
+                    asset: assetAmount.asset,
+                    amount: assetAmount.baseAmount,
+                    recipient,
+                    memo,
+                });
                 const hash = yield wallet.transfer({
                     asset: assetAmount.asset,
                     amount: assetAmount.baseAmount,
@@ -89686,11 +89702,34 @@ class MayachainAction {
                     url: yield wallet.getExplorerTxUrl(assetAmount.asset.chain, hash),
                 };
             }
-            // EVM actions
+            // EVM actions and Radix go through the router
             const mayachainQuery = new xchainMayachainQuery.MayachainQuery();
             const inboundDetails = yield mayachainQuery.getChainInboundDetails(assetAmount.asset.chain);
             if (!inboundDetails.router)
                 throw Error(`Unknown router for ${assetAmount.asset.chain} chain`);
+            if (isRadixChain(assetAmount.asset.chain)) {
+                // Radix
+                const hash = yield wallet.transfer({
+                    asset: assetAmount.asset,
+                    recipient: inboundDetails.router,
+                    amount: assetAmount.baseAmount,
+                    methodToCall: {
+                        address: inboundDetails.router,
+                        methodName: 'user_deposit',
+                        params: [
+                            xchainRadix.generateAddressParam(yield wallet.getAddress(xchainRadix.AssetXRD.chain)),
+                            xchainRadix.generateAddressParam(recipient),
+                            xchainRadix.generateBucketParam(0),
+                            xchainRadix.generateStringParam(memo),
+                        ],
+                    },
+                });
+                return {
+                    hash,
+                    url: yield wallet.getExplorerTxUrl(assetAmount.asset.chain, hash),
+                };
+            }
+            // Evm
             const isERC20 = isProtocolERC20Asset(assetAmount.asset);
             const checkSummedContractAddress = isERC20
                 ? ethers.ethers.utils.getAddress(getContractAddressFromAsset(assetAmount.asset))
@@ -89754,6 +89793,7 @@ class MayachainAMM {
         ARB: new xchainArbitrum.Client(Object.assign(Object.assign({}, xchainArbitrum.defaultArbParams), { network: xchainClient.Network.Mainnet })),
         THOR: new xchainThorchain.Client({ network: xchainClient.Network.Mainnet }),
         MAYA: new xchainMayachain.Client({ network: xchainClient.Network.Mainnet }),
+        XRD: new xchainRadix.Client({ network: xchainClient.Network.Mainnet }),
     })) {
         this.mayachainQuery = mayachainQuery;
         this.wallet = wallet;

package/lib/utils.d.ts

@@ -25,4 +25,10 @@ export declare const isTokenCryptoAmount: (amount: CryptoAmount) => amount is To
  * @returns true if chain is EVM, otherwise, false
  */
 export declare const isProtocolBFTChain: (chain: Chain) => boolean;
+/**
+ * Check if a chain is Radix chain
+ * @param {Chain} chain to check
+ * @returns true if chain is Radix, otherwise, false
+ */
+export declare const isRadixChain: (chain: Chain) => boolean;
 export declare const validateAddress: (network: Network, chain: Chain, address: Address) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-mayachain-amm",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "description": "module that exposes estimating & swapping cryptocurrency assets on mayachain",
   "keywords": [
     "MAYAChain",
@@ -36,16 +36,17 @@
     "url": "https://github.com/xchainjs/xchainjs-lib/issues"
   },
   "dependencies": {
-    "@xchainjs/xchain-arbitrum": "1.0.4",
-    "@xchainjs/xchain-bitcoin": "1.0.2",
-    "@xchainjs/xchain-client": "1.0.2",
-    "@xchainjs/xchain-dash": "1.0.2",
-    "@xchainjs/xchain-ethereum": "1.0.4",
-    "@xchainjs/xchain-kujira": "1.0.2",
-    "@xchainjs/xchain-mayachain": "2.0.2",
-    "@xchainjs/xchain-mayachain-query": "1.0.2",
-    "@xchainjs/xchain-thorchain": "2.0.3",
-    "@xchainjs/xchain-wallet": "1.0.5",
+    "@xchainjs/xchain-arbitrum": "1.0.6",
+    "@xchainjs/xchain-bitcoin": "1.0.3",
+    "@xchainjs/xchain-client": "1.0.3",
+    "@xchainjs/xchain-dash": "1.0.3",
+    "@xchainjs/xchain-ethereum": "1.0.6",
+    "@xchainjs/xchain-kujira": "1.0.4",
+    "@xchainjs/xchain-mayachain": "2.0.4",
+    "@xchainjs/xchain-mayachain-query": "1.0.4",
+    "@xchainjs/xchain-radix": "1.1.0",
+    "@xchainjs/xchain-thorchain": "2.0.5",
+    "@xchainjs/xchain-wallet": "1.0.7",
     "ethers": "5.7.2"
   },
   "devDependencies": {