@xchainjs/xchain-thorchain-amm 0.4.0 → 0.5.0

package/lib/index.esm.js

@@ -325,7 +325,7 @@ class Wallet {
             const isThorchainDestinationAsset = swap.destinationAsset.synth || swap.destinationAsset.chain === THORChain;
             const chain = isThorchainDestinationAsset ? THORChain : swap.destinationAsset.chain;
             // check address
-            if (!this.clients[chain].validateAddress(swap.destinationAddress)) {
+            if (swap.destinationAddress && !this.clients[chain].validateAddress(swap.destinationAddress)) {
                 errors.push(`destinationAddress ${swap.destinationAddress} is not a valid address`);
             }
             // Affiliate address should be THORName or THORAddress
@@ -386,13 +386,12 @@ class Wallet {
     swapRuneTo(swap) {
         return __awaiter(this, void 0, void 0, function* () {
             const thorClient = this.clients.THOR;
-            const waitTimeSeconds = swap.waitTimeSeconds;
             const hash = yield thorClient.deposit({
                 amount: swap.input.baseAmount,
                 asset: swap.input.asset,
                 memo: swap.memo,
             });
-            return { hash, url: this.clients.THOR.getExplorerTxUrl(hash), waitTimeSeconds };
+            return { hash, url: this.clients.THOR.getExplorerTxUrl(hash) };
         });
     }
     /** Function handles all swaps from Non Rune
@@ -403,7 +402,6 @@ class Wallet {
     swapNonRune(swap) {
         return __awaiter(this, void 0, void 0, function* () {
             const client = this.clients[swap.input.asset.chain];
-            const waitTimeSeconds = swap.waitTimeSeconds;
             const inbound = (yield this.thorchainQuery.thorchainCache.getInboundDetails())[swap.input.asset.chain];
             if (!(inbound === null || inbound === void 0 ? void 0 : inbound.address))
                 throw Error(`no asgard address found for ${swap.input.asset.chain}`);
@@ -416,7 +414,7 @@ class Wallet {
                     memo: swap.memo,
                 };
                 const hash = yield this.ethHelper.sendDeposit(params);
-                return { hash, url: client.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: client.getExplorerTxUrl(hash) };
             }
             else if (swap.input.asset.chain === AVAXChain) {
                 const params = {
@@ -427,7 +425,7 @@ class Wallet {
                     memo: swap.memo,
                 };
                 const hash = yield this.evmHelpers['AVAX'].sendDeposit(params);
-                return { hash, url: client.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: client.getExplorerTxUrl(hash) };
             }
             else if (swap.input.asset.chain === BSCChain) {
                 const params = {
@@ -438,7 +436,7 @@ class Wallet {
                     memo: swap.memo,
                 };
                 const hash = yield this.evmHelpers['BSC'].sendDeposit(params);
-                return { hash, url: client.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: client.getExplorerTxUrl(hash) };
             }
             else {
                 const params = {
@@ -449,7 +447,7 @@ class Wallet {
                     memo: swap.memo,
                 };
                 const hash = yield client.transfer(params);
-                return { hash, url: client.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: client.getExplorerTxUrl(hash) };
             }
         });
     }
@@ -466,27 +464,27 @@ class Wallet {
             const thorchainClient = this.clients[params.rune.asset.chain];
             const addressRune = thorchainClient.getAddress();
             const addressAsset = assetClient.getAddress();
-            const waitTimeSeconds = params.waitTimeSeconds;
+            // const waitTimeSeconds = params.waitTimeSeconds
             let constructedMemo = '';
             const txSubmitted = [];
             // symmetrical add
             if (params.asset.assetAmount.gt(0) && params.rune.assetAmount.gt(0)) {
                 constructedMemo = `+:${params.assetPool}:${addressRune}`;
-                txSubmitted.push(yield this.addAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
+                txSubmitted.push(yield this.addAssetLP(params, constructedMemo, assetClient, inboundAsgard));
                 constructedMemo = `+:${params.assetPool}:${addressAsset}`;
-                txSubmitted.push(yield this.addRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
+                txSubmitted.push(yield this.addRuneLP(params, constructedMemo, thorchainClient));
                 return txSubmitted;
             }
             else if (params.asset.assetAmount.gt(0) && params.rune.assetAmount.eq(0)) {
                 // asymmetrical asset only
                 constructedMemo = `+:${params.assetPool}`;
-                txSubmitted.push(yield this.addAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
+                txSubmitted.push(yield this.addAssetLP(params, constructedMemo, assetClient, inboundAsgard));
                 return txSubmitted;
             }
             else {
                 // asymmetrical rune only
                 constructedMemo = `+:${params.assetPool}`;
-                txSubmitted.push(yield this.addRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
+                txSubmitted.push(yield this.addRuneLP(params, constructedMemo, thorchainClient));
                 return txSubmitted;
             }
         });
@@ -501,28 +499,28 @@ class Wallet {
             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 waitTimeSeconds = params.waitTimeSeconds
             const thorchainClient = this.clients[params.runeFee.asset.chain];
             const basisPoints = (params.percentage * 100).toFixed(); // convert to basis points
             let constructedMemo = '';
             const txSubmitted = [];
             if (params.assetAddress && params.runeAddress) {
                 constructedMemo = `-:${params.assetPool}:${basisPoints}`;
-                txSubmitted.push(yield this.withdrawAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
+                txSubmitted.push(yield this.withdrawAssetLP(params, constructedMemo, assetClient, inboundAsgard));
                 constructedMemo = `-:${params.assetPool}:${basisPoints}`;
-                txSubmitted.push(yield this.withdrawRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
+                txSubmitted.push(yield this.withdrawRuneLP(params, constructedMemo, thorchainClient));
                 return txSubmitted;
             }
             else if (params.assetAddress && !params.runeAddress) {
                 // asymmetrical asset only
                 constructedMemo = `-:${params.assetPool}:${basisPoints}`;
-                txSubmitted.push(yield this.withdrawAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
+                txSubmitted.push(yield this.withdrawAssetLP(params, constructedMemo, assetClient, inboundAsgard));
                 return txSubmitted;
             }
             else {
                 // asymmetrical rune only
                 constructedMemo = `-:${params.assetPool}:${basisPoints}`;
-                txSubmitted.push(yield this.withdrawRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
+                txSubmitted.push(yield this.withdrawRuneLP(params, constructedMemo, thorchainClient));
                 return txSubmitted;
             }
         });
@@ -534,7 +532,7 @@ class Wallet {
      * @param waitTimeSeconds - expected wait for the transaction to be processed
      * @returns
      */
-    addSavers(assetAmount, memo, toAddress, waitTimeSeconds) {
+    addSavers(assetAmount, memo, toAddress) {
         return __awaiter(this, void 0, void 0, function* () {
             const assetClient = this.clients[assetAmount.asset.chain];
             if (assetAmount.asset.chain === ETHChain) {
@@ -546,7 +544,7 @@ class Wallet {
                     memo: memo,
                 };
                 const hash = yield this.ethHelper.sendDeposit(addParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else if (assetAmount.asset.chain === AVAXChain) {
                 const addParams = {
@@ -558,7 +556,7 @@ class Wallet {
                 };
                 const evmHelper = new EvmHelper(this.clients.AVAX, this.thorchainQuery.thorchainCache);
                 const hash = yield evmHelper.sendDeposit(addParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else if (assetAmount.asset.chain === BSCChain) {
                 const addParams = {
@@ -570,7 +568,7 @@ class Wallet {
                 };
                 const evmHelper = new EvmHelper(this.clients.BSC, this.thorchainQuery.thorchainCache);
                 const hash = yield evmHelper.sendDeposit(addParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else {
                 const addParams = {
@@ -582,11 +580,11 @@ class Wallet {
                 };
                 try {
                     const hash = yield assetClient.transfer(addParams);
-                    return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                    return { hash, url: assetClient.getExplorerTxUrl(hash) };
                 }
                 catch (err) {
                     const hash = JSON.stringify(err);
-                    return { hash, url: assetClient.getExplorerAddressUrl(assetClient.getAddress()), waitTimeSeconds };
+                    return { hash, url: assetClient.getExplorerAddressUrl(assetClient.getAddress()) };
                 }
             }
         });
@@ -598,7 +596,7 @@ class Wallet {
      * @param waitTimeSeconds - expected wait for the transaction to be processed
      * @returns
      */
-    withdrawSavers(dustAssetAmount, memo, toAddress, waitTimeSeconds) {
+    withdrawSavers(dustAssetAmount, memo, toAddress) {
         return __awaiter(this, void 0, void 0, function* () {
             const assetClient = this.clients[dustAssetAmount.asset.chain];
             if (dustAssetAmount.asset.chain === ETHChain) {
@@ -610,7 +608,7 @@ class Wallet {
                     memo: memo,
                 };
                 const hash = yield this.ethHelper.sendDeposit(addParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else if (dustAssetAmount.asset.chain === AVAXChain) {
                 const addParams = {
@@ -622,7 +620,7 @@ class Wallet {
                 };
                 const evmHelper = new EvmHelper(this.clients.AVAX, this.thorchainQuery.thorchainCache);
                 const hash = yield evmHelper.sendDeposit(addParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else if (dustAssetAmount.asset.chain === BSCChain) {
                 const addParams = {
@@ -634,7 +632,7 @@ class Wallet {
                 };
                 const evmHelper = new EvmHelper(this.clients.BSC, this.thorchainQuery.thorchainCache);
                 const hash = yield evmHelper.sendDeposit(addParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else {
                 const addParams = {
@@ -646,11 +644,11 @@ class Wallet {
                 };
                 try {
                     const hash = yield assetClient.transfer(addParams);
-                    return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                    return { hash, url: assetClient.getExplorerTxUrl(hash) };
                 }
                 catch (err) {
                     const hash = JSON.stringify(err);
-                    return { hash, url: assetClient.getExplorerAddressUrl(assetClient.getAddress()), waitTimeSeconds };
+                    return { hash, url: assetClient.getExplorerAddressUrl(assetClient.getAddress()) };
                 }
             }
         });
@@ -664,7 +662,7 @@ class Wallet {
      * @param inboundAsgard - inbound Asgard address for the LP
      * @returns - tx object
      */
-    addAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard) {
+    addAssetLP(params, constructedMemo, assetClient, inboundAsgard) {
         return __awaiter(this, void 0, void 0, function* () {
             if (params.asset.asset.chain === ETHChain) {
                 const addParams = {
@@ -675,7 +673,7 @@ class Wallet {
                     memo: constructedMemo,
                 };
                 const hash = yield this.ethHelper.sendDeposit(addParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else if (params.asset.asset.chain === AVAXChain) {
                 const addParams = {
@@ -687,7 +685,7 @@ class Wallet {
                 };
                 const evmHelper = new EvmHelper(this.clients.AVAX, this.thorchainQuery.thorchainCache);
                 const hash = yield evmHelper.sendDeposit(addParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else if (params.asset.asset.chain === BSCChain) {
                 const addParams = {
@@ -699,7 +697,7 @@ class Wallet {
                 };
                 const evmHelper = new EvmHelper(this.clients.BSC, this.thorchainQuery.thorchainCache);
                 const hash = yield evmHelper.sendDeposit(addParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else {
                 const addParams = {
@@ -711,11 +709,11 @@ class Wallet {
                 };
                 try {
                     const hash = yield assetClient.transfer(addParams);
-                    return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                    return { hash, url: assetClient.getExplorerTxUrl(hash) };
                 }
                 catch (err) {
                     const hash = JSON.stringify(err);
-                    return { hash, url: assetClient.getExplorerAddressUrl(assetClient.getAddress()), waitTimeSeconds };
+                    return { hash, url: assetClient.getExplorerAddressUrl(assetClient.getAddress()) };
                 }
             }
         });
@@ -729,7 +727,7 @@ class Wallet {
      * @param inboundAsgard - destination address
      * @returns - tx object
      */
-    withdrawAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard) {
+    withdrawAssetLP(params, constructedMemo, assetClient, inboundAsgard) {
         return __awaiter(this, void 0, void 0, function* () {
             if (params.assetFee.asset.chain === ETHChain) {
                 const withdrawParams = {
@@ -741,7 +739,7 @@ class Wallet {
                 };
                 // console.log(withdrawParams.amount.amount().toNumber())
                 const hash = yield this.ethHelper.sendDeposit(withdrawParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else if (params.assetFee.asset.chain === AVAXChain) {
                 const withdrawParams = {
@@ -753,7 +751,7 @@ class Wallet {
                 };
                 const evmHelper = new EvmHelper(this.clients.AVAX, this.thorchainQuery.thorchainCache);
                 const hash = yield evmHelper.sendDeposit(withdrawParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else if (params.assetFee.asset.chain === BSCChain) {
                 const withdrawParams = {
@@ -765,7 +763,7 @@ class Wallet {
                 };
                 const evmHelper = new EvmHelper(this.clients.BSC, this.thorchainQuery.thorchainCache);
                 const hash = yield evmHelper.sendDeposit(withdrawParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else {
                 const withdrawParams = {
@@ -777,11 +775,11 @@ class Wallet {
                 };
                 try {
                     const hash = yield assetClient.transfer(withdrawParams);
-                    return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                    return { hash, url: assetClient.getExplorerTxUrl(hash) };
                 }
                 catch (err) {
                     const hash = JSON.stringify(err);
-                    return { hash, url: assetClient.getExplorerAddressUrl(assetClient.getAddress()), waitTimeSeconds };
+                    return { hash, url: assetClient.getExplorerAddressUrl(assetClient.getAddress()) };
                 }
             }
         });
@@ -792,7 +790,7 @@ class Wallet {
      * @param memo - memo needed to withdraw lp
      * @returns - tx object
      */
-    addRuneLP(params, memo, thorchainClient, waitTimeSeconds) {
+    addRuneLP(params, memo, thorchainClient) {
         return __awaiter(this, void 0, void 0, function* () {
             const thorClient = this.clients.THOR;
             const addParams = {
@@ -801,7 +799,7 @@ class Wallet {
                 memo: memo,
             };
             const hash = yield thorClient.deposit(addParams);
-            return { hash, url: thorchainClient.getExplorerTxUrl(hash), waitTimeSeconds };
+            return { hash, url: thorchainClient.getExplorerTxUrl(hash) };
         });
     }
     /** Function handles liquidity Withdraw for Rune only
@@ -810,7 +808,7 @@ class Wallet {
      * @param memo - memo needed to withdraw lp
      * @returns - tx object
      */
-    withdrawRuneLP(params, memo, thorchainClient, waitTimeSeconds) {
+    withdrawRuneLP(params, memo, thorchainClient) {
         return __awaiter(this, void 0, void 0, function* () {
             const thorClient = this.clients.THOR;
             const addParams = {
@@ -819,7 +817,7 @@ class Wallet {
                 memo: memo,
             };
             const hash = yield thorClient.deposit(addParams);
-            return { hash, url: thorchainClient.getExplorerTxUrl(hash), waitTimeSeconds };
+            return { hash, url: thorchainClient.getExplorerTxUrl(hash) };
         });
     }
 }
@@ -848,12 +846,12 @@ class ThorchainAMM {
   
      * @returns The SwapEstimate
      */
-    estimateSwap({ input, destinationAsset, destinationAddress, affiliateAddress = '', interfaceID = `555`, affiliateFeeBasisPoints = 0, slipLimit, wallet, walletIndex, }) {
+    estimateSwap({ fromAsset, amount, fromAddress, destinationAsset, destinationAddress, affiliateAddress = '', interfaceID = `555`, affiliateBps = 0, toleranceBps, wallet, walletIndex, }) {
         return __awaiter(this, void 0, void 0, function* () {
             let errors = [];
             if (wallet) {
                 const params = {
-                    input,
+                    input: amount,
                     destinationAsset,
                     destinationAddress,
                     memo: '',
@@ -862,14 +860,16 @@ class ThorchainAMM {
                 };
                 errors = yield wallet.validateSwap(params);
             }
-            const estimate = yield this.thorchainQuery.estimateSwap({
-                input,
+            const estimate = yield this.thorchainQuery.quoteSwap({
+                fromAsset,
+                amount,
+                fromAddress,
                 destinationAsset,
                 destinationAddress,
                 affiliateAddress,
                 interfaceID,
-                affiliateFeeBasisPoints,
-                slipLimit,
+                affiliateBps,
+                toleranceBps,
             });
             estimate.txEstimate.errors.push(...errors);
             estimate.txEstimate.canSwap = errors.length == 0;
@@ -886,16 +886,15 @@ class ThorchainAMM {
     doSwap(wallet, params) {
         return __awaiter(this, void 0, void 0, function* () {
             // Thorchain-query call satisfies the data needed for executeSwap to be called.
-            const txDetails = yield this.thorchainQuery.estimateSwap(params);
+            const txDetails = yield this.thorchainQuery.quoteSwap(params);
             if (!txDetails.txEstimate.canSwap) {
                 throw Error(txDetails.txEstimate.errors.join('\n'));
             }
             return yield wallet.executeSwap({
-                input: params.input,
+                input: params.amount,
                 destinationAsset: params.destinationAsset,
                 destinationAddress: params.destinationAddress,
                 memo: txDetails.memo,
-                waitTimeSeconds: txDetails.txEstimate.waitTimeSeconds,
                 walletIndex: params.walletIndex,
                 feeOption: params.feeOption,
             });
@@ -1003,7 +1002,7 @@ class ThorchainAMM {
             const addEstimate = yield this.thorchainQuery.estimateAddSaver(addAssetAmount);
             if (!addEstimate.canAddSaver)
                 throw Error(`Cannot add to savers`);
-            return yield wallet.addSavers(addAssetAmount, addEstimate.memo, addEstimate.toAddress, addEstimate.estimatedWaitTime);
+            return yield wallet.addSavers(addAssetAmount, addEstimate.memo, addEstimate.toAddress);
         });
     }
     /**
@@ -1017,7 +1016,7 @@ class ThorchainAMM {
             const withdrawEstimate = yield this.thorchainQuery.estimateWithdrawSaver(withdrawParams);
             if (withdrawEstimate.errors.length > 0)
                 throw Error(`${withdrawEstimate.errors}`);
-            return yield wallet.withdrawSavers(withdrawEstimate.dustAmount, withdrawEstimate.memo, withdrawEstimate.toAddress, withdrawEstimate.estimatedWaitTime);
+            return yield wallet.withdrawSavers(withdrawEstimate.dustAmount, withdrawEstimate.memo, withdrawEstimate.toAddress);
         });
     }
 }

package/lib/index.js

@@ -329,7 +329,7 @@ class Wallet {
             const isThorchainDestinationAsset = swap.destinationAsset.synth || swap.destinationAsset.chain === xchainThorchain.THORChain;
             const chain = isThorchainDestinationAsset ? xchainThorchain.THORChain : swap.destinationAsset.chain;
             // check address
-            if (!this.clients[chain].validateAddress(swap.destinationAddress)) {
+            if (swap.destinationAddress && !this.clients[chain].validateAddress(swap.destinationAddress)) {
                 errors.push(`destinationAddress ${swap.destinationAddress} is not a valid address`);
             }
             // Affiliate address should be THORName or THORAddress
@@ -390,13 +390,12 @@ class Wallet {
     swapRuneTo(swap) {
         return __awaiter(this, void 0, void 0, function* () {
             const thorClient = this.clients.THOR;
-            const waitTimeSeconds = swap.waitTimeSeconds;
             const hash = yield thorClient.deposit({
                 amount: swap.input.baseAmount,
                 asset: swap.input.asset,
                 memo: swap.memo,
             });
-            return { hash, url: this.clients.THOR.getExplorerTxUrl(hash), waitTimeSeconds };
+            return { hash, url: this.clients.THOR.getExplorerTxUrl(hash) };
         });
     }
     /** Function handles all swaps from Non Rune
@@ -407,7 +406,6 @@ class Wallet {
     swapNonRune(swap) {
         return __awaiter(this, void 0, void 0, function* () {
             const client = this.clients[swap.input.asset.chain];
-            const waitTimeSeconds = swap.waitTimeSeconds;
             const inbound = (yield this.thorchainQuery.thorchainCache.getInboundDetails())[swap.input.asset.chain];
             if (!(inbound === null || inbound === void 0 ? void 0 : inbound.address))
                 throw Error(`no asgard address found for ${swap.input.asset.chain}`);
@@ -420,7 +418,7 @@ class Wallet {
                     memo: swap.memo,
                 };
                 const hash = yield this.ethHelper.sendDeposit(params);
-                return { hash, url: client.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: client.getExplorerTxUrl(hash) };
             }
             else if (swap.input.asset.chain === xchainAvax.AVAXChain) {
                 const params = {
@@ -431,7 +429,7 @@ class Wallet {
                     memo: swap.memo,
                 };
                 const hash = yield this.evmHelpers['AVAX'].sendDeposit(params);
-                return { hash, url: client.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: client.getExplorerTxUrl(hash) };
             }
             else if (swap.input.asset.chain === xchainBsc.BSCChain) {
                 const params = {
@@ -442,7 +440,7 @@ class Wallet {
                     memo: swap.memo,
                 };
                 const hash = yield this.evmHelpers['BSC'].sendDeposit(params);
-                return { hash, url: client.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: client.getExplorerTxUrl(hash) };
             }
             else {
                 const params = {
@@ -453,7 +451,7 @@ class Wallet {
                     memo: swap.memo,
                 };
                 const hash = yield client.transfer(params);
-                return { hash, url: client.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: client.getExplorerTxUrl(hash) };
             }
         });
     }
@@ -470,27 +468,27 @@ class Wallet {
             const thorchainClient = this.clients[params.rune.asset.chain];
             const addressRune = thorchainClient.getAddress();
             const addressAsset = assetClient.getAddress();
-            const waitTimeSeconds = params.waitTimeSeconds;
+            // const waitTimeSeconds = params.waitTimeSeconds
             let constructedMemo = '';
             const txSubmitted = [];
             // symmetrical add
             if (params.asset.assetAmount.gt(0) && params.rune.assetAmount.gt(0)) {
                 constructedMemo = `+:${params.assetPool}:${addressRune}`;
-                txSubmitted.push(yield this.addAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
+                txSubmitted.push(yield this.addAssetLP(params, constructedMemo, assetClient, inboundAsgard));
                 constructedMemo = `+:${params.assetPool}:${addressAsset}`;
-                txSubmitted.push(yield this.addRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
+                txSubmitted.push(yield this.addRuneLP(params, constructedMemo, thorchainClient));
                 return txSubmitted;
             }
             else if (params.asset.assetAmount.gt(0) && params.rune.assetAmount.eq(0)) {
                 // asymmetrical asset only
                 constructedMemo = `+:${params.assetPool}`;
-                txSubmitted.push(yield this.addAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
+                txSubmitted.push(yield this.addAssetLP(params, constructedMemo, assetClient, inboundAsgard));
                 return txSubmitted;
             }
             else {
                 // asymmetrical rune only
                 constructedMemo = `+:${params.assetPool}`;
-                txSubmitted.push(yield this.addRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
+                txSubmitted.push(yield this.addRuneLP(params, constructedMemo, thorchainClient));
                 return txSubmitted;
             }
         });
@@ -505,28 +503,28 @@ class Wallet {
             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 waitTimeSeconds = params.waitTimeSeconds
             const thorchainClient = this.clients[params.runeFee.asset.chain];
             const basisPoints = (params.percentage * 100).toFixed(); // convert to basis points
             let constructedMemo = '';
             const txSubmitted = [];
             if (params.assetAddress && params.runeAddress) {
                 constructedMemo = `-:${params.assetPool}:${basisPoints}`;
-                txSubmitted.push(yield this.withdrawAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
+                txSubmitted.push(yield this.withdrawAssetLP(params, constructedMemo, assetClient, inboundAsgard));
                 constructedMemo = `-:${params.assetPool}:${basisPoints}`;
-                txSubmitted.push(yield this.withdrawRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
+                txSubmitted.push(yield this.withdrawRuneLP(params, constructedMemo, thorchainClient));
                 return txSubmitted;
             }
             else if (params.assetAddress && !params.runeAddress) {
                 // asymmetrical asset only
                 constructedMemo = `-:${params.assetPool}:${basisPoints}`;
-                txSubmitted.push(yield this.withdrawAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard));
+                txSubmitted.push(yield this.withdrawAssetLP(params, constructedMemo, assetClient, inboundAsgard));
                 return txSubmitted;
             }
             else {
                 // asymmetrical rune only
                 constructedMemo = `-:${params.assetPool}:${basisPoints}`;
-                txSubmitted.push(yield this.withdrawRuneLP(params, constructedMemo, thorchainClient, waitTimeSeconds));
+                txSubmitted.push(yield this.withdrawRuneLP(params, constructedMemo, thorchainClient));
                 return txSubmitted;
             }
         });
@@ -538,7 +536,7 @@ class Wallet {
      * @param waitTimeSeconds - expected wait for the transaction to be processed
      * @returns
      */
-    addSavers(assetAmount, memo, toAddress, waitTimeSeconds) {
+    addSavers(assetAmount, memo, toAddress) {
         return __awaiter(this, void 0, void 0, function* () {
             const assetClient = this.clients[assetAmount.asset.chain];
             if (assetAmount.asset.chain === xchainEthereum.ETHChain) {
@@ -550,7 +548,7 @@ class Wallet {
                     memo: memo,
                 };
                 const hash = yield this.ethHelper.sendDeposit(addParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else if (assetAmount.asset.chain === xchainAvax.AVAXChain) {
                 const addParams = {
@@ -562,7 +560,7 @@ class Wallet {
                 };
                 const evmHelper = new EvmHelper(this.clients.AVAX, this.thorchainQuery.thorchainCache);
                 const hash = yield evmHelper.sendDeposit(addParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else if (assetAmount.asset.chain === xchainBsc.BSCChain) {
                 const addParams = {
@@ -574,7 +572,7 @@ class Wallet {
                 };
                 const evmHelper = new EvmHelper(this.clients.BSC, this.thorchainQuery.thorchainCache);
                 const hash = yield evmHelper.sendDeposit(addParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else {
                 const addParams = {
@@ -586,11 +584,11 @@ class Wallet {
                 };
                 try {
                     const hash = yield assetClient.transfer(addParams);
-                    return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                    return { hash, url: assetClient.getExplorerTxUrl(hash) };
                 }
                 catch (err) {
                     const hash = JSON.stringify(err);
-                    return { hash, url: assetClient.getExplorerAddressUrl(assetClient.getAddress()), waitTimeSeconds };
+                    return { hash, url: assetClient.getExplorerAddressUrl(assetClient.getAddress()) };
                 }
             }
         });
@@ -602,7 +600,7 @@ class Wallet {
      * @param waitTimeSeconds - expected wait for the transaction to be processed
      * @returns
      */
-    withdrawSavers(dustAssetAmount, memo, toAddress, waitTimeSeconds) {
+    withdrawSavers(dustAssetAmount, memo, toAddress) {
         return __awaiter(this, void 0, void 0, function* () {
             const assetClient = this.clients[dustAssetAmount.asset.chain];
             if (dustAssetAmount.asset.chain === xchainEthereum.ETHChain) {
@@ -614,7 +612,7 @@ class Wallet {
                     memo: memo,
                 };
                 const hash = yield this.ethHelper.sendDeposit(addParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else if (dustAssetAmount.asset.chain === xchainAvax.AVAXChain) {
                 const addParams = {
@@ -626,7 +624,7 @@ class Wallet {
                 };
                 const evmHelper = new EvmHelper(this.clients.AVAX, this.thorchainQuery.thorchainCache);
                 const hash = yield evmHelper.sendDeposit(addParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else if (dustAssetAmount.asset.chain === xchainBsc.BSCChain) {
                 const addParams = {
@@ -638,7 +636,7 @@ class Wallet {
                 };
                 const evmHelper = new EvmHelper(this.clients.BSC, this.thorchainQuery.thorchainCache);
                 const hash = yield evmHelper.sendDeposit(addParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else {
                 const addParams = {
@@ -650,11 +648,11 @@ class Wallet {
                 };
                 try {
                     const hash = yield assetClient.transfer(addParams);
-                    return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                    return { hash, url: assetClient.getExplorerTxUrl(hash) };
                 }
                 catch (err) {
                     const hash = JSON.stringify(err);
-                    return { hash, url: assetClient.getExplorerAddressUrl(assetClient.getAddress()), waitTimeSeconds };
+                    return { hash, url: assetClient.getExplorerAddressUrl(assetClient.getAddress()) };
                 }
             }
         });
@@ -668,7 +666,7 @@ class Wallet {
      * @param inboundAsgard - inbound Asgard address for the LP
      * @returns - tx object
      */
-    addAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard) {
+    addAssetLP(params, constructedMemo, assetClient, inboundAsgard) {
         return __awaiter(this, void 0, void 0, function* () {
             if (params.asset.asset.chain === xchainEthereum.ETHChain) {
                 const addParams = {
@@ -679,7 +677,7 @@ class Wallet {
                     memo: constructedMemo,
                 };
                 const hash = yield this.ethHelper.sendDeposit(addParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else if (params.asset.asset.chain === xchainAvax.AVAXChain) {
                 const addParams = {
@@ -691,7 +689,7 @@ class Wallet {
                 };
                 const evmHelper = new EvmHelper(this.clients.AVAX, this.thorchainQuery.thorchainCache);
                 const hash = yield evmHelper.sendDeposit(addParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else if (params.asset.asset.chain === xchainBsc.BSCChain) {
                 const addParams = {
@@ -703,7 +701,7 @@ class Wallet {
                 };
                 const evmHelper = new EvmHelper(this.clients.BSC, this.thorchainQuery.thorchainCache);
                 const hash = yield evmHelper.sendDeposit(addParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else {
                 const addParams = {
@@ -715,11 +713,11 @@ class Wallet {
                 };
                 try {
                     const hash = yield assetClient.transfer(addParams);
-                    return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                    return { hash, url: assetClient.getExplorerTxUrl(hash) };
                 }
                 catch (err) {
                     const hash = JSON.stringify(err);
-                    return { hash, url: assetClient.getExplorerAddressUrl(assetClient.getAddress()), waitTimeSeconds };
+                    return { hash, url: assetClient.getExplorerAddressUrl(assetClient.getAddress()) };
                 }
             }
         });
@@ -733,7 +731,7 @@ class Wallet {
      * @param inboundAsgard - destination address
      * @returns - tx object
      */
-    withdrawAssetLP(params, constructedMemo, assetClient, waitTimeSeconds, inboundAsgard) {
+    withdrawAssetLP(params, constructedMemo, assetClient, inboundAsgard) {
         return __awaiter(this, void 0, void 0, function* () {
             if (params.assetFee.asset.chain === xchainEthereum.ETHChain) {
                 const withdrawParams = {
@@ -745,7 +743,7 @@ class Wallet {
                 };
                 // console.log(withdrawParams.amount.amount().toNumber())
                 const hash = yield this.ethHelper.sendDeposit(withdrawParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else if (params.assetFee.asset.chain === xchainAvax.AVAXChain) {
                 const withdrawParams = {
@@ -757,7 +755,7 @@ class Wallet {
                 };
                 const evmHelper = new EvmHelper(this.clients.AVAX, this.thorchainQuery.thorchainCache);
                 const hash = yield evmHelper.sendDeposit(withdrawParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else if (params.assetFee.asset.chain === xchainBsc.BSCChain) {
                 const withdrawParams = {
@@ -769,7 +767,7 @@ class Wallet {
                 };
                 const evmHelper = new EvmHelper(this.clients.BSC, this.thorchainQuery.thorchainCache);
                 const hash = yield evmHelper.sendDeposit(withdrawParams);
-                return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                return { hash, url: assetClient.getExplorerTxUrl(hash) };
             }
             else {
                 const withdrawParams = {
@@ -781,11 +779,11 @@ class Wallet {
                 };
                 try {
                     const hash = yield assetClient.transfer(withdrawParams);
-                    return { hash, url: assetClient.getExplorerTxUrl(hash), waitTimeSeconds };
+                    return { hash, url: assetClient.getExplorerTxUrl(hash) };
                 }
                 catch (err) {
                     const hash = JSON.stringify(err);
-                    return { hash, url: assetClient.getExplorerAddressUrl(assetClient.getAddress()), waitTimeSeconds };
+                    return { hash, url: assetClient.getExplorerAddressUrl(assetClient.getAddress()) };
                 }
             }
         });
@@ -796,7 +794,7 @@ class Wallet {
      * @param memo - memo needed to withdraw lp
      * @returns - tx object
      */
-    addRuneLP(params, memo, thorchainClient, waitTimeSeconds) {
+    addRuneLP(params, memo, thorchainClient) {
         return __awaiter(this, void 0, void 0, function* () {
             const thorClient = this.clients.THOR;
             const addParams = {
@@ -805,7 +803,7 @@ class Wallet {
                 memo: memo,
             };
             const hash = yield thorClient.deposit(addParams);
-            return { hash, url: thorchainClient.getExplorerTxUrl(hash), waitTimeSeconds };
+            return { hash, url: thorchainClient.getExplorerTxUrl(hash) };
         });
     }
     /** Function handles liquidity Withdraw for Rune only
@@ -814,7 +812,7 @@ class Wallet {
      * @param memo - memo needed to withdraw lp
      * @returns - tx object
      */
-    withdrawRuneLP(params, memo, thorchainClient, waitTimeSeconds) {
+    withdrawRuneLP(params, memo, thorchainClient) {
         return __awaiter(this, void 0, void 0, function* () {
             const thorClient = this.clients.THOR;
             const addParams = {
@@ -823,7 +821,7 @@ class Wallet {
                 memo: memo,
             };
             const hash = yield thorClient.deposit(addParams);
-            return { hash, url: thorchainClient.getExplorerTxUrl(hash), waitTimeSeconds };
+            return { hash, url: thorchainClient.getExplorerTxUrl(hash) };
         });
     }
 }
@@ -852,12 +850,12 @@ class ThorchainAMM {
   
      * @returns The SwapEstimate
      */
-    estimateSwap({ input, destinationAsset, destinationAddress, affiliateAddress = '', interfaceID = `555`, affiliateFeeBasisPoints = 0, slipLimit, wallet, walletIndex, }) {
+    estimateSwap({ fromAsset, amount, fromAddress, destinationAsset, destinationAddress, affiliateAddress = '', interfaceID = `555`, affiliateBps = 0, toleranceBps, wallet, walletIndex, }) {
         return __awaiter(this, void 0, void 0, function* () {
             let errors = [];
             if (wallet) {
                 const params = {
-                    input,
+                    input: amount,
                     destinationAsset,
                     destinationAddress,
                     memo: '',
@@ -866,14 +864,16 @@ class ThorchainAMM {
                 };
                 errors = yield wallet.validateSwap(params);
             }
-            const estimate = yield this.thorchainQuery.estimateSwap({
-                input,
+            const estimate = yield this.thorchainQuery.quoteSwap({
+                fromAsset,
+                amount,
+                fromAddress,
                 destinationAsset,
                 destinationAddress,
                 affiliateAddress,
                 interfaceID,
-                affiliateFeeBasisPoints,
-                slipLimit,
+                affiliateBps,
+                toleranceBps,
             });
             estimate.txEstimate.errors.push(...errors);
             estimate.txEstimate.canSwap = errors.length == 0;
@@ -890,16 +890,15 @@ class ThorchainAMM {
     doSwap(wallet, params) {
         return __awaiter(this, void 0, void 0, function* () {
             // Thorchain-query call satisfies the data needed for executeSwap to be called.
-            const txDetails = yield this.thorchainQuery.estimateSwap(params);
+            const txDetails = yield this.thorchainQuery.quoteSwap(params);
             if (!txDetails.txEstimate.canSwap) {
                 throw Error(txDetails.txEstimate.errors.join('\n'));
             }
             return yield wallet.executeSwap({
-                input: params.input,
+                input: params.amount,
                 destinationAsset: params.destinationAsset,
                 destinationAddress: params.destinationAddress,
                 memo: txDetails.memo,
-                waitTimeSeconds: txDetails.txEstimate.waitTimeSeconds,
                 walletIndex: params.walletIndex,
                 feeOption: params.feeOption,
             });
@@ -1007,7 +1006,7 @@ class ThorchainAMM {
             const addEstimate = yield this.thorchainQuery.estimateAddSaver(addAssetAmount);
             if (!addEstimate.canAddSaver)
                 throw Error(`Cannot add to savers`);
-            return yield wallet.addSavers(addAssetAmount, addEstimate.memo, addEstimate.toAddress, addEstimate.estimatedWaitTime);
+            return yield wallet.addSavers(addAssetAmount, addEstimate.memo, addEstimate.toAddress);
         });
     }
     /**
@@ -1021,7 +1020,7 @@ class ThorchainAMM {
             const withdrawEstimate = yield this.thorchainQuery.estimateWithdrawSaver(withdrawParams);
             if (withdrawEstimate.errors.length > 0)
                 throw Error(`${withdrawEstimate.errors}`);
-            return yield wallet.withdrawSavers(withdrawEstimate.dustAmount, withdrawEstimate.memo, withdrawEstimate.toAddress, withdrawEstimate.estimatedWaitTime);
+            return yield wallet.withdrawSavers(withdrawEstimate.dustAmount, withdrawEstimate.memo, withdrawEstimate.toAddress);
         });
     }
 }

package/lib/thorchain-amm.d.ts

@@ -1,7 +1,7 @@
-import { AddliquidityPosition, CryptoAmount, EstimateAddLP, EstimateAddSaver, EstimateSwapParams, EstimateWithdrawLP, EstimateWithdrawSaver, SaversPosition, SaversWithdraw, ThorchainQuery, TxDetails, WithdrawLiquidityPosition, getSaver } from '@xchainjs/xchain-thorchain-query';
+import { AddliquidityPosition, CryptoAmount, EstimateAddLP, EstimateAddSaver, EstimateWithdrawLP, EstimateWithdrawSaver, QuoteSwapParams, SaversPosition, SaversWithdraw, ThorchainQuery, TxDetails, WithdrawLiquidityPosition, getSaver } from '@xchainjs/xchain-thorchain-query';
 import { TxSubmitted } from './types';
 import { Wallet } from './wallet';
-export type AmmEstimateSwapParams = EstimateSwapParams & {
+export type AmmEstimateSwapParams = QuoteSwapParams & {
     wallet: Wallet;
     walletIndex: number;
 };
@@ -27,7 +27,7 @@ export declare class ThorchainAMM {
   
      * @returns The SwapEstimate
      */
-    estimateSwap({ input, destinationAsset, destinationAddress, affiliateAddress, interfaceID, affiliateFeeBasisPoints, slipLimit, wallet, walletIndex, }: AmmEstimateSwapParams): Promise<TxDetails>;
+    estimateSwap({ fromAsset, amount, fromAddress, destinationAsset, destinationAddress, affiliateAddress, interfaceID, affiliateBps, toleranceBps, wallet, walletIndex, }: AmmEstimateSwapParams): Promise<TxDetails>;
     /**
      * Conducts a swap with the given inputs. Should be called after estimateSwap() to ensure the swap is valid
      *

package/lib/types.d.ts

@@ -9,16 +9,14 @@ export type AllBalances = {
 export type ExecuteSwap = {
     input: CryptoAmount;
     destinationAsset: Asset;
-    destinationAddress: Address;
+    destinationAddress?: Address;
     memo: string;
     feeOption?: FeeOption;
-    waitTimeSeconds: number;
     walletIndex: number;
 };
 export type TxSubmitted = {
     hash: string;
     url: string;
-    waitTimeSeconds: number;
 };
 export type LiquidityPosition = {
     assetPool: LiquidityPool;

package/lib/wallet.d.ts

@@ -71,7 +71,7 @@ export declare class Wallet {
      * @param waitTimeSeconds - expected wait for the transaction to be processed
      * @returns
      */
-    addSavers(assetAmount: CryptoAmount, memo: string, toAddress: Address, waitTimeSeconds: number): Promise<TxSubmitted>;
+    addSavers(assetAmount: CryptoAmount, memo: string, toAddress: Address): Promise<TxSubmitted>;
     /**
      *
      * @param assetAmount - amount to withdraw
@@ -79,7 +79,7 @@ export declare class Wallet {
      * @param waitTimeSeconds - expected wait for the transaction to be processed
      * @returns
      */
-    withdrawSavers(dustAssetAmount: CryptoAmount, memo: string, toAddress: Address, waitTimeSeconds: number): Promise<TxSubmitted>;
+    withdrawSavers(dustAssetAmount: CryptoAmount, memo: string, toAddress: Address): Promise<TxSubmitted>;
     /** Function handles liquidity add for all non rune assets
      *
      * @param params - parameters for add liquidity

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-thorchain-amm",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "module that exposes estimating & swappping cryptocurrency assets on thorchain",
   "keywords": [
     "THORChain",
@@ -53,7 +53,7 @@
     "@xchainjs/xchain-litecoin": "^0.12.0",
     "@xchainjs/xchain-midgard": "^0.5.0",
     "@xchainjs/xchain-thorchain": "^0.28.0",
-    "@xchainjs/xchain-thorchain-query": "^0.3.0",
+    "@xchainjs/xchain-thorchain-query": "^0.4.0",
     "@xchainjs/xchain-thornode": "^0.3.0",
     "@xchainjs/xchain-util": "^0.13.0",
     "@xchainjs/xchain-utxo-providers": "^0.2.0",
@@ -88,7 +88,7 @@
     "@xchainjs/xchain-litecoin": "^0.12.0",
     "@xchainjs/xchain-midgard": "^0.5.0",
     "@xchainjs/xchain-thorchain": "^0.28.0",
-    "@xchainjs/xchain-thorchain-query": "^0.3.0",
+    "@xchainjs/xchain-thorchain-query": "^0.4.0",
     "@xchainjs/xchain-thornode": "^0.3.0",
     "@xchainjs/xchain-util": "^0.13.0",
     "@xchainjs/xchain-utxo-providers": "^0.2.0",