@shapeshiftoss/swapper 8.2.0 → 8.3.0

package/dist/api.d.ts

@@ -63,7 +63,8 @@ declare type CommonTradeInput = {
     sellAmount: string;
     sendMax: boolean;
     sellAssetAccountNumber: number;
-    wallet?: HDWallet;
+    wallet: HDWallet;
+    receiveAddress: string;
 };
 export declare type EvmSupportedChainIds = KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet;
 export declare type EvmSupportedChainAdapters = ethereum.ChainAdapter | avalanche.ChainAdapter;

package/dist/swappercli.js

@@ -114,7 +114,9 @@ const main = async () => {
             buyAsset,
             sellAmount: sellAmountBase,
             sellAssetAccountNumber: 0,
-            sendMax: false
+            sendMax: false,
+            receiveAddress: '0xc770eefad204b5180df6a14ee197d99d808ee52d',
+            wallet
         });
     }
     catch (e) {
@@ -135,7 +137,8 @@ const main = async () => {
             sellAmount: sellAmountBase,
             sellAsset,
             sellAssetAccountNumber: 0,
-            buyAssetAccountNumber: 0
+            buyAssetAccountNumber: 0,
+            receiveAddress: '0xc770eefad204b5180df6a14ee197d99d808ee52d'
         });
         const txid = await swapper.executeTrade({ trade, wallet });
         console.info('broadcast tx with id: ', txid);

package/dist/swappers/thorchain/getThorTradeQuote/getTradeQuote.d.ts

@@ -1,7 +1,11 @@
 import { ChainId } from '@shapeshiftoss/caip';
 import { GetTradeQuoteInput, TradeQuote } from '../../../api';
 import { ThorchainSwapperDeps } from '../types';
-export declare const getThorTradeQuote: ({ deps, input }: {
+declare type GetThorTradeQuoteInput = {
     deps: ThorchainSwapperDeps;
     input: GetTradeQuoteInput;
-}) => Promise<TradeQuote<ChainId>>;
+};
+declare type GetThorTradeQuoteReturn = Promise<TradeQuote<ChainId>>;
+declare type GetThorTradeQuote = (args: GetThorTradeQuoteInput) => GetThorTradeQuoteReturn;
+export declare const getThorTradeQuote: GetThorTradeQuote;
+export {};

package/dist/swappers/thorchain/getThorTradeQuote/getTradeQuote.js

@@ -2,61 +2,32 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getThorTradeQuote = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
+const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../api");
 const bignumber_1 = require("../../utils/bignumber");
 const constants_1 = require("../../utils/constants");
 const helpers_1 = require("../../utils/helpers/helpers");
+const getThorTxData_1 = require("../utils/bitcoin/utils/getThorTxData");
 const constants_2 = require("../utils/constants");
-const getThorTxData_1 = require("../utils/ethereum/utils/getThorTxData");
+const estimateTradeFee_1 = require("../utils/estimateTradeFee/estimateTradeFee");
+const getThorTxData_2 = require("../utils/ethereum/utils/getThorTxData");
 const getPriceRatio_1 = require("../utils/getPriceRatio/getPriceRatio");
+const getBtcTxFees_1 = require("../utils/txFeeHelpers/btcTxFees/getBtcTxFees");
 const getEthTxFees_1 = require("../utils/txFeeHelpers/ethTxFees/getEthTxFees");
 const getThorTradeQuote = async ({ deps, input }) => {
-    const { sellAsset, buyAsset, sellAmount, sellAssetAccountNumber, wallet } = input;
+    const { sellAsset, buyAsset, sellAmount, sellAssetAccountNumber, wallet, chainId, receiveAddress } = input;
     if (!wallet)
         throw new api_1.SwapError('[getTradeQuote] - wallet is required', {
             code: api_1.SwapErrorTypes.VALIDATION_FAILED
         });
     try {
-        const { assetReference: sellAssetErc20Address, chainReference, chainNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
-        const isErc20Trade = sellAssetErc20Address.startsWith('0x');
-        const sellAssetChainId = (0, caip_1.toChainId)({ chainReference, chainNamespace });
-        const adapter = deps.adapterManager.get(sellAssetChainId);
+        const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(sellAsset.assetId);
+        const adapter = deps.adapterManager.get(chainId);
         if (!adapter)
-            throw new api_1.SwapError(`[getThorTradeQuote] - No chain adapter found for ${sellAssetChainId}.`, {
+            throw new api_1.SwapError(`[getThorTradeQuote] - No chain adapter found for ${chainId}.`, {
                 code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,
-                details: { sellAssetChainId }
+                details: { chainId }
             });
-        const bip44Params = adapter.buildBIP44Params({ accountNumber: Number(sellAssetAccountNumber) });
-        const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
-        const { data, router } = await (0, getThorTxData_1.getThorTxInfo)({
-            deps,
-            sellAsset,
-            buyAsset,
-            sellAmount,
-            slippageTolerance: constants_1.DEFAULT_SLIPPAGE,
-            destinationAddress: receiveAddress,
-            isErc20Trade
-        });
-        const feeData = await (async () => {
-            switch (sellAssetChainId) {
-                case 'eip155:1':
-                    return await (0, getEthTxFees_1.getEthTxFees)({
-                        deps,
-                        data,
-                        router,
-                        buyAsset,
-                        sellAmount,
-                        adapterManager: deps.adapterManager,
-                        receiveAddress,
-                        sellAssetReference: sellAssetErc20Address
-                    });
-                default:
-                    throw new api_1.SwapError('[getThorTradeQuote] - Asset chainId is not supported.', {
-                        code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,
-                        details: { sellAssetChainId }
-                    });
-            }
-        })();
         const sellAssetId = sellAsset.assetId;
         const buyAssetId = buyAsset.assetId;
         const feeAssetId = (0, caip_1.getFeeAssetIdFromAssetId)(buyAssetId);
@@ -69,22 +40,82 @@ const getThorTradeQuote = async ({ deps, input }) => {
         const priceRatio = await (0, getPriceRatio_1.getPriceRatio)(deps, { sellAssetId, buyAssetId });
         const rate = (0, bignumber_1.bnOrZero)(1).div(priceRatio).toString();
         const buyAmount = (0, helpers_1.normalizeAmount)((0, bignumber_1.bnOrZero)(sellAmount).times(rate));
-        const sellAssetTradeFee = (0, bignumber_1.bnOrZero)(feeData.tradeFee).times((0, bignumber_1.bnOrZero)(feeAssetRatio));
+        const tradeFee = await (0, estimateTradeFee_1.estimateTradeFee)(deps, buyAsset.assetId);
+        const sellAssetTradeFee = (0, bignumber_1.bnOrZero)(tradeFee).times((0, bignumber_1.bnOrZero)(feeAssetRatio));
         // padding minimum by 1.5 the trade fee to avoid thorchain "not enough to cover fee" errors.
         const minimum = (0, bignumber_1.fromBaseUnit)(sellAssetTradeFee.times(1.5).toString(), sellAsset.precision);
-        return {
+        const commonQuoteFields = {
             rate,
-            minimum,
             maximum: constants_2.MAX_THORCHAIN_TRADE,
-            feeData,
             sellAmount,
             buyAmount,
             sources: [{ name: 'thorchain', proportion: '1' }],
-            allowanceContract: router,
             buyAsset,
             sellAsset,
-            sellAssetAccountNumber
+            sellAssetAccountNumber,
+            minimum
         };
+        switch (chainId) {
+            case types_1.KnownChainIds.EthereumMainnet:
+                return (async () => {
+                    const { data, router } = await (0, getThorTxData_2.getThorTxInfo)({
+                        deps,
+                        sellAsset,
+                        buyAsset,
+                        sellAmount,
+                        slippageTolerance: constants_1.DEFAULT_SLIPPAGE,
+                        destinationAddress: receiveAddress
+                    });
+                    const feeData = await (0, getEthTxFees_1.getEthTxFees)({
+                        deps,
+                        data,
+                        router,
+                        buyAsset,
+                        sellAmount,
+                        adapterManager: deps.adapterManager,
+                        receiveAddress,
+                        sellAssetReference: sellAssetErc20Address
+                    });
+                    return {
+                        ...commonQuoteFields,
+                        allowanceContract: router,
+                        feeData
+                    };
+                })();
+            case types_1.KnownChainIds.BitcoinMainnet:
+                return (async () => {
+                    const { vault, opReturnData, pubkey } = await (0, getThorTxData_1.getThorTxInfo)({
+                        deps,
+                        sellAsset,
+                        buyAsset,
+                        sellAmount,
+                        slippageTolerance: constants_1.DEFAULT_SLIPPAGE,
+                        destinationAddress: receiveAddress,
+                        wallet,
+                        bip44Params: input.bip44Params,
+                        accountType: input.accountType
+                    });
+                    const feeData = await (0, getBtcTxFees_1.getBtcTxFees)({
+                        deps,
+                        buyAsset,
+                        sellAmount,
+                        vault,
+                        opReturnData,
+                        pubkey,
+                        adapterManager: deps.adapterManager
+                    });
+                    return {
+                        ...commonQuoteFields,
+                        allowanceContract: '0x0',
+                        feeData
+                    };
+                })();
+            default:
+                throw new api_1.SwapError('[getThorTradeQuote] - Asset chainId is not supported.', {
+                    code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,
+                    details: { chainId }
+                });
+        }
     }
     catch (e) {
         if (e instanceof api_1.SwapError)

package/dist/swappers/thorchain/utils/bitcoin/utils/getThorTxData.d.ts

@@ -0,0 +1,22 @@
+import { HDWallet } from '@shapeshiftoss/hdwallet-core';
+import { Asset, BIP44Params, UtxoAccountType } from '@shapeshiftoss/types';
+import { ThorchainSwapperDeps } from '../../../types';
+declare type GetBtcThorTxInfoArgs = {
+    deps: ThorchainSwapperDeps;
+    sellAsset: Asset;
+    buyAsset: Asset;
+    sellAmount: string;
+    slippageTolerance: string;
+    destinationAddress: string;
+    wallet: HDWallet;
+    bip44Params: BIP44Params;
+    accountType: UtxoAccountType;
+};
+declare type GetBtcThorTxInfoReturn = Promise<{
+    opReturnData: string;
+    vault: string;
+    pubkey: string;
+}>;
+declare type GetBtcThorTxInfo = (args: GetBtcThorTxInfoArgs) => GetBtcThorTxInfoReturn;
+export declare const getThorTxInfo: GetBtcThorTxInfo;
+export {};

package/dist/swappers/thorchain/utils/bitcoin/utils/getThorTxData.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getThorTxInfo = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const api_1 = require("../../../../../api");
+const bignumber_1 = require("../../../../utils/bignumber");
+const getPriceRatio_1 = require("../../getPriceRatio/getPriceRatio");
+const makeSwapMemo_1 = require("../../makeSwapMemo/makeSwapMemo");
+const thorService_1 = require("../../thorService");
+const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress, wallet, bip44Params, accountType }) => {
+    try {
+        const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.midgardUrl}/thorchain/inbound_addresses`);
+        const btcInboundAddresses = inboundAddresses.find((inbound) => inbound.chain === 'BTC');
+        const vault = btcInboundAddresses === null || btcInboundAddresses === void 0 ? void 0 : btcInboundAddresses.address;
+        if (!vault)
+            throw new api_1.SwapError(`[getThorTxInfo]: vault not found for BTC`, {
+                code: api_1.SwapErrorTypes.RESPONSE_ERROR,
+                details: { inboundAddresses }
+            });
+        const priceRatio = await (0, getPriceRatio_1.getPriceRatio)(deps, {
+            buyAssetId: buyAsset.assetId,
+            sellAssetId: sellAsset.assetId
+        });
+        const expectedBuyAmount = (0, bignumber_1.toBaseUnit)((0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(sellAmount).dividedBy(priceRatio), sellAsset.precision), buyAsset.precision);
+        const isValidSlippageRange = (0, bignumber_1.bnOrZero)(slippageTolerance).gte(0) && (0, bignumber_1.bnOrZero)(slippageTolerance).lte(1);
+        if ((0, bignumber_1.bnOrZero)(expectedBuyAmount).lt(0) || !isValidSlippageRange)
+            throw new api_1.SwapError('[getThorTxInfo]: bad expected buy amount or bad slippage tolerance', {
+                code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
+                details: { expectedBuyAmount, slippageTolerance }
+            });
+        const limit = (0, bignumber_1.bnOrZero)(expectedBuyAmount)
+            .times((0, bignumber_1.bn)(1).minus(slippageTolerance))
+            .decimalPlaces(0)
+            .toString();
+        const memo = (0, makeSwapMemo_1.makeSwapMemo)({
+            buyAssetId: buyAsset.assetId,
+            destinationAddress,
+            limit
+        });
+        const adapter = deps.adapterManager.get(caip_1.btcChainId);
+        const pubkey = await adapter.getPublicKey(wallet, bip44Params, accountType);
+        return {
+            opReturnData: memo,
+            vault,
+            pubkey: pubkey.xpub
+        };
+    }
+    catch (e) {
+        if (e instanceof api_1.SwapError)
+            throw e;
+        throw new api_1.SwapError('[getThorTxInfo]', { cause: e, code: api_1.SwapErrorTypes.TRADE_QUOTE_FAILED });
+    }
+};
+exports.getThorTxInfo = getThorTxInfo;

package/dist/swappers/thorchain/utils/ethereum/makeTradeTx.js

@@ -14,8 +14,7 @@ const makeTradeTx = async ({ wallet, bip44Params, sellAmount, buyAsset, sellAsse
             buyAsset,
             sellAmount,
             slippageTolerance,
-            destinationAddress,
-            isErc20Trade
+            destinationAddress
         });
         return adapter.buildCustomTx({
             wallet,

package/dist/swappers/thorchain/utils/ethereum/utils/getThorTxData.d.ts

@@ -1,15 +1,18 @@
 import { Asset } from '@shapeshiftoss/types';
 import { ThorchainSwapperDeps } from '../../../types';
-export declare const getThorTxInfo: ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress, isErc20Trade }: {
+declare type GetBtcThorTxInfoArgs = {
     deps: ThorchainSwapperDeps;
     sellAsset: Asset;
     buyAsset: Asset;
     sellAmount: string;
     slippageTolerance: string;
     destinationAddress: string;
-    isErc20Trade: boolean;
-}) => Promise<{
-    data: any;
+};
+declare type GetBtcThorTxInfoReturn = Promise<{
+    data: string;
     memo: string;
     router: string;
 }>;
+declare type GetBtcThorTxInfo = (args: GetBtcThorTxInfoArgs) => GetBtcThorTxInfoReturn;
+export declare const getThorTxInfo: GetBtcThorTxInfo;
+export {};

package/dist/swappers/thorchain/utils/ethereum/utils/getThorTxData.js

@@ -8,9 +8,10 @@ const getPriceRatio_1 = require("../../getPriceRatio/getPriceRatio");
 const makeSwapMemo_1 = require("../../makeSwapMemo/makeSwapMemo");
 const thorService_1 = require("../../thorService");
 const routerCalldata_1 = require("../routerCalldata");
-const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress, isErc20Trade }) => {
+const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress }) => {
     try {
-        const { assetReference } = (0, caip_1.fromAssetId)(sellAsset.assetId);
+        const { assetReference, assetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
+        const isErc20Trade = assetNamespace === 'erc20';
         const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.midgardUrl}/thorchain/inbound_addresses`);
         const ethInboundAddresses = inboundAddresses.find((inbound) => inbound.chain === 'ETH');
         const vault = ethInboundAddresses === null || ethInboundAddresses === void 0 ? void 0 : ethInboundAddresses.address;
@@ -25,10 +26,11 @@ const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTo
             sellAssetId: sellAsset.assetId
         });
         const expectedBuyAmount = (0, bignumber_1.toBaseUnit)((0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(sellAmount).dividedBy(priceRatio), sellAsset.precision), buyAsset.precision);
-        if (!(0, bignumber_1.bnOrZero)(expectedBuyAmount).gte(0) ||
-            !((0, bignumber_1.bnOrZero)(slippageTolerance).gte(0) && (0, bignumber_1.bnOrZero)(slippageTolerance).lte(1)))
+        const isValidSlippageRange = (0, bignumber_1.bnOrZero)(slippageTolerance).gte(0) && (0, bignumber_1.bnOrZero)(slippageTolerance).lte(1);
+        if ((0, bignumber_1.bnOrZero)(expectedBuyAmount).lt(0) || !isValidSlippageRange)
             throw new api_1.SwapError('[makeTradeTx]: bad expected buy amount or bad slippage tolerance', {
-                code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED
+                code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
+                details: { expectedBuyAmount, slippageTolerance }
             });
         const limit = (0, bignumber_1.bnOrZero)(expectedBuyAmount)
             .times((0, bignumber_1.bn)(1).minus(slippageTolerance))

package/dist/swappers/utils/test-data/setupSwapQuote.d.ts

@@ -14,7 +14,8 @@ export declare const setupBuildTrade: () => {
         sellAmount: string;
         sendMax: boolean;
         sellAssetAccountNumber: number;
-        wallet?: HDWallet | undefined;
+        wallet: HDWallet;
+        receiveAddress: string;
     } & {
         chainId: import("../../../api").EvmSupportedChainIds;
     } & {

package/dist/swappers/utils/test-data/setupSwapQuote.js

@@ -25,7 +25,9 @@ const setupQuote = () => {
         sellAsset,
         buyAsset,
         sellAssetAccountNumber: 0,
-        sendMax: false
+        sendMax: false,
+        receiveAddress: '0xc770eefad204b5180df6a14ee197d99d808ee52d',
+        wallet: {}
     };
     return { quoteInput, tradeQuote, buyAsset, sellAsset };
 };
@@ -41,7 +43,8 @@ const setupBuildTrade = () => {
         sellAssetAccountNumber: 0,
         buyAssetAccountNumber: 0,
         sellAsset,
-        wallet: {}
+        wallet: {},
+        receiveAddress: ''
     };
     return { buildTradeInput, buyAsset, sellAsset };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "8.2.0",
+  "version": "8.3.0",
   "description": "An interface and implementations to trade coins via various protocols",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",