@shapeshiftoss/swapper 11.4.1 → 11.5.1

package/dist/api.d.ts

@@ -59,7 +59,12 @@ declare type ChainSpecificQuoteFeeData<T extends ChainId> = ChainSpecific<T, {
     };
 }>;
 export declare type QuoteFeeData<T extends ChainId> = {
+    networkFee: string;
+    buyAssetTradeFeeUsd: string;
+    sellAssetTradeFeeUsd?: string;
+    /** @deprecated Use networkFee instead */
     fee: string;
+    /** @deprecated Use sellAssetTradeFeeUsd instead */
     tradeFee: string;
 } & ChainSpecificQuoteFeeData<T>;
 export declare type ByPairInput = {

package/dist/swappers/cow/cowBuildTrade/cowBuildTrade.js

@@ -57,6 +57,11 @@ async function cowBuildTrade(deps, input) {
             sellAmountBeforeFee: normalizedSellAmount,
         });
         const { data: { quote }, } = quoteResponse;
+        const sellAssetUsdRate = await (0, helpers_2.getUsdRate)(deps, sellAsset);
+        const sellAssetTradeFeeUsd = (0, bignumber_1.bnOrZero)(quote.feeAmount)
+            .div((0, bignumber_1.bn)(10).exponentiatedBy(sellAsset.precision))
+            .multipliedBy((0, bignumber_1.bnOrZero)(sellAssetUsdRate))
+            .toString();
         const buyCryptoAmount = (0, bignumber_1.bn)(quote.buyAmount).div((0, bignumber_1.bn)(10).exponentiatedBy(buyAsset.precision));
         const sellCryptoAmount = (0, bignumber_1.bn)(quote.sellAmount).div((0, bignumber_1.bn)(10).exponentiatedBy(sellAsset.precision));
         const rate = buyCryptoAmount.div(sellCryptoAmount).toString();
@@ -75,11 +80,14 @@ async function cowBuildTrade(deps, input) {
             rate,
             feeData: {
                 fee: '0',
+                networkFee: '0',
                 chainSpecific: {
                     estimatedGas: feeData.chainSpecific.gasLimit,
                     gasPrice: feeData.chainSpecific.gasPrice,
                 },
-                tradeFee: '0', // Trade fees for buy Asset are always 0 since trade fees are subtracted from sell asset
+                tradeFee: '0',
+                buyAssetTradeFeeUsd: '0',
+                sellAssetTradeFeeUsd,
             },
             sellAmount: normalizedSellAmount,
             buyAmount: quote.buyAmount,

package/dist/swappers/cow/getCowSwapTradeQuote/getCowSwapTradeQuote.js

@@ -81,12 +81,11 @@ async function getCowSwapTradeQuote(deps, input) {
             }),
             (0, helpers_2.getUsdRate)(deps, sellAsset),
         ]);
-        const feeData = feeDataOptions['fast'];
-        // calculating trade fee in USD
-        const tradeFeeFiat = (0, bignumber_1.bnOrZero)(quote.feeAmount)
+        const sellAssetTradeFeeUsd = (0, bignumber_1.bnOrZero)(quote.feeAmount)
             .div((0, bignumber_1.bn)(10).exponentiatedBy(sellAsset.precision))
             .multipliedBy((0, bignumber_1.bnOrZero)(sellAssetUsdRate))
             .toString();
+        const feeData = feeDataOptions['fast'];
         // If original sellAmount is < minQuoteSellAmount, we don't want to replace it with normalizedSellAmount
         // The purpose of this was to get a quote from CowSwap even with small amounts
         const quoteSellAmount = (0, bignumber_1.bnOrZero)(sellAmount).lt(minQuoteSellAmount)
@@ -98,6 +97,7 @@ async function getCowSwapTradeQuote(deps, input) {
             maximum,
             feeData: {
                 fee: '0',
+                networkFee: '0',
                 chainSpecific: {
                     estimatedGas: feeData.chainSpecific.gasLimit,
                     gasPrice: feeData.chainSpecific.gasPrice,
@@ -105,7 +105,9 @@ async function getCowSwapTradeQuote(deps, input) {
                         .multipliedBy((0, bignumber_1.bnOrZero)(feeData.chainSpecific.gasPrice))
                         .toString(),
                 },
-                tradeFee: tradeFeeFiat,
+                tradeFee: '0',
+                buyAssetTradeFeeUsd: '0',
+                sellAssetTradeFeeUsd,
             },
             sellAmount: quoteSellAmount,
             buyAmount: quote.buyAmount,

package/dist/swappers/osmosis/OsmosisSwapper.js

@@ -93,7 +93,7 @@ class OsmosisSwapper {
                 code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
             });
         }
-        const { tradeFee, rate, buyAmount } = await (0, helpers_1.getRateInfo)(sellAsset.symbol, buyAsset.symbol, sellAmount !== '0' ? sellAmount : '1', this.deps.osmoUrl);
+        const { buyAssetTradeFeeUsd, rate, buyAmount } = await (0, helpers_1.getRateInfo)(sellAsset.symbol, buyAsset.symbol, sellAmount !== '0' ? sellAmount : '1', this.deps.osmoUrl);
         //convert amount to base
         const amountBaseSell = String((0, bignumber_1.bnOrZero)(sellAmount).dp(0));
         const osmosisAdapter = this.deps.adapterManager.get(caip_1.osmosisChainId);
@@ -106,7 +106,13 @@ class OsmosisSwapper {
         return {
             buyAmount,
             buyAsset,
-            feeData: { fee, tradeFee },
+            feeData: {
+                fee,
+                tradeFee: buyAssetTradeFeeUsd,
+                networkFee: fee,
+                sellAssetTradeFeeUsd: '0',
+                buyAssetTradeFeeUsd,
+            },
             rate,
             receiveAddress,
             sellAmount: amountBaseSell,
@@ -122,7 +128,7 @@ class OsmosisSwapper {
                 code: api_1.SwapErrorTypes.RESPONSE_ERROR,
             });
         }
-        const { tradeFee, rate, buyAmount } = await (0, helpers_1.getRateInfo)(sellAsset.symbol, buyAsset.symbol, sellAmount !== '0' ? sellAmount : '1', this.deps.osmoUrl);
+        const { buyAssetTradeFeeUsd, rate, buyAmount } = await (0, helpers_1.getRateInfo)(sellAsset.symbol, buyAsset.symbol, sellAmount !== '0' ? sellAmount : '1', this.deps.osmoUrl);
         const { minimum, maximum } = await this.getMinMax(input);
         const osmosisAdapter = this.deps.adapterManager.get(caip_1.osmosisChainId);
         if (!osmosisAdapter)
@@ -133,7 +139,13 @@ class OsmosisSwapper {
         const fee = feeData.fast.txFee;
         return {
             buyAsset,
-            feeData: { fee, tradeFee },
+            feeData: {
+                fee,
+                tradeFee: buyAssetTradeFeeUsd,
+                networkFee: fee,
+                sellAssetTradeFeeUsd: '0',
+                buyAssetTradeFeeUsd,
+            },
             maximum,
             minimum,
             bip44Params,

package/dist/swappers/osmosis/utils/helpers.d.ts

@@ -18,7 +18,7 @@ export declare const pollForAtomChannelBalance: (address: string, osmoUrl: strin
 export declare const getRateInfo: (sellAsset: string, buyAsset: string, sellAmount: string, osmoUrl: string) => Promise<{
     rate: string;
     priceImpact: string;
-    tradeFee: string;
+    buyAssetTradeFeeUsd: string;
     buyAmount: string;
 }>;
 export declare const performIbcTransfer: (input: IbcTransferInput, adapter: CosmosSdkSupportedChainAdapters, wallet: HDWallet, blockBaseUrl: string, denom: string, sourceChannel: string, feeAmount: string, accountNumber: string, sequence: string, gas: string, feeDenom: string) => Promise<TradeResult>;

package/dist/swappers/osmosis/utils/helpers.js

@@ -145,11 +145,13 @@ const getInfoFromPool = (sellAmount, pool, sellAssetIndex, buyAssetIndex) => {
     const rate = (0, bignumber_1.bnOrZero)(buyAmount).dividedBy(sellAmount).toString();
     const priceImpact = (0, bignumber_1.bn)(1).minus(initialMarketPrice.dividedBy(finalMarketPrice)).abs().toString();
     const tradeFeeBase = (0, bignumber_1.bnOrZero)(buyAmount).times((0, bignumber_1.bnOrZero)(pool.poolParams.swapFee));
-    const tradeFee = tradeFeeBase.dividedBy((0, bignumber_1.bn)(10).exponentiatedBy(constants_1.OSMOSIS_PRECISION)).toString();
+    const buyAssetTradeFeeUsd = tradeFeeBase
+        .dividedBy((0, bignumber_1.bn)(10).exponentiatedBy(constants_1.OSMOSIS_PRECISION))
+        .toString();
     return {
         rate,
         priceImpact,
-        tradeFee,
+        buyAssetTradeFeeUsd,
         buyAmount,
     };
 };

package/dist/swappers/thorchain/buildThorTrade/buildThorTrade.js

@@ -35,7 +35,7 @@ const buildTrade = async ({ deps, input, }) => {
                 deps,
                 gasPrice: (_b = (_a = quote.feeData.chainSpecific) === null || _a === void 0 ? void 0 : _a.gasPrice) !== null && _b !== void 0 ? _b : '0',
                 gasLimit: (_d = (_c = quote.feeData.chainSpecific) === null || _c === void 0 ? void 0 : _c.estimatedGas) !== null && _d !== void 0 ? _d : '0',
-                tradeFee: quote.feeData.tradeFee,
+                buyAssetTradeFeeUsd: quote.feeData.buyAssetTradeFeeUsd,
             });
             return {
                 chainId: types_1.KnownChainIds.EthereumMainnet,
@@ -53,7 +53,7 @@ const buildTrade = async ({ deps, input, }) => {
                 slippageTolerance,
                 destinationAddress,
                 xpub: input.xpub,
-                tradeFee: quote.feeData.tradeFee,
+                buyAssetTradeFeeUsd: quote.feeData.buyAssetTradeFeeUsd,
             });
             const buildTxResponse = await sellAdapter.buildSendTransaction({
                 value: sellAmount,

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

@@ -32,10 +32,10 @@ const getThorTradeQuote = async ({ deps, input }) => {
         const estimatedTradeFee = await (0, estimateTradeFee_1.estimateTradeFee)(deps, buyAsset);
         const buyAssetUsdRate = await (0, getUsdRate_1.getUsdRate)({ deps, input: { assetId: buyAsset.assetId } });
         const minTradeFeeAmount = MINIMUM_USD_TRADE_AMOUNT.div(buyAssetUsdRate);
-        const tradeFee = minTradeFeeAmount.gt(estimatedTradeFee)
+        const buyAssetTradeFeeUsd = minTradeFeeAmount.gt(estimatedTradeFee)
             ? minTradeFeeAmount.toString()
             : estimatedTradeFee;
-        const sellAssetTradeFee = (0, bignumber_1.bnOrZero)(tradeFee).dividedBy((0, bignumber_1.bnOrZero)(rate));
+        const sellAssetTradeFee = (0, bignumber_1.bnOrZero)(buyAssetTradeFeeUsd).dividedBy((0, bignumber_1.bnOrZero)(rate));
         // minimum is tradeFee padded by an amount to be sure they get something back
         // usually it will be slightly more than the amount because sellAssetTradeFee is already a high estimate
         const minimum = (0, bignumber_1.bnOrZero)(sellAssetTradeFee).times(constants_2.THOR_MINIMUM_PADDING).toString();
@@ -61,12 +61,12 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         sellAmount,
                         slippageTolerance: constants_1.DEFAULT_SLIPPAGE,
                         destinationAddress: receiveAddress,
-                        tradeFee,
+                        buyAssetTradeFeeUsd,
                     });
                     const feeData = await (0, getEthTxFees_1.getEthTxFees)({
                         adapterManager: deps.adapterManager,
                         sellAssetReference,
-                        tradeFee,
+                        buyAssetTradeFeeUsd,
                     });
                     return {
                         ...commonQuoteFields,
@@ -84,7 +84,7 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         slippageTolerance: constants_1.DEFAULT_SLIPPAGE,
                         destinationAddress: receiveAddress,
                         xpub: input.xpub,
-                        tradeFee,
+                        buyAssetTradeFeeUsd,
                     });
                     const feeData = await (0, getBtcTxFees_1.getBtcTxFees)({
                         sellAmount,
@@ -92,7 +92,7 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         opReturnData,
                         pubkey,
                         sellAdapter: sellAdapter,
-                        tradeFee,
+                        buyAssetTradeFeeUsd,
                     });
                     return {
                         ...commonQuoteFields,
@@ -108,7 +108,10 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         allowanceContract: '0x0',
                         feeData: {
                             fee: feeData.fast.txFee,
-                            tradeFee,
+                            networkFee: feeData.fast.txFee,
+                            tradeFee: buyAssetTradeFeeUsd,
+                            buyAssetTradeFeeUsd,
+                            sellAssetTradeFeeUsd: '0',
                             chainSpecific: { estimatedGas: feeData.fast.chainSpecific.gasLimit },
                         },
                     };

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

@@ -8,7 +8,7 @@ declare type GetBtcThorTxInfoArgs = {
     slippageTolerance: string;
     destinationAddress: string;
     xpub: string;
-    tradeFee: string;
+    buyAssetTradeFeeUsd: string;
 };
 declare type GetBtcThorTxInfoReturn = Promise<{
     opReturnData: string;

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

@@ -5,7 +5,7 @@ const api_1 = require("../../../../../api");
 const getLimit_1 = require("../../getLimit/getLimit");
 const makeSwapMemo_1 = require("../../makeSwapMemo/makeSwapMemo");
 const thorService_1 = require("../../thorService");
-const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress, xpub, tradeFee, }) => {
+const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress, xpub, buyAssetTradeFeeUsd, }) => {
     try {
         const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.daemonUrl}/lcd/thorchain/inbound_addresses`);
         const sellAssetInboundAddresses = inboundAddresses.find((inbound) => inbound.chain === sellAsset.symbol.toUpperCase());
@@ -23,7 +23,7 @@ const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTo
             buyAsset,
             slippageTolerance,
             deps,
-            tradeFee,
+            buyAssetTradeFeeUsd,
         });
         const memo = (0, makeSwapMemo_1.makeSwapMemo)({
             buyAssetId: buyAsset.assetId,

package/dist/swappers/thorchain/utils/cosmos/cosmosTxData.d.ts

@@ -2,8 +2,7 @@ import { Asset } from '@shapeshiftoss/asset-service';
 import { ChainId } from '@shapeshiftoss/caip';
 import { ChainAdapter } from '@shapeshiftoss/chain-adapters';
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
-import { KnownChainIds } from '@shapeshiftoss/types';
-import { BIP44Params } from '@shapeshiftoss/types';
+import { BIP44Params, KnownChainIds } from '@shapeshiftoss/types';
 import { TradeQuote } from '../../../../api';
 import { ThorchainSwapperDeps } from '../../types';
 export declare const cosmosTxData: (input: {

package/dist/swappers/thorchain/utils/cosmos/cosmosTxData.js

@@ -26,7 +26,7 @@ const cosmosTxData = async (input) => {
         buyAsset,
         slippageTolerance,
         deps,
-        tradeFee: quote.feeData.tradeFee,
+        buyAssetTradeFeeUsd: quote.feeData.buyAssetTradeFeeUsd,
     });
     const memo = (0, makeSwapMemo_1.makeSwapMemo)({
         buyAssetId: buyAsset.assetId,

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

@@ -3,7 +3,7 @@ import { ethereum } from '@shapeshiftoss/chain-adapters';
 import { ETHSignTx, HDWallet } from '@shapeshiftoss/hdwallet-core';
 import { BIP44Params } from '@shapeshiftoss/types';
 import { ThorchainSwapperDeps } from '../../types';
-export declare const makeTradeTx: ({ wallet, bip44Params, sellAmount, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPrice, slippageTolerance, deps, gasLimit, tradeFee, }: {
+export declare const makeTradeTx: ({ wallet, bip44Params, sellAmount, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPrice, slippageTolerance, deps, gasLimit, buyAssetTradeFeeUsd, }: {
     wallet: HDWallet;
     bip44Params: BIP44Params;
     sellAmount: string;
@@ -14,7 +14,7 @@ export declare const makeTradeTx: ({ wallet, bip44Params, sellAmount, buyAsset,
     slippageTolerance: string;
     deps: ThorchainSwapperDeps;
     gasLimit: string;
-    tradeFee: string;
+    buyAssetTradeFeeUsd: string;
 } & ({
     gasPrice: string;
     maxFeePerGas?: undefined;

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

@@ -5,7 +5,7 @@ const caip_1 = require("@shapeshiftoss/caip");
 const web3_utils_1 = require("web3-utils");
 const api_1 = require("../../../../api");
 const getThorTxData_1 = require("../ethereum/utils/getThorTxData");
-const makeTradeTx = async ({ wallet, bip44Params, sellAmount, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPrice, slippageTolerance, deps, gasLimit, tradeFee, }) => {
+const makeTradeTx = async ({ wallet, bip44Params, sellAmount, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPrice, slippageTolerance, deps, gasLimit, buyAssetTradeFeeUsd, }) => {
     try {
         const { assetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const isErc20Trade = assetNamespace === 'erc20';
@@ -16,7 +16,7 @@ const makeTradeTx = async ({ wallet, bip44Params, sellAmount, buyAsset, sellAsse
             sellAmount,
             slippageTolerance,
             destinationAddress,
-            tradeFee,
+            buyAssetTradeFeeUsd,
         });
         return adapter.buildCustomTx({
             wallet,

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

@@ -7,7 +7,7 @@ declare type GetBtcThorTxInfoArgs = {
     sellAmount: string;
     slippageTolerance: string;
     destinationAddress: string;
-    tradeFee: string;
+    buyAssetTradeFeeUsd: string;
 };
 declare type GetBtcThorTxInfoReturn = Promise<{
     data: string;

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

@@ -7,7 +7,7 @@ const getLimit_1 = require("../../getLimit/getLimit");
 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, tradeFee, }) => {
+const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress, buyAssetTradeFeeUsd, }) => {
     try {
         const { assetReference, assetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const isErc20Trade = assetNamespace === 'erc20';
@@ -28,7 +28,7 @@ const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTo
             buyAsset,
             slippageTolerance,
             deps,
-            tradeFee,
+            buyAssetTradeFeeUsd,
         });
         const memo = (0, makeSwapMemo_1.makeSwapMemo)({
             buyAssetId: buyAsset.assetId,

package/dist/swappers/thorchain/utils/getLimit/getLimit.d.ts

@@ -1,6 +1,6 @@
 import { Asset } from '@shapeshiftoss/asset-service';
 import { ThorchainSwapperDeps } from '../../types';
-export declare const getLimit: ({ sellAsset, buyAsset, sellAmount, deps, slippageTolerance, tradeFee, }: {
+export declare const getLimit: ({ sellAsset, buyAsset, sellAmount, deps, slippageTolerance, buyAssetTradeFeeUsd, }: {
     buyAssetId: string;
     destinationAddress: string;
     sellAsset: Asset;
@@ -8,5 +8,5 @@ export declare const getLimit: ({ sellAsset, buyAsset, sellAmount, deps, slippag
     sellAmount: string;
     deps: ThorchainSwapperDeps;
     slippageTolerance: string;
-    tradeFee: string;
+    buyAssetTradeFeeUsd: string;
 }) => Promise<string>;

package/dist/swappers/thorchain/utils/getLimit/getLimit.js

@@ -5,7 +5,7 @@ const api_1 = require("../../../../api");
 const bignumber_1 = require("../../../utils/bignumber");
 const constants_1 = require("../constants");
 const getTradeRate_1 = require("../getTradeRate/getTradeRate");
-const getLimit = async ({ sellAsset, buyAsset, sellAmount, deps, slippageTolerance, tradeFee, }) => {
+const getLimit = async ({ sellAsset, buyAsset, sellAmount, deps, slippageTolerance, buyAssetTradeFeeUsd, }) => {
     const tradeRate = await (0, getTradeRate_1.getTradeRate)(sellAsset, buyAsset.assetId, sellAmount, deps);
     const expectedBuyAmountPrecision8 = (0, bignumber_1.toBaseUnit)((0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(sellAmount).times(tradeRate), sellAsset.precision), constants_1.THORCHAIN_FIXED_PRECISION);
     const isValidSlippageRange = (0, bignumber_1.bnOrZero)(slippageTolerance).gte(0) && (0, bignumber_1.bnOrZero)(slippageTolerance).lte(1);
@@ -14,7 +14,7 @@ const getLimit = async ({ sellAsset, buyAsset, sellAmount, deps, slippageToleran
             code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
             details: { expectedBuyAmountPrecision8, slippageTolerance },
         });
-    const tradeFeePrecision8 = (0, bignumber_1.toBaseUnit)((0, bignumber_1.bnOrZero)(tradeFee), constants_1.THORCHAIN_FIXED_PRECISION);
+    const tradeFeePrecision8 = (0, bignumber_1.toBaseUnit)((0, bignumber_1.bnOrZero)(buyAssetTradeFeeUsd), constants_1.THORCHAIN_FIXED_PRECISION);
     return (0, bignumber_1.bnOrZero)(expectedBuyAmountPrecision8)
         .times((0, bignumber_1.bn)(1).minus(slippageTolerance))
         .minus((0, bignumber_1.bnOrZero)(tradeFeePrecision8))

package/dist/swappers/thorchain/utils/txFeeHelpers/btcTxFees/getBtcTxFees.d.ts

@@ -1,10 +1,10 @@
 import { UtxoBaseAdapter } from '@shapeshiftoss/chain-adapters';
 import { QuoteFeeData, UtxoSupportedChainIds } from '../../../../../api';
-export declare const getBtcTxFees: ({ opReturnData, vault, sellAmount, sellAdapter, pubkey, tradeFee, }: {
+export declare const getBtcTxFees: ({ opReturnData, vault, sellAmount, sellAdapter, pubkey, buyAssetTradeFeeUsd, }: {
     opReturnData: string;
     vault: string;
     sellAmount: string;
     sellAdapter: UtxoBaseAdapter<UtxoSupportedChainIds>;
     pubkey: string;
-    tradeFee: string;
+    buyAssetTradeFeeUsd: string;
 }) => Promise<QuoteFeeData<UtxoSupportedChainIds>>;

package/dist/swappers/thorchain/utils/txFeeHelpers/btcTxFees/getBtcTxFees.js

@@ -4,7 +4,7 @@ exports.getBtcTxFees = void 0;
 const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../../../api");
 const bignumber_1 = require("../../../../utils/bignumber");
-const getBtcTxFees = async ({ opReturnData, vault, sellAmount, sellAdapter, pubkey, tradeFee, }) => {
+const getBtcTxFees = async ({ opReturnData, vault, sellAmount, sellAdapter, pubkey, buyAssetTradeFeeUsd, }) => {
     try {
         const feeDataOptions = await sellAdapter.getFeeData({
             to: vault,
@@ -19,11 +19,14 @@ const getBtcTxFees = async ({ opReturnData, vault, sellAmount, sellAdapter, pubk
         // Bumping BCH fees here resolves this for now until we have time to find a better solution
         const isFromBch = sellAdapter.getChainId() === types_1.KnownChainIds.BitcoinCashMainnet;
         const feeMultiplier = isFromBch ? (0, bignumber_1.bn)(1.5) : (0, bignumber_1.bn)(1);
-        const fee = feeMultiplier.times(feeData.txFee).dp(0).toString();
+        const networkFee = feeMultiplier.times(feeData.txFee).dp(0).toString();
         const satsPerByte = feeMultiplier.times(feeData.chainSpecific.satoshiPerByte).dp(0).toString();
         return {
-            fee,
-            tradeFee,
+            fee: networkFee,
+            networkFee,
+            tradeFee: buyAssetTradeFeeUsd,
+            buyAssetTradeFeeUsd,
+            sellAssetTradeFeeUsd: '0',
             chainSpecific: {
                 satsPerByte,
                 byteCount: (0, bignumber_1.bn)(feeData.txFee)

package/dist/swappers/thorchain/utils/txFeeHelpers/ethTxFees/getEthTxFees.d.ts

@@ -2,8 +2,8 @@ import { AssetReference } from '@shapeshiftoss/caip';
 import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
 import { KnownChainIds } from '@shapeshiftoss/types';
 import { QuoteFeeData } from '../../../../../api';
-export declare const getEthTxFees: ({ adapterManager, sellAssetReference, tradeFee, }: {
+export declare const getEthTxFees: ({ adapterManager, sellAssetReference, buyAssetTradeFeeUsd, }: {
     adapterManager: ChainAdapterManager;
     sellAssetReference: AssetReference | string;
-    tradeFee: string;
+    buyAssetTradeFeeUsd: string;
 }) => Promise<QuoteFeeData<KnownChainIds.EthereumMainnet>>;

package/dist/swappers/thorchain/utils/txFeeHelpers/ethTxFees/getEthTxFees.js

@@ -7,7 +7,7 @@ const api_1 = require("../../../../../api");
 const bignumber_1 = require("../../../../utils/bignumber");
 const constants_1 = require("../../../../utils/constants");
 const constants_2 = require("../../constants");
-const getEthTxFees = async ({ adapterManager, sellAssetReference, tradeFee, }) => {
+const getEthTxFees = async ({ adapterManager, sellAssetReference, buyAssetTradeFeeUsd, }) => {
     try {
         const adapter = adapterManager.get(types_1.KnownChainIds.EthereumMainnet);
         if (!adapter) {
@@ -32,6 +32,7 @@ const getEthTxFees = async ({ adapterManager, sellAssetReference, tradeFee, }) =
         const feeData = feeDataOptions['fast'];
         return {
             fee: feeData.txFee,
+            networkFee: feeData.txFee,
             chainSpecific: {
                 estimatedGas: feeData.chainSpecific.gasLimit,
                 gasPrice: feeData.chainSpecific.gasPrice,
@@ -40,7 +41,9 @@ const getEthTxFees = async ({ adapterManager, sellAssetReference, tradeFee, }) =
                         .multipliedBy((0, bignumber_1.bnOrZero)(feeData.chainSpecific.gasPrice))
                         .toString(),
             },
-            tradeFee,
+            tradeFee: buyAssetTradeFeeUsd,
+            buyAssetTradeFeeUsd,
+            sellAssetTradeFeeUsd: '0',
         };
     }
     catch (e) {

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

@@ -15,7 +15,14 @@ const setupQuote = () => {
         bip44Params: { purpose: 44, coinType: 60, accountNumber: 0 },
         minimum: '0',
         maximum: '999999999999',
-        feeData: { fee: '0', tradeFee: '0', chainSpecific: {} },
+        feeData: {
+            fee: '0',
+            tradeFee: '0',
+            chainSpecific: {},
+            sellAssetTradeFeeUsd: '0',
+            networkFee: '0',
+            buyAssetTradeFeeUsd: '0',
+        },
         rate: '1',
         sources: [],
     };

package/dist/swappers/zrx/getZrxTradeQuote/getZrxTradeQuote.js

@@ -53,7 +53,7 @@ async function getZrxTradeQuote(input) {
         // Instead, we use a hardcoded gasLimit estimate in place of the estimatedGas in the 0x quote response.
         const approvalFee = sellAssetErc20Address &&
             (0, bignumber_1.bnOrZero)(constants_1.APPROVAL_GAS_LIMIT).multipliedBy((0, bignumber_1.bnOrZero)(gasPrice)).toString();
-        return {
+        const tradeQuote = {
             rate,
             minimum,
             maximum,
@@ -65,6 +65,9 @@ async function getZrxTradeQuote(input) {
                     approvalFee,
                 },
                 tradeFee: '0',
+                networkFee: fee,
+                buyAssetTradeFeeUsd: '0',
+                sellAssetTradeFeeUsd: '0',
             },
             sellAmount: sellAmountResponse,
             buyAmount,
@@ -74,6 +77,7 @@ async function getZrxTradeQuote(input) {
             sellAsset,
             bip44Params,
         };
+        return tradeQuote;
     }
     catch (e) {
         if (e instanceof api_1.SwapError)

package/dist/swappers/zrx/utils/test-data/setupZrxSwapQuote.d.ts

@@ -29,6 +29,9 @@ export declare const setupExecuteTrade: () => {
             fee: string;
             chainSpecific: {};
             tradeFee: string;
+            buyAssetTradeFeeUsd: string;
+            sellAssetTradeFeeUsd: string;
+            networkFee: string;
         };
         rate: string;
         sources: never[];

package/dist/swappers/zrx/utils/test-data/setupZrxSwapQuote.js

@@ -37,7 +37,14 @@ const setupExecuteTrade = () => {
         txData: '0x0',
         depositAddress: '0x0',
         receiveAddress: '0x0',
-        feeData: { fee: '0', chainSpecific: {}, tradeFee: '0' },
+        feeData: {
+            fee: '0',
+            chainSpecific: {},
+            tradeFee: '0',
+            buyAssetTradeFeeUsd: '0',
+            sellAssetTradeFeeUsd: '0',
+            networkFee: '0',
+        },
         rate: '0',
         sources: [],
     };

package/dist/swappers/zrx/zrxBuildTrade/zrxBuildTrade.js

@@ -36,7 +36,7 @@ const constants_2 = require("../utils/constants");
 const helpers_2 = require("../utils/helpers/helpers");
 const zrxService_1 = require("../utils/zrxService");
 async function zrxBuildTrade({ adapter, web3 }, input) {
-    var _a, _b, _c;
+    var _a;
     const { sellAsset, buyAsset, sellAmount, slippage, bip44Params, receiveAddress } = input;
     try {
         const { assetReference: buyAssetErc20Address, assetNamespace: buyAssetNamespace } = (0, caip_1.fromAssetId)(buyAsset.assetId);
@@ -91,6 +91,19 @@ async function zrxBuildTrade({ adapter, web3 }, input) {
         });
         const { data } = quoteResponse;
         const estimatedGas = (0, bignumber_1.bnOrZero)(data.gas || 0);
+        const networkFee = (0, bignumber_1.bnOrZero)(estimatedGas).multipliedBy((0, bignumber_1.bnOrZero)(data.gasPrice)).toString();
+        const allowanceRequired = await (0, helpers_1.getAllowanceRequired)({
+            adapter,
+            sellAsset,
+            allowanceContract: data.allowanceTarget,
+            receiveAddress,
+            sellAmount: data.sellAmount,
+            web3,
+            erc20AllowanceAbi: erc20Allowance_abi_1.erc20AllowanceAbi,
+        });
+        const approvalFee = (0, bignumber_1.bnOrZero)(constants_1.APPROVAL_GAS_LIMIT)
+            .multipliedBy((0, bignumber_1.bnOrZero)(data.gasPrice))
+            .toString();
         const trade = {
             sellAsset,
             buyAsset,
@@ -99,39 +112,22 @@ async function zrxBuildTrade({ adapter, web3 }, input) {
             rate: data.price,
             depositAddress: data.to,
             feeData: {
-                fee: (0, bignumber_1.bnOrZero)(estimatedGas).multipliedBy((0, bignumber_1.bnOrZero)(data.gasPrice)).toString(),
+                fee: networkFee,
                 chainSpecific: {
                     estimatedGas: estimatedGas.toString(),
                     gasPrice: data.gasPrice,
+                    approvalFee: allowanceRequired.gt(0) ? approvalFee : undefined,
                 },
                 tradeFee: '0',
+                networkFee,
+                buyAssetTradeFeeUsd: '0',
+                sellAssetTradeFeeUsd: '0',
             },
             txData: data.data,
             sellAmount: data.sellAmount,
             buyAmount: data.buyAmount,
             sources: ((_a = data.sources) === null || _a === void 0 ? void 0 : _a.filter((s) => parseFloat(s.proportion) > 0)) || constants_2.DEFAULT_SOURCE,
         };
-        const allowanceRequired = await (0, helpers_1.getAllowanceRequired)({
-            adapter,
-            sellAsset,
-            allowanceContract: data.allowanceTarget,
-            receiveAddress,
-            sellAmount: data.sellAmount,
-            web3,
-            erc20AllowanceAbi: erc20Allowance_abi_1.erc20AllowanceAbi,
-        });
-        if (allowanceRequired) {
-            trade.feeData = {
-                fee: ((_b = trade.feeData) === null || _b === void 0 ? void 0 : _b.fee) || '0',
-                chainSpecific: {
-                    ...(_c = trade.feeData) === null || _c === void 0 ? void 0 : _c.chainSpecific,
-                    approvalFee: (0, bignumber_1.bnOrZero)(constants_1.APPROVAL_GAS_LIMIT)
-                        .multipliedBy((0, bignumber_1.bnOrZero)(data.gasPrice))
-                        .toString(),
-                },
-                tradeFee: '0',
-            };
-        }
         return trade;
     }
     catch (e) {

package/package.json

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