@xchainjs/xchain-mayachain-amm 4.0.7 → 4.0.9

package/lib/index.esm.js

@@ -1,17 +1,18 @@
 import { AssetAETH, ARBChain, Client, defaultArbParams } from '@xchainjs/xchain-arbitrum';
-import { BTCChain, Client as Client$7, defaultBTCParams } from '@xchainjs/xchain-bitcoin';
+import { ZECChain, Client as Client$1, defaultZECParams } from '@xchainjs/xchain-zcash';
+import { BTCChain, Client as Client$8, defaultBTCParams } from '@xchainjs/xchain-bitcoin';
 import { Network } from '@xchainjs/xchain-client';
-import { DASHChain, Client as Client$5, defaultDashParams } from '@xchainjs/xchain-dash';
-import { AssetETH, ETHChain, Client as Client$6, defaultEthParams } from '@xchainjs/xchain-ethereum';
+import { DASHChain, Client as Client$6, defaultDashParams } from '@xchainjs/xchain-dash';
+import { AssetETH, ETHChain, Client as Client$7, defaultEthParams } from '@xchainjs/xchain-ethereum';
 import { abi, MAX_APPROVAL } from '@xchainjs/xchain-evm';
-import { AssetKUJI, KUJIChain, Client as Client$4, defaultKujiParams } from '@xchainjs/xchain-kujira';
-import { MAYAChain, Client as Client$2, CACAO_DECIMAL, AssetCacao } from '@xchainjs/xchain-mayachain';
+import { AssetKUJI, KUJIChain, Client as Client$5, defaultKujiParams } from '@xchainjs/xchain-kujira';
+import { MAYAChain, Client as Client$3, CACAO_DECIMAL, AssetCacao } from '@xchainjs/xchain-mayachain';
 import { MayachainQuery } from '@xchainjs/xchain-mayachain-query';
-import { RadixChain, Client as Client$1, AssetXRD, generateAddressParam, generateBucketParam, generateStringParam } from '@xchainjs/xchain-radix';
-import { AssetRuneNative, THORChain, Client as Client$3 } from '@xchainjs/xchain-thorchain';
+import { RadixChain, Client as Client$2, AssetXRD, generateAddressParam, generateBucketParam, generateStringParam } from '@xchainjs/xchain-radix';
+import { AssetRuneNative, THORChain, Client as Client$4 } from '@xchainjs/xchain-thorchain';
 import { eqAsset, isSynthAsset, getContractAddressFromAsset, baseAmount, CryptoAmount, assetToString, AssetCryptoAmount } from '@xchainjs/xchain-util';
 import { Wallet } from '@xchainjs/xchain-wallet';
-import { ethers } from 'ethers';
+import { getAddress, ZeroAddress, Contract } from 'ethers';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -93,19 +94,21 @@ const isRadixChain = (chain) => {
 const validateAddress = (network, chain, address) => {
     switch (chain) {
         case BTCChain:
-            return new Client$7(Object.assign(Object.assign({}, defaultBTCParams), { network })).validateAddress(address);
+            return new Client$8(Object.assign(Object.assign({}, defaultBTCParams), { network })).validateAddress(address);
         case ETHChain:
-            return new Client$6(Object.assign(Object.assign({}, defaultEthParams), { network })).validateAddress(address);
+            return new Client$7(Object.assign(Object.assign({}, defaultEthParams), { network })).validateAddress(address);
         case DASHChain:
-            return new Client$5(Object.assign(Object.assign({}, defaultDashParams), { network })).validateAddress(address);
+            return new Client$6(Object.assign(Object.assign({}, defaultDashParams), { network })).validateAddress(address);
         case KUJIChain:
-            return new Client$4(Object.assign(Object.assign({}, defaultKujiParams), { network })).validateAddress(address);
+            return new Client$5(Object.assign(Object.assign({}, defaultKujiParams), { network })).validateAddress(address);
         case THORChain:
-            return new Client$3({ network }).validateAddress(address);
+            return new Client$4({ network }).validateAddress(address);
         case MAYAChain:
-            return new Client$2({ network }).validateAddress(address);
+            return new Client$3({ network }).validateAddress(address);
         case RadixChain:
-            return new Client$1({ network }).validateAddress(address);
+            return new Client$2({ network }).validateAddress(address);
+        case ZECChain:
+            return new Client$1(Object.assign(Object.assign({}, defaultZECParams), { network })).validateAddress(address);
         case ARBChain:
             return new Client(Object.assign(Object.assign({}, defaultArbParams), { network: Network.Mainnet })).validateAddress(address);
         default:
@@ -199,8 +202,8 @@ class MayachainAction {
             // Evm
             const isERC20 = isProtocolERC20Asset(assetAmount.asset);
             const checkSummedContractAddress = isERC20
-                ? ethers.utils.getAddress(getContractAddressFromAsset(assetAmount.asset))
-                : ethers.constants.AddressZero;
+                ? getAddress(getContractAddressFromAsset(assetAmount.asset))
+                : ZeroAddress;
             const expiration = Math.floor(new Date(new Date().getTime() + 15 * 60000).getTime() / 1000);
             const depositParams = [
                 recipient,
@@ -209,9 +212,9 @@ class MayachainAction {
                 memo,
                 expiration,
             ];
-            const routerContract = new ethers.Contract(inboundDetails.router, abi.router);
+            const routerContract = new Contract(inboundDetails.router, abi.router);
             const gasPrices = yield wallet.getFeeRates(assetAmount.asset.chain);
-            const unsignedTx = yield routerContract.populateTransaction.depositWithExpiry(...depositParams);
+            const unsignedTx = yield routerContract.getFunction('depositWithExpiry').populateTransaction(...depositParams);
             const nativeAsset = wallet.getAssetInfo(assetAmount.asset.chain);
             const tx = {
                 asset: nativeAsset.asset,
@@ -254,14 +257,15 @@ class MayachainAMM {
      * @returns {MayachainAMM} Returns the MayachainAMM instance.
      */
     constructor(mayachainQuery = new MayachainQuery(), wallet = new Wallet({
-        BTC: new Client$7(Object.assign(Object.assign({}, defaultBTCParams), { network: Network.Mainnet })),
-        ETH: new Client$6(Object.assign(Object.assign({}, defaultEthParams), { network: Network.Mainnet })),
-        DASH: new Client$5(Object.assign(Object.assign({}, defaultDashParams), { network: Network.Mainnet })),
-        KUJI: new Client$4(Object.assign(Object.assign({}, defaultKujiParams), { network: Network.Mainnet })),
+        BTC: new Client$8(Object.assign(Object.assign({}, defaultBTCParams), { network: Network.Mainnet })),
+        ETH: new Client$7(Object.assign(Object.assign({}, defaultEthParams), { network: Network.Mainnet })),
+        DASH: new Client$6(Object.assign(Object.assign({}, defaultDashParams), { network: Network.Mainnet })),
+        KUJI: new Client$5(Object.assign(Object.assign({}, defaultKujiParams), { network: Network.Mainnet })),
         ARB: new Client(Object.assign(Object.assign({}, defaultArbParams), { network: Network.Mainnet })),
-        THOR: new Client$3({ network: Network.Mainnet }),
-        MAYA: new Client$2({ network: Network.Mainnet }),
-        XRD: new Client$1({ network: Network.Mainnet }),
+        THOR: new Client$4({ network: Network.Mainnet }),
+        MAYA: new Client$3({ network: Network.Mainnet }),
+        XRD: new Client$2({ network: Network.Mainnet }),
+        ZEC: new Client$1(Object.assign(Object.assign({}, defaultZECParams), { 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 xchainZcash = require('@xchainjs/xchain-zcash');
 var xchainBitcoin = require('@xchainjs/xchain-bitcoin');
 var xchainClient = require('@xchainjs/xchain-client');
 var xchainDash = require('@xchainjs/xchain-dash');
@@ -108,6 +109,8 @@ const validateAddress = (network, chain, address) => {
             return new xchainMayachain.Client({ network }).validateAddress(address);
         case xchainRadix.RadixChain:
             return new xchainRadix.Client({ network }).validateAddress(address);
+        case xchainZcash.ZECChain:
+            return new xchainZcash.Client(Object.assign(Object.assign({}, xchainZcash.defaultZECParams), { network })).validateAddress(address);
         case xchainArbitrum.ARBChain:
             return new xchainArbitrum.Client(Object.assign(Object.assign({}, xchainArbitrum.defaultArbParams), { network: xchainClient.Network.Mainnet })).validateAddress(address);
         default:
@@ -201,8 +204,8 @@ class MayachainAction {
             // Evm
             const isERC20 = isProtocolERC20Asset(assetAmount.asset);
             const checkSummedContractAddress = isERC20
-                ? ethers.ethers.utils.getAddress(xchainUtil.getContractAddressFromAsset(assetAmount.asset))
-                : ethers.ethers.constants.AddressZero;
+                ? ethers.getAddress(xchainUtil.getContractAddressFromAsset(assetAmount.asset))
+                : ethers.ZeroAddress;
             const expiration = Math.floor(new Date(new Date().getTime() + 15 * 60000).getTime() / 1000);
             const depositParams = [
                 recipient,
@@ -211,9 +214,9 @@ class MayachainAction {
                 memo,
                 expiration,
             ];
-            const routerContract = new ethers.ethers.Contract(inboundDetails.router, xchainEvm.abi.router);
+            const routerContract = new ethers.Contract(inboundDetails.router, xchainEvm.abi.router);
             const gasPrices = yield wallet.getFeeRates(assetAmount.asset.chain);
-            const unsignedTx = yield routerContract.populateTransaction.depositWithExpiry(...depositParams);
+            const unsignedTx = yield routerContract.getFunction('depositWithExpiry').populateTransaction(...depositParams);
             const nativeAsset = wallet.getAssetInfo(assetAmount.asset.chain);
             const tx = {
                 asset: nativeAsset.asset,
@@ -264,6 +267,7 @@ class MayachainAMM {
         THOR: new xchainThorchain.Client({ network: xchainClient.Network.Mainnet }),
         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 })),
     })) {
         this.mayachainQuery = mayachainQuery;
         this.wallet = wallet;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-mayachain-amm",
-  "version": "4.0.7",
+  "version": "4.0.9",
   "description": "module that exposes estimating & swapping cryptocurrency assets on mayachain",
   "keywords": [
     "MAYAChain",
@@ -36,26 +36,27 @@
     "url": "https://github.com/xchainjs/xchainjs-lib/issues"
   },
   "dependencies": {
-    "@xchainjs/xchain-arbitrum": "2.0.2",
-    "@xchainjs/xchain-bitcoin": "2.0.1",
-    "@xchainjs/xchain-client": "2.0.1",
-    "@xchainjs/xchain-crypto": "1.0.0",
-    "@xchainjs/xchain-dash": "2.0.1",
-    "@xchainjs/xchain-ethereum": "2.0.3",
-    "@xchainjs/xchain-evm": "2.0.2",
-    "@xchainjs/xchain-kujira": "2.0.1",
-    "@xchainjs/xchain-mayachain": "3.0.1",
-    "@xchainjs/xchain-mayachain-query": "2.0.2",
-    "@xchainjs/xchain-radix": "2.0.1",
-    "@xchainjs/xchain-thorchain": "3.0.5",
-    "@xchainjs/xchain-util": "2.0.0",
-    "@xchainjs/xchain-wallet": "2.0.6",
-    "ethers": "5.7.2"
+    "@xchainjs/xchain-arbitrum": "2.0.3",
+    "@xchainjs/xchain-bitcoin": "2.0.2",
+    "@xchainjs/xchain-client": "2.0.2",
+    "@xchainjs/xchain-crypto": "1.0.1",
+    "@xchainjs/xchain-dash": "2.0.2",
+    "@xchainjs/xchain-ethereum": "2.0.4",
+    "@xchainjs/xchain-evm": "2.0.3",
+    "@xchainjs/xchain-kujira": "2.0.2",
+    "@xchainjs/xchain-mayachain": "3.0.2",
+    "@xchainjs/xchain-mayachain-query": "2.0.4",
+    "@xchainjs/xchain-radix": "2.0.2",
+    "@xchainjs/xchain-thorchain": "3.0.6",
+    "@xchainjs/xchain-util": "2.0.1",
+    "@xchainjs/xchain-wallet": "2.0.7",
+    "@xchainjs/xchain-zcash": "1.0.3",
+    "ethers": "^6.14.3"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport-node-hid": "6.28.6",
     "axios": "1.8.4",
-    "axios-mock-adapter": "1.20.0"
+    "axios-mock-adapter": "2.1.0"
   },
   "publishConfig": {
     "access": "public",