@xchainjs/xchain-thorchain-amm 0.3.0 → 0.3.2

package/README.md

@@ -28,11 +28,11 @@ Following peer dependencies have to be installed into your project. These are no
     "@xchainjs/xchain-ethereum": "^0.27.0",
     "@xchainjs/xchain-evm": "^0.1.0-alpha2",
     "@xchainjs/xchain-avax": "^0.1.0-alpha3",
-    "@xchainjs/xchain-litecoin": "^0.10.0",
+    "@xchainjs/xchain-litecoin": "^0.10.3",
     "@xchainjs/xchain-midgard": "^0.1.0",
     "@xchainjs/xchain-terra": "^0.3.0",
     "@xchainjs/xchain-thorchain": "^0.26.0",
-    "@xchainjs/xchain-thorchain-query": "^0.1.0",
+    "@xchainjs/xchain-thorchain-query": "^0.1.2",
     "@xchainjs/xchain-thornode": "^0.1.0",
     "@xchainjs/xchain-util": "^0.9.0",
     "axios": "^0.27.2",
@@ -54,6 +54,11 @@ Following peer dependencies have to be installed into your project. These are no
 [How thorchain-amm works](http://docs.xchainjs.org/xchain-thorchain-amm/how-it-works.html)\
 [How to use thorchain-amm](http://docs.xchainjs.org/xchain-thorchain-amm/how-to-use.html)
 
+For live examples
+[Do Swap](https://replit.com/@thorchain/doSwap-Single)
+[Add Liquidity](https://replit.com/@thorchain/addLiquidity)
+[Withdraw liquidity](https://replit.com/@thorchain/removeLiquidity)
+
 ##
 
 tsconfig compiler options

package/lib/index.esm.js

@@ -11,6 +11,7 @@ import { Client as Client$4 } from '@xchainjs/xchain-thorchain';
 import { eqAsset, AssetETH, getContractAddressFromAsset, baseAmount, Chain, assetToString, AssetBTC } from '@xchainjs/xchain-util';
 import { ethers } from 'ethers';
 import { MAX_APPROVAL as MAX_APPROVAL$1 } from '@xchainjs/xchain-evm';
+import { ThorchainQuery } from '@xchainjs/xchain-thorchain-query';
 import { BigNumber } from 'bignumber.js';
 
 /*! *****************************************************************************
@@ -779,22 +780,22 @@ class Wallet {
             const txSubmitted = [];
             // symmetrical add
             if (params.asset.assetAmount.gt(0) && params.rune.assetAmount.gt(0)) {
-                constructedMemo = `+:${params.asset.asset.chain}.${params.asset.asset.symbol}:${addressRune}`;
-                txSubmitted.push(yield this.addOrRemoveAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
-                constructedMemo = `+:${params.asset.asset.chain}.${params.asset.asset.symbol}:${addressAsset}`;
-                txSubmitted.push(yield this.addOrRemoveRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
+                constructedMemo = `+:${params.assetPool}:${addressRune}`;
+                txSubmitted.push(yield this.addAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
+                constructedMemo = `+:${params.assetPool}:${addressAsset}`;
+                txSubmitted.push(yield this.addRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
                 return txSubmitted;
             }
             else if (params.asset.assetAmount.gt(0) && params.rune.assetAmount.eq(0)) {
                 // asymmetrical asset only
-                constructedMemo = `+:${params.asset.asset.chain}.${params.asset.asset.symbol}`;
-                txSubmitted.push(yield this.addOrRemoveAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
+                constructedMemo = `+:${params.assetPool}`;
+                txSubmitted.push(yield this.addAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
                 return txSubmitted;
             }
             else {
                 // asymmetrical rune only
-                constructedMemo = `+:${params.asset.asset.chain}.${params.asset.asset.symbol}`;
-                txSubmitted.push(yield this.addOrRemoveRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
+                constructedMemo = `+:${params.assetPool}`;
+                txSubmitted.push(yield this.addRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
                 return txSubmitted;
             }
         });
@@ -804,35 +805,33 @@ class Wallet {
      * @param params - parameters required for liquidity position
      * @returns object with tx response, url and wait time in seconds
      */
-    removeLiquidity(params) {
+    withdrawLiquidity(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const assetClient = this.clients[params.asset.asset.chain];
-            const inboundAsgard = (yield this.thorchainQuery.thorchainCache.getInboundDetails())[params.asset.asset.chain];
-            if (!(inboundAsgard === null || inboundAsgard === void 0 ? void 0 : inboundAsgard.address)) {
-                throw new Error('Vault address is not defined');
-            }
+            const assetClient = this.clients[params.assetFee.asset.chain];
+            const inboundAsgard = (yield this.thorchainQuery.thorchainCache.getInboundDetails())[params.assetFee.asset.chain]
+                .address;
             const waitTimeSeconds = params.waitTimeSeconds;
-            const thorchainClient = this.clients[params.rune.asset.chain];
+            const thorchainClient = this.clients[params.runeFee.asset.chain];
             const basisPoints = (params.percentage * 100).toFixed(); // convert to basis points
             let constructedMemo = '';
             const txSubmitted = [];
-            if (params.asset.assetAmount.gt(0) && params.rune.assetAmount.gt(0)) {
-                constructedMemo = `-:${params.asset.asset.chain}.${params.asset.asset.symbol}:${basisPoints}`;
-                txSubmitted.push(yield this.addOrRemoveAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard.address));
-                constructedMemo = `-:${params.asset.asset.chain}.${params.asset.asset.symbol}:${basisPoints}`;
-                txSubmitted.push(yield this.addOrRemoveRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
+            if (params.assetAddress && params.runeAddress) {
+                constructedMemo = `-:${params.assetPool}:${basisPoints}`;
+                txSubmitted.push(yield this.withdrawAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
+                constructedMemo = `-:${params.assetPool}:${basisPoints}`;
+                txSubmitted.push(yield this.withdrawRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
                 return txSubmitted;
             }
-            else if (params.asset.assetAmount.gt(0) && params.rune.assetAmount.eq(0)) {
+            else if (params.assetAddress && !params.runeAddress) {
                 // asymmetrical asset only
-                constructedMemo = `-:${params.asset.asset.chain}.${params.asset.asset.symbol}:${basisPoints}`;
-                txSubmitted.push(yield this.addOrRemoveAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard.address));
+                constructedMemo = `-:${params.assetPool}:${basisPoints}`;
+                txSubmitted.push(yield this.withdrawAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
                 return txSubmitted;
             }
             else {
                 // asymmetrical rune only
-                constructedMemo = `-:${params.asset.asset.chain}.${params.asset.asset.symbol}:${basisPoints}`;
-                txSubmitted.push(yield this.addOrRemoveRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
+                constructedMemo = `-:${params.assetPool}:${basisPoints}`;
+                txSubmitted.push(yield this.withdrawRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
                 return txSubmitted;
             }
         });
@@ -846,7 +845,7 @@ class Wallet {
      * @param inboundAsgard - inbound Asgard address for the LP
      * @returns - tx object
      */
-    addOrRemoveAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard) {
+    addAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard) {
         return __awaiter(this, void 0, void 0, function* () {
             if (params.asset.asset.chain === Chain.Ethereum) {
                 const addParams = {
@@ -856,7 +855,6 @@ class Wallet {
                     feeOption: FeeOption.Fast,
                     memo: constructedMemo,
                 };
-                console.log(addParams.amount.amount().toNumber());
                 const hash = yield this.ethHelper.sendDeposit(addParams);
                 return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
             }
@@ -881,7 +879,6 @@ class Wallet {
                     memo: constructedMemo,
                 };
                 try {
-                    console.log(addParams);
                     const hash = yield assetClient.transfer(addParams);
                     return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
                 }
@@ -892,13 +889,67 @@ class Wallet {
             }
         });
     }
+    /**
+     *
+     * @param params - parameters for withdraw liquidity
+     * @param constructedMemo - memo needed for thorchain execution
+     * @param assetClient - asset client to call transfer
+     * @param waitTimeSeconds - return back estimated wait
+     * @param inboundAsgard - destination address
+     * @returns - tx object
+     */
+    withdrawAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (params.assetFee.asset.chain === Chain.Ethereum) {
+                const withdrawParams = {
+                    wallIndex: 0,
+                    asset: params.assetFee.asset,
+                    amount: params.assetFee.baseAmount,
+                    feeOption: FeeOption.Fast,
+                    memo: constructedMemo,
+                };
+                // console.log(withdrawParams.amount.amount().toNumber())
+                const hash = yield this.ethHelper.sendDeposit(withdrawParams);
+                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+            }
+            else if (params.assetFee.asset.chain === Chain.Avalanche) {
+                const withdrawParams = {
+                    wallIndex: 0,
+                    asset: params.assetFee.asset,
+                    amount: params.assetFee.baseAmount,
+                    feeOption: FeeOption.Fast,
+                    memo: constructedMemo,
+                };
+                const evmHelper = new EvmHelper(this.clients.AVAX, this.thorchainQuery.thorchainCache);
+                const hash = yield evmHelper.sendDeposit(withdrawParams);
+                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+            }
+            else {
+                const withdrawParams = {
+                    wallIndex: 0,
+                    asset: params.assetFee.asset,
+                    amount: params.assetFee.baseAmount,
+                    recipient: inboundAsgard,
+                    memo: constructedMemo,
+                };
+                try {
+                    const hash = yield assetClient.transfer(withdrawParams);
+                    return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                }
+                catch (err) {
+                    const hash = JSON.stringify(err);
+                    return { hash, url: assetClient.getExplorerAddressUrl(assetClient.getAddress()), waitTimeSeconds };
+                }
+            }
+        });
+    }
     /**
      *
      * @param params - deposit parameters
      * @param memo - memo needed to withdraw lp
      * @returns - tx object
      */
-    addOrRemoveRuneLP(params, memo, thorchainClient, waitTimeSeconds) {
+    addRuneLP(params, memo, thorchainClient, waitTimeSeconds) {
         return __awaiter(this, void 0, void 0, function* () {
             const thorClient = this.clients.THOR;
             const addParams = {
@@ -906,7 +957,26 @@ class Wallet {
                 amount: params.rune.baseAmount,
                 memo: memo,
             };
-            console.log(addParams);
+            // console.log(addParams)
+            const hash = yield thorClient.deposit(addParams);
+            return { hash, url: thorchainClient.getExplorerTxUrl(hash), waitTimeSeconds };
+        });
+    }
+    /**
+     *
+     * @param params - withdraw parameters
+     * @param memo - memo needed to withdraw lp
+     * @returns - tx object
+     */
+    withdrawRuneLP(params, memo, thorchainClient, waitTimeSeconds) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const thorClient = this.clients.THOR;
+            const addParams = {
+                asset: params.runeFee.asset,
+                amount: params.runeFee.baseAmount,
+                memo: memo,
+            };
+            // console.log(addParams)
             const hash = yield thorClient.deposit(addParams);
             return { hash, url: thorchainClient.getExplorerTxUrl(hash), waitTimeSeconds };
         });
@@ -914,6 +984,7 @@ class Wallet {
 }
 
 const BN_1 = new BigNumber(1);
+const defaultQuery = new ThorchainQuery();
 /**
  * THORChain Class for interacting with THORChain.
  * Recommended main class to use for swapping with THORChain
@@ -926,7 +997,7 @@ class ThorchainAMM {
      * @param thorchainQuery - an instance of the ThorchainQuery
      * @returns ThorchainAMM
      */
-    constructor(thorchainQuery) {
+    constructor(thorchainQuery = defaultQuery) {
         this.thorchainQuery = thorchainQuery;
     }
     /**
@@ -983,6 +1054,26 @@ class ThorchainAMM {
             });
         });
     }
+    /**
+     * Wraps estimate from thorchain query
+     * @param params - estimate add liquidity
+     * @returns - Estimate add lp object
+     */
+    estimateAddLiquidity(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.thorchainQuery.estimateAddLP(params);
+        });
+    }
+    /**
+     * Wraps estimate withdraw from thorchain query
+     * @param params - estimate withdraw liquidity
+     * @returns - Estimate withdraw lp object
+     */
+    estimateWithdrawLiquidity(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.thorchainQuery.estimateWithdrawLP(params);
+        });
+    }
     /**
      *
      * @param wallet - wallet class
@@ -993,10 +1084,13 @@ class ThorchainAMM {
         return __awaiter(this, void 0, void 0, function* () {
             // Check amounts are greater than fees and use return estimated wait
             const checkLPAdd = yield this.thorchainQuery.estimateAddLP(params);
+            if (!checkLPAdd.canAdd)
+                throw Error(`${checkLPAdd.errors}`);
             return wallet.addLiquidity({
                 asset: params.asset,
                 rune: params.rune,
                 waitTimeSeconds: checkLPAdd.estimatedWaitSeconds,
+                assetPool: checkLPAdd.assetPool,
             });
         });
     }
@@ -1006,15 +1100,18 @@ class ThorchainAMM {
      * @param wallet - wallet needed to perform tx
      * @return
      */
-    removeLiquidityPosition(wallet, params) {
+    withdrawLiquidityPosition(wallet, params) {
         return __awaiter(this, void 0, void 0, function* () {
             // Caution Dust Limits: BTC,BCH,LTC chains 10k sats; DOGE 1m Sats; ETH 0 wei; THOR 0 RUNE.
-            const estimateWithrawLp = yield this.thorchainQuery.estimateWithdrawLP(params);
-            return wallet.removeLiquidity({
-                asset: estimateWithrawLp.transactionFee.assetFee,
-                rune: estimateWithrawLp.transactionFee.runeFee,
+            const withdrawParams = yield this.thorchainQuery.estimateWithdrawLP(params);
+            return wallet.withdrawLiquidity({
+                assetFee: withdrawParams.transactionFee.assetFee,
+                runeFee: withdrawParams.transactionFee.runeFee,
+                waitTimeSeconds: withdrawParams.estimatedWaitSeconds,
                 percentage: params.percentage,
-                waitTimeSeconds: estimateWithrawLp.estimatedWaitSeconds,
+                assetPool: withdrawParams.assetPool,
+                assetAddress: withdrawParams.assetAddress,
+                runeAddress: withdrawParams.runeAddress,
             });
         });
     }

package/lib/index.js

@@ -15,6 +15,7 @@ var xchainThorchain = require('@xchainjs/xchain-thorchain');
 var xchainUtil = require('@xchainjs/xchain-util');
 var ethers = require('ethers');
 var xchainEvm = require('@xchainjs/xchain-evm');
+var xchainThorchainQuery = require('@xchainjs/xchain-thorchain-query');
 var bignumber_js = require('bignumber.js');
 
 /*! *****************************************************************************
@@ -783,22 +784,22 @@ class Wallet {
             const txSubmitted = [];
             // symmetrical add
             if (params.asset.assetAmount.gt(0) && params.rune.assetAmount.gt(0)) {
-                constructedMemo = `+:${params.asset.asset.chain}.${params.asset.asset.symbol}:${addressRune}`;
-                txSubmitted.push(yield this.addOrRemoveAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
-                constructedMemo = `+:${params.asset.asset.chain}.${params.asset.asset.symbol}:${addressAsset}`;
-                txSubmitted.push(yield this.addOrRemoveRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
+                constructedMemo = `+:${params.assetPool}:${addressRune}`;
+                txSubmitted.push(yield this.addAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
+                constructedMemo = `+:${params.assetPool}:${addressAsset}`;
+                txSubmitted.push(yield this.addRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
                 return txSubmitted;
             }
             else if (params.asset.assetAmount.gt(0) && params.rune.assetAmount.eq(0)) {
                 // asymmetrical asset only
-                constructedMemo = `+:${params.asset.asset.chain}.${params.asset.asset.symbol}`;
-                txSubmitted.push(yield this.addOrRemoveAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
+                constructedMemo = `+:${params.assetPool}`;
+                txSubmitted.push(yield this.addAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
                 return txSubmitted;
             }
             else {
                 // asymmetrical rune only
-                constructedMemo = `+:${params.asset.asset.chain}.${params.asset.asset.symbol}`;
-                txSubmitted.push(yield this.addOrRemoveRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
+                constructedMemo = `+:${params.assetPool}`;
+                txSubmitted.push(yield this.addRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
                 return txSubmitted;
             }
         });
@@ -808,35 +809,33 @@ class Wallet {
      * @param params - parameters required for liquidity position
      * @returns object with tx response, url and wait time in seconds
      */
-    removeLiquidity(params) {
+    withdrawLiquidity(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const assetClient = this.clients[params.asset.asset.chain];
-            const inboundAsgard = (yield this.thorchainQuery.thorchainCache.getInboundDetails())[params.asset.asset.chain];
-            if (!(inboundAsgard === null || inboundAsgard === void 0 ? void 0 : inboundAsgard.address)) {
-                throw new Error('Vault address is not defined');
-            }
+            const assetClient = this.clients[params.assetFee.asset.chain];
+            const inboundAsgard = (yield this.thorchainQuery.thorchainCache.getInboundDetails())[params.assetFee.asset.chain]
+                .address;
             const waitTimeSeconds = params.waitTimeSeconds;
-            const thorchainClient = this.clients[params.rune.asset.chain];
+            const thorchainClient = this.clients[params.runeFee.asset.chain];
             const basisPoints = (params.percentage * 100).toFixed(); // convert to basis points
             let constructedMemo = '';
             const txSubmitted = [];
-            if (params.asset.assetAmount.gt(0) && params.rune.assetAmount.gt(0)) {
-                constructedMemo = `-:${params.asset.asset.chain}.${params.asset.asset.symbol}:${basisPoints}`;
-                txSubmitted.push(yield this.addOrRemoveAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard.address));
-                constructedMemo = `-:${params.asset.asset.chain}.${params.asset.asset.symbol}:${basisPoints}`;
-                txSubmitted.push(yield this.addOrRemoveRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
+            if (params.assetAddress && params.runeAddress) {
+                constructedMemo = `-:${params.assetPool}:${basisPoints}`;
+                txSubmitted.push(yield this.withdrawAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
+                constructedMemo = `-:${params.assetPool}:${basisPoints}`;
+                txSubmitted.push(yield this.withdrawRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
                 return txSubmitted;
             }
-            else if (params.asset.assetAmount.gt(0) && params.rune.assetAmount.eq(0)) {
+            else if (params.assetAddress && !params.runeAddress) {
                 // asymmetrical asset only
-                constructedMemo = `-:${params.asset.asset.chain}.${params.asset.asset.symbol}:${basisPoints}`;
-                txSubmitted.push(yield this.addOrRemoveAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard.address));
+                constructedMemo = `-:${params.assetPool}:${basisPoints}`;
+                txSubmitted.push(yield this.withdrawAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
                 return txSubmitted;
             }
             else {
                 // asymmetrical rune only
-                constructedMemo = `-:${params.asset.asset.chain}.${params.asset.asset.symbol}:${basisPoints}`;
-                txSubmitted.push(yield this.addOrRemoveRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
+                constructedMemo = `-:${params.assetPool}:${basisPoints}`;
+                txSubmitted.push(yield this.withdrawRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
                 return txSubmitted;
             }
         });
@@ -850,7 +849,7 @@ class Wallet {
      * @param inboundAsgard - inbound Asgard address for the LP
      * @returns - tx object
      */
-    addOrRemoveAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard) {
+    addAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard) {
         return __awaiter(this, void 0, void 0, function* () {
             if (params.asset.asset.chain === xchainUtil.Chain.Ethereum) {
                 const addParams = {
@@ -860,7 +859,6 @@ class Wallet {
                     feeOption: xchainClient.FeeOption.Fast,
                     memo: constructedMemo,
                 };
-                console.log(addParams.amount.amount().toNumber());
                 const hash = yield this.ethHelper.sendDeposit(addParams);
                 return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
             }
@@ -885,7 +883,6 @@ class Wallet {
                     memo: constructedMemo,
                 };
                 try {
-                    console.log(addParams);
                     const hash = yield assetClient.transfer(addParams);
                     return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
                 }
@@ -896,13 +893,67 @@ class Wallet {
             }
         });
     }
+    /**
+     *
+     * @param params - parameters for withdraw liquidity
+     * @param constructedMemo - memo needed for thorchain execution
+     * @param assetClient - asset client to call transfer
+     * @param waitTimeSeconds - return back estimated wait
+     * @param inboundAsgard - destination address
+     * @returns - tx object
+     */
+    withdrawAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (params.assetFee.asset.chain === xchainUtil.Chain.Ethereum) {
+                const withdrawParams = {
+                    wallIndex: 0,
+                    asset: params.assetFee.asset,
+                    amount: params.assetFee.baseAmount,
+                    feeOption: xchainClient.FeeOption.Fast,
+                    memo: constructedMemo,
+                };
+                // console.log(withdrawParams.amount.amount().toNumber())
+                const hash = yield this.ethHelper.sendDeposit(withdrawParams);
+                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+            }
+            else if (params.assetFee.asset.chain === xchainUtil.Chain.Avalanche) {
+                const withdrawParams = {
+                    wallIndex: 0,
+                    asset: params.assetFee.asset,
+                    amount: params.assetFee.baseAmount,
+                    feeOption: xchainClient.FeeOption.Fast,
+                    memo: constructedMemo,
+                };
+                const evmHelper = new EvmHelper(this.clients.AVAX, this.thorchainQuery.thorchainCache);
+                const hash = yield evmHelper.sendDeposit(withdrawParams);
+                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+            }
+            else {
+                const withdrawParams = {
+                    wallIndex: 0,
+                    asset: params.assetFee.asset,
+                    amount: params.assetFee.baseAmount,
+                    recipient: inboundAsgard,
+                    memo: constructedMemo,
+                };
+                try {
+                    const hash = yield assetClient.transfer(withdrawParams);
+                    return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                }
+                catch (err) {
+                    const hash = JSON.stringify(err);
+                    return { hash, url: assetClient.getExplorerAddressUrl(assetClient.getAddress()), waitTimeSeconds };
+                }
+            }
+        });
+    }
     /**
      *
      * @param params - deposit parameters
      * @param memo - memo needed to withdraw lp
      * @returns - tx object
      */
-    addOrRemoveRuneLP(params, memo, thorchainClient, waitTimeSeconds) {
+    addRuneLP(params, memo, thorchainClient, waitTimeSeconds) {
         return __awaiter(this, void 0, void 0, function* () {
             const thorClient = this.clients.THOR;
             const addParams = {
@@ -910,7 +961,26 @@ class Wallet {
                 amount: params.rune.baseAmount,
                 memo: memo,
             };
-            console.log(addParams);
+            // console.log(addParams)
+            const hash = yield thorClient.deposit(addParams);
+            return { hash, url: thorchainClient.getExplorerTxUrl(hash), waitTimeSeconds };
+        });
+    }
+    /**
+     *
+     * @param params - withdraw parameters
+     * @param memo - memo needed to withdraw lp
+     * @returns - tx object
+     */
+    withdrawRuneLP(params, memo, thorchainClient, waitTimeSeconds) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const thorClient = this.clients.THOR;
+            const addParams = {
+                asset: params.runeFee.asset,
+                amount: params.runeFee.baseAmount,
+                memo: memo,
+            };
+            // console.log(addParams)
             const hash = yield thorClient.deposit(addParams);
             return { hash, url: thorchainClient.getExplorerTxUrl(hash), waitTimeSeconds };
         });
@@ -918,6 +988,7 @@ class Wallet {
 }
 
 const BN_1 = new bignumber_js.BigNumber(1);
+const defaultQuery = new xchainThorchainQuery.ThorchainQuery();
 /**
  * THORChain Class for interacting with THORChain.
  * Recommended main class to use for swapping with THORChain
@@ -930,7 +1001,7 @@ class ThorchainAMM {
      * @param thorchainQuery - an instance of the ThorchainQuery
      * @returns ThorchainAMM
      */
-    constructor(thorchainQuery) {
+    constructor(thorchainQuery = defaultQuery) {
         this.thorchainQuery = thorchainQuery;
     }
     /**
@@ -987,6 +1058,26 @@ class ThorchainAMM {
             });
         });
     }
+    /**
+     * Wraps estimate from thorchain query
+     * @param params - estimate add liquidity
+     * @returns - Estimate add lp object
+     */
+    estimateAddLiquidity(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.thorchainQuery.estimateAddLP(params);
+        });
+    }
+    /**
+     * Wraps estimate withdraw from thorchain query
+     * @param params - estimate withdraw liquidity
+     * @returns - Estimate withdraw lp object
+     */
+    estimateWithdrawLiquidity(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.thorchainQuery.estimateWithdrawLP(params);
+        });
+    }
     /**
      *
      * @param wallet - wallet class
@@ -997,10 +1088,13 @@ class ThorchainAMM {
         return __awaiter(this, void 0, void 0, function* () {
             // Check amounts are greater than fees and use return estimated wait
             const checkLPAdd = yield this.thorchainQuery.estimateAddLP(params);
+            if (!checkLPAdd.canAdd)
+                throw Error(`${checkLPAdd.errors}`);
             return wallet.addLiquidity({
                 asset: params.asset,
                 rune: params.rune,
                 waitTimeSeconds: checkLPAdd.estimatedWaitSeconds,
+                assetPool: checkLPAdd.assetPool,
             });
         });
     }
@@ -1010,15 +1104,18 @@ class ThorchainAMM {
      * @param wallet - wallet needed to perform tx
      * @return
      */
-    removeLiquidityPosition(wallet, params) {
+    withdrawLiquidityPosition(wallet, params) {
         return __awaiter(this, void 0, void 0, function* () {
             // Caution Dust Limits: BTC,BCH,LTC chains 10k sats; DOGE 1m Sats; ETH 0 wei; THOR 0 RUNE.
-            const estimateWithrawLp = yield this.thorchainQuery.estimateWithdrawLP(params);
-            return wallet.removeLiquidity({
-                asset: estimateWithrawLp.transactionFee.assetFee,
-                rune: estimateWithrawLp.transactionFee.runeFee,
+            const withdrawParams = yield this.thorchainQuery.estimateWithdrawLP(params);
+            return wallet.withdrawLiquidity({
+                assetFee: withdrawParams.transactionFee.assetFee,
+                runeFee: withdrawParams.transactionFee.runeFee,
+                waitTimeSeconds: withdrawParams.estimatedWaitSeconds,
                 percentage: params.percentage,
-                waitTimeSeconds: estimateWithrawLp.estimatedWaitSeconds,
+                assetPool: withdrawParams.assetPool,
+                assetAddress: withdrawParams.assetAddress,
+                runeAddress: withdrawParams.runeAddress,
             });
         });
     }

package/lib/thorchain-amm.d.ts

@@ -1,4 +1,4 @@
-import { AddliquidityPosition, EstimateSwapParams, RemoveLiquidityPosition, ThorchainQuery, TxDetails } from '@xchainjs/xchain-thorchain-query';
+import { AddliquidityPosition, EstimateAddLP, EstimateSwapParams, EstimateWithdrawLP, ThorchainQuery, TxDetails, WithdrawLiquidityPosition } from '@xchainjs/xchain-thorchain-query';
 import { TxSubmitted } from './types';
 import { Wallet } from './wallet';
 /**
@@ -14,7 +14,7 @@ export declare class ThorchainAMM {
      * @param thorchainQuery - an instance of the ThorchainQuery
      * @returns ThorchainAMM
      */
-    constructor(thorchainQuery: ThorchainQuery);
+    constructor(thorchainQuery?: ThorchainQuery);
     /**
      * Provides a swap estimate for the given swap detail. Will check the params for errors before trying to get the estimate.
      * Uses current pool data, works out inbound and outboud fee, affiliate fees and works out the expected wait time for the swap (in and out)
@@ -32,6 +32,18 @@ export declare class ThorchainAMM {
      * @returns {SwapSubmitted} - Tx Hash, URL of BlockExplorer and expected wait time.
      */
     doSwap(wallet: Wallet, params: EstimateSwapParams): Promise<TxSubmitted>;
+    /**
+     * Wraps estimate from thorchain query
+     * @param params - estimate add liquidity
+     * @returns - Estimate add lp object
+     */
+    estimateAddLiquidity(params: AddliquidityPosition): Promise<EstimateAddLP>;
+    /**
+     * Wraps estimate withdraw from thorchain query
+     * @param params - estimate withdraw liquidity
+     * @returns - Estimate withdraw lp object
+     */
+    estimateWithdrawLiquidity(params: WithdrawLiquidityPosition): Promise<EstimateWithdrawLP>;
     /**
      *
      * @param wallet - wallet class
@@ -45,5 +57,5 @@ export declare class ThorchainAMM {
      * @param wallet - wallet needed to perform tx
      * @return
      */
-    removeLiquidityPosition(wallet: Wallet, params: RemoveLiquidityPosition): Promise<TxSubmitted[]>;
+    withdrawLiquidityPosition(wallet: Wallet, params: WithdrawLiquidityPosition): Promise<TxSubmitted[]>;
 }

package/lib/types.d.ts

@@ -22,23 +22,26 @@ export declare type TxSubmitted = {
     url: string;
     waitTimeSeconds: number;
 };
-export declare type AddLiquidity = {
-    asset: CryptoAmount;
-    rune: CryptoAmount;
-    waitTimeSeconds: number;
-};
 export declare type LiquidityPosition = {
     assetPool: LiquidityPool;
     assetAmount: CryptoAmount;
     runeAmount: CryptoAmount;
     impermanentLossProtection: number;
 };
-export declare type RemoveLiquidity = {
+export declare type AddLiquidity = {
     asset: CryptoAmount;
     rune: CryptoAmount;
-    percentage: number;
     waitTimeSeconds: number;
-    asymmetricalWithdraw?: Asset;
+    assetPool: string;
+};
+export declare type WithdrawLiquidity = {
+    assetFee: CryptoAmount;
+    runeFee: CryptoAmount;
+    waitTimeSeconds: number;
+    percentage: number;
+    assetPool: string;
+    assetAddress?: string;
+    runeAddress?: string;
 };
 export declare type DepositParams = {
     walletIndex?: number;

package/lib/wallet.d.ts

@@ -1,7 +1,7 @@
 import { Balance, XChainClient } from '@xchainjs/xchain-client';
 import { ThorchainQuery } from '@xchainjs/xchain-thorchain-query';
 import { Chain } from '@xchainjs/xchain-util';
-import { AddLiquidity, ExecuteSwap, RemoveLiquidity, TxSubmitted } from './types';
+import { AddLiquidity, ExecuteSwap, TxSubmitted, WithdrawLiquidity } from './types';
 declare type AllBalances = {
     chain: Chain;
     address: string;
@@ -51,7 +51,7 @@ export declare class Wallet {
      * @param params - parameters required for liquidity position
      * @returns object with tx response, url and wait time in seconds
      */
-    removeLiquidity(params: RemoveLiquidity): Promise<TxSubmitted[]>;
+    withdrawLiquidity(params: WithdrawLiquidity): Promise<TxSubmitted[]>;
     /**
      *
      * @param params - parameters for add liquidity
@@ -61,13 +61,30 @@ export declare class Wallet {
      * @param inboundAsgard - inbound Asgard address for the LP
      * @returns - tx object
      */
-    private addOrRemoveAssetLP;
+    private addAssetLP;
+    /**
+     *
+     * @param params - parameters for withdraw liquidity
+     * @param constructedMemo - memo needed for thorchain execution
+     * @param assetClient - asset client to call transfer
+     * @param waitTimeSeconds - return back estimated wait
+     * @param inboundAsgard - destination address
+     * @returns - tx object
+     */
+    private withdrawAssetLP;
     /**
      *
      * @param params - deposit parameters
      * @param memo - memo needed to withdraw lp
      * @returns - tx object
      */
-    private addOrRemoveRuneLP;
+    private addRuneLP;
+    /**
+     *
+     * @param params - withdraw parameters
+     * @param memo - memo needed to withdraw lp
+     * @returns - tx object
+     */
+    private withdrawRuneLP;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-thorchain-amm",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "module that exposes estimating & swappping cryptocurrency assets on thorchain",
   "keywords": [
     "THORChain",
@@ -48,12 +48,12 @@
     "@xchainjs/xchain-crypto": "^0.2.6",
     "@xchainjs/xchain-doge": "^0.5.0",
     "@xchainjs/xchain-ethereum": "^0.27.0",
-    "@xchainjs/xchain-evm": "^0.1.0-alpha2",
-    "@xchainjs/xchain-avax": "^0.1.0-alpha3",
-    "@xchainjs/xchain-litecoin": "^0.10.0",
+    "@xchainjs/xchain-evm": "^0.1.0",
+    "@xchainjs/xchain-avax": "^0.1.0",
+    "@xchainjs/xchain-litecoin": "^0.10.3",
     "@xchainjs/xchain-midgard": "0.1.0",
     "@xchainjs/xchain-thorchain": "^0.27.0",
-    "@xchainjs/xchain-thorchain-query": "^0.1.0",
+    "@xchainjs/xchain-thorchain-query": "^0.1.2",
     "@xchainjs/xchain-thornode": "^0.1.0",
     "@xchainjs/xchain-util": "^0.11.0",
     "axios": "^0.25.0",
@@ -73,22 +73,21 @@
     "@binance-chain/javascript-sdk": "^4.2.0",
     "@cosmos-client/core": "0.45.13",
     "@psf/bitcoincashjs-lib": "^4.0.2",
-    "@terra-money/terra.js": "^3.0.2",
-    "@xchainjs/xchain-binance": "^5.6.0",
-    "@xchainjs/xchain-bitcoin": "^0.20.0",
-    "@xchainjs/xchain-bitcoincash": "^0.15.0",
+    "@xchainjs/xchain-binance": "^5.6.4",
+    "@xchainjs/xchain-bitcoin": "^0.20.4",
+    "@xchainjs/xchain-bitcoincash": "^0.15.3",
     "@xchainjs/xchain-client": "^0.13.2",
-    "@xchainjs/xchain-cosmos": "^0.20.0",
+    "@xchainjs/xchain-cosmos": "^0.20.3",
     "@xchainjs/xchain-crypto": "^0.2.6",
-    "@xchainjs/xchain-doge": "^0.5.0",
-    "@xchainjs/xchain-ethereum": "^0.27.0",
-    "@xchainjs/xchain-evm": "^0.1.0-alpha2",
-    "@xchainjs/xchain-avax": "^0.1.0-alpha3",
-    "@xchainjs/xchain-litecoin": "^0.10.0",
+    "@xchainjs/xchain-doge": "^0.5.4",
+    "@xchainjs/xchain-ethereum": "^0.27.3",
+    "@xchainjs/xchain-evm": "^0.1.0",
+    "@xchainjs/xchain-avax": "^0.1.0",
+    "@xchainjs/xchain-litecoin": "^0.10.4",
     "@xchainjs/xchain-midgard": "0.1.0",
     "@xchainjs/xchain-thornode": "^0.1.0",
-    "@xchainjs/xchain-thorchain": "^0.26.0",
-    "@xchainjs/xchain-thorchain-query": "^0.1.0",
+    "@xchainjs/xchain-thorchain": "^0.27.1",
+    "@xchainjs/xchain-thorchain-query": "^0.1.2",
     "@xchainjs/xchain-util": "^0.11.0",
     "axios": "^0.25.0",
     "axios-retry": "^3.2.5",