@shapeshiftoss/swapper 14.7.2 → 15.0.0

package/dist/api.d.ts

@@ -28,14 +28,14 @@ export declare const SwapError: {
 declare type ChainSpecificQuoteFeeData<T extends ChainId> = ChainSpecific<T, {
     [KnownChainIds.EthereumMainnet]: {
         estimatedGas?: string;
-        gasPrice?: string;
-        approvalFee?: string;
+        gasPriceCryptoBaseUnit?: string;
+        approvalFeeCryptoBaseUnit?: string;
         totalFee?: string;
     };
     [KnownChainIds.AvalancheMainnet]: {
         estimatedGas?: string;
-        gasPrice?: string;
-        approvalFee?: string;
+        gasPriceCryptoBaseUnit?: string;
+        approvalFeeCryptoBaseUnit?: string;
         totalFee?: string;
     };
     [KnownChainIds.BitcoinMainnet]: {
@@ -59,7 +59,7 @@ declare type ChainSpecificQuoteFeeData<T extends ChainId> = ChainSpecific<T, {
     };
 }>;
 export declare type QuoteFeeData<T extends ChainId> = {
-    networkFee: string;
+    networkFeeCryptoBaseUnit: string;
     buyAssetTradeFeeUsd: string;
     sellAssetTradeFeeUsd?: string;
 } & ChainSpecificQuoteFeeData<T>;
@@ -77,7 +77,7 @@ export declare type SupportedSellAssetsInput = {
 declare type CommonTradeInput = {
     sellAsset: Asset;
     buyAsset: Asset;
-    sellAmountCryptoPrecision: string;
+    sellAmountBeforeFeesCryptoBaseUnit: string;
     sendMax: boolean;
     receiveAddress: string;
     bip44Params: BIP44Params;
@@ -105,8 +105,8 @@ export declare type BuildTradeInput = GetTradeQuoteInput & {
     wallet: HDWallet;
 };
 interface TradeBase<C extends ChainId> {
-    buyAmountCryptoPrecision: string;
-    sellAmountCryptoPrecision: string;
+    buyAmountCryptoBaseUnit: string;
+    sellAmountBeforeFeesCryptoBaseUnit: string;
     feeData: QuoteFeeData<C>;
     rate: string;
     sources: SwapSource[];

package/dist/swappercli.js

@@ -14,6 +14,7 @@ const web3_1 = __importDefault(require("web3"));
 const adapters_1 = require("./adapters");
 const manager_1 = require("./manager");
 const swappers_1 = require("./swappers");
+const bignumber_1 = require("./swappers/utils/bignumber");
 dotenv_1.default.config();
 const { ETH_NODE_URL = 'http://localhost:3000', MIDGARD_URL = 'https://dev-indexer.thorchain.shapeshift.com/v2', DEVICE_ID = 'device123', MNEMONIC = 'all all all all all all all all all all all all', } = process.env;
 const toBaseUnit = (amount, precision) => {
@@ -21,9 +22,6 @@ const toBaseUnit = (amount, precision) => {
         .multipliedBy(new bignumber_js_1.default(10).exponentiatedBy(new bignumber_js_1.default(precision)))
         .toString();
 };
-const fromBaseUnit = (amount, precision) => {
-    return new bignumber_js_1.default(amount).times(new bignumber_js_1.default(10).exponentiatedBy(precision * -1)).toString();
-};
 const getWallet = async () => {
     if (!MNEMONIC) {
         throw new Error('Cannot init native wallet without mnemonic');
@@ -38,9 +36,9 @@ const getWallet = async () => {
 };
 const main = async () => {
     const [, , ...args] = process.argv;
-    const [sellSymbol, buySymbol, sellAmount] = args;
-    console.info(`sell ${sellAmount} of ${sellSymbol} to ${buySymbol}`);
-    if (!sellAmount || !sellSymbol || !buySymbol) {
+    const [sellSymbol, buySymbol, sellAmountBeforeFeesCryptoPrecision] = args;
+    console.info(`sell ${sellAmountBeforeFeesCryptoPrecision} of ${sellSymbol} to ${buySymbol}`);
+    if (!sellAmountBeforeFeesCryptoPrecision || !sellSymbol || !buySymbol) {
         console.error(`
       Usage:
       swapcli [sellSymbol] [buySymbol] [sellAmount](denominated in sell asset, not wei)
@@ -129,7 +127,7 @@ const main = async () => {
         }
         publicKey = await sellAdapter.getPublicKey(wallet, bip44Params, utxoAccountType);
     }
-    const sellAmountBase = toBaseUnit(sellAmount, sellAsset.precision);
+    const sellAmountBeforeFeesCryptoBaseUnit = toBaseUnit(sellAmountBeforeFeesCryptoPrecision, sellAsset.precision);
     const buyAssetReceiveAddr = await buyAdapter.getAddress({
         wallet,
         accountType: utxoAccountType,
@@ -142,7 +140,7 @@ const main = async () => {
             chainId: sellAsset.chainId,
             sellAsset,
             buyAsset,
-            sellAmountCryptoPrecision: sellAmountBase,
+            sellAmountBeforeFeesCryptoBaseUnit,
             sendMax: false,
             accountType: utxoAccountType || chain_adapters_1.bitcoin.ChainAdapter.defaultUtxoAccountType,
             bip44Params,
@@ -158,15 +156,15 @@ const main = async () => {
         console.warn('no quote returned');
         return;
     }
-    const buyAmount = fromBaseUnit(quote.buyAmountCryptoPrecision || '0', buyAsset.precision);
-    const answer = readline_sync_1.default.question(`Swap ${sellAmount} ${sellAsset.symbol} for ${buyAmount} ${buyAsset.symbol} on ${swapper.getType()}? (y/n): `);
+    const buyAmountCryptoPrecision = (0, bignumber_1.fromBaseUnit)(quote.buyAmountCryptoBaseUnit || '0', buyAsset.precision);
+    const answer = readline_sync_1.default.question(`Swap ${sellAmountBeforeFeesCryptoPrecision} ${sellAsset.symbol} for ${buyAmountCryptoPrecision} ${buyAsset.symbol} on ${swapper.getType()}? (y/n): `);
     if (answer === 'y') {
         const trade = await swapper.buildTrade({
             chainId: sellAsset.chainId,
             wallet,
             buyAsset,
             sendMax: false,
-            sellAmountCryptoPrecision: sellAmountBase,
+            sellAmountBeforeFeesCryptoBaseUnit,
             sellAsset,
             receiveAddress: buyAssetReceiveAddr,
             accountType: utxoAccountType || chain_adapters_1.bitcoin.ChainAdapter.defaultUtxoAccountType,

package/dist/swappers/cow/cowApprovalNeeded/cowApprovalNeeded.js

@@ -27,7 +27,7 @@ async function cowApprovalNeeded({ adapter, web3 }, { quote, wallet }) {
         });
         const allowanceOnChain = (0, bignumber_1.bnOrZero)(allowanceResult);
         return {
-            approvalNeeded: allowanceOnChain.lt((0, bignumber_1.bnOrZero)(quote.sellAmountCryptoPrecision)),
+            approvalNeeded: allowanceOnChain.lt((0, bignumber_1.bnOrZero)(quote.sellAmountBeforeFeesCryptoBaseUnit)),
         };
     }
     catch (e) {

package/dist/swappers/cow/cowApprove/cowApprove.js

@@ -10,7 +10,7 @@ async function cowApproveInfinite({ adapter, web3 }, { quote, wallet }) {
         const allowanceGrantRequired = await (0, helpers_1.grantAllowance)({
             quote: {
                 ...quote,
-                sellAmountCryptoPrecision: constants_1.MAX_ALLOWANCE,
+                sellAmountBeforeFeesCryptoBaseUnit: constants_1.MAX_ALLOWANCE,
             },
             wallet,
             adapter,
@@ -31,11 +31,11 @@ async function cowApproveInfinite({ adapter, web3 }, { quote, wallet }) {
 exports.cowApproveInfinite = cowApproveInfinite;
 async function cowApproveAmount({ adapter, web3 }, { quote, wallet, amount }) {
     try {
-        const approvalAmount = amount !== null && amount !== void 0 ? amount : quote.sellAmountCryptoPrecision;
+        const approvalAmount = amount !== null && amount !== void 0 ? amount : quote.sellAmountBeforeFeesCryptoBaseUnit;
         const allowanceGrantRequired = await (0, helpers_1.grantAllowance)({
             quote: {
                 ...quote,
-                sellAmountCryptoPrecision: approvalAmount,
+                sellAmountBeforeFeesCryptoBaseUnit: approvalAmount,
             },
             wallet,
             adapter,

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

@@ -12,7 +12,7 @@ const cowService_1 = require("../utils/cowService");
 const helpers_2 = require("../utils/helpers/helpers");
 async function cowBuildTrade(deps, input) {
     try {
-        const { sellAsset, buyAsset, sellAmountCryptoPrecision, bip44Params, wallet } = input;
+        const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountExcludeFeeCryptoBaseUnit, bip44Params, wallet, } = input;
         const { adapter, web3 } = deps;
         const { assetReference: sellAssetErc20Address, assetNamespace: sellAssetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const { assetReference: buyAssetErc20Address, chainId: buyAssetChainId } = (0, caip_1.fromAssetId)(buyAsset.assetId);
@@ -30,7 +30,6 @@ async function cowBuildTrade(deps, input) {
         }
         const buyToken = buyAsset.assetId !== caip_1.ethAssetId ? buyAssetErc20Address : constants_1.COW_SWAP_ETH_MARKER_ADDRESS;
         const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
-        const normalizedSellAmount = (0, helpers_1.normalizeAmount)(sellAmountCryptoPrecision);
         /**
          * /v1/quote
          * params: {
@@ -54,17 +53,17 @@ async function cowBuildTrade(deps, input) {
             partiallyFillable: false,
             from: receiveAddress,
             kind: constants_1.ORDER_KIND_SELL,
-            sellAmountBeforeFee: normalizedSellAmount,
+            sellAmountBeforeFee: sellAmountExcludeFeeCryptoBaseUnit,
         });
-        const { data: { quote }, } = quoteResponse;
+        const { data: { quote: { buyAmount: buyAmountCryptoBaseUnit, sellAmount: quoteSellAmountExcludeFeeCryptoBaseUnit, feeAmount: feeAmountInSellTokenCryptoBaseUnit, }, }, } = quoteResponse;
         const sellAssetUsdRate = await (0, helpers_2.getUsdRate)(deps, sellAsset);
-        const sellAssetTradeFeeUsd = (0, bignumber_1.bnOrZero)(quote.feeAmount)
+        const sellAssetTradeFeeUsd = (0, bignumber_1.bnOrZero)(feeAmountInSellTokenCryptoBaseUnit)
             .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();
+        const buyAmountCryptoPrecision = (0, bignumber_1.bn)(buyAmountCryptoBaseUnit).div((0, bignumber_1.bn)(10).exponentiatedBy(buyAsset.precision));
+        const quoteSellAmountCryptoPrecision = (0, bignumber_1.bn)(quoteSellAmountExcludeFeeCryptoBaseUnit).div((0, bignumber_1.bn)(10).exponentiatedBy(sellAsset.precision));
+        const rate = buyAmountCryptoPrecision.div(quoteSellAmountCryptoPrecision).toString();
         const data = (0, helpers_1.getApproveContractData)({
             web3,
             spenderAddress: constants_1.COW_SWAP_VAULT_RELAYER_ADDRESS,
@@ -79,35 +78,35 @@ async function cowBuildTrade(deps, input) {
         const trade = {
             rate,
             feeData: {
-                networkFee: '0',
+                networkFeeCryptoBaseUnit: '0',
                 chainSpecific: {
                     estimatedGas: feeData.chainSpecific.gasLimit,
-                    gasPrice: feeData.chainSpecific.gasPrice,
+                    gasPriceCryptoBaseUnit: feeData.chainSpecific.gasPrice,
                 },
                 buyAssetTradeFeeUsd: '0',
                 sellAssetTradeFeeUsd,
             },
-            sellAmountCryptoPrecision: normalizedSellAmount,
-            buyAmountCryptoPrecision: quote.buyAmount,
+            sellAmountBeforeFeesCryptoBaseUnit: sellAmountExcludeFeeCryptoBaseUnit,
+            buyAmountCryptoBaseUnit,
             sources: constants_1.DEFAULT_SOURCE,
             buyAsset,
             sellAsset,
             bip44Params,
             receiveAddress,
-            feeAmountInSellToken: quote.feeAmount,
-            sellAmountWithoutFee: quote.sellAmount,
+            feeAmountInSellTokenCryptoBaseUnit,
+            sellAmountDeductFeeCryptoBaseUnit: quoteSellAmountExcludeFeeCryptoBaseUnit,
         };
         const approvalRequired = await (0, helpers_1.isApprovalRequired)({
             adapter,
             sellAsset,
             allowanceContract: constants_1.COW_SWAP_VAULT_RELAYER_ADDRESS,
             receiveAddress,
-            sellAmount: quote.sellAmount,
+            sellAmountExcludeFeeCryptoBaseUnit,
             web3: deps.web3,
             erc20AllowanceAbi: erc20Allowance_abi_1.erc20AllowanceAbi,
         });
         if (approvalRequired) {
-            trade.feeData.chainSpecific.approvalFee = (0, bignumber_1.bnOrZero)(feeData.chainSpecific.gasLimit)
+            trade.feeData.chainSpecific.approvalFeeCryptoBaseUnit = (0, bignumber_1.bnOrZero)(feeData.chainSpecific.gasLimit)
                 .multipliedBy((0, bignumber_1.bnOrZero)(feeData.chainSpecific.gasPrice))
                 .toString();
         }

package/dist/swappers/cow/cowExecuteTrade/cowExecuteTrade.js

@@ -11,7 +11,7 @@ const cowService_1 = require("../utils/cowService");
 const helpers_1 = require("../utils/helpers/helpers");
 async function cowExecuteTrade({ apiUrl, adapter }, { trade, wallet }) {
     const cowTrade = trade;
-    const { sellAsset, buyAsset, feeAmountInSellToken, sellAmountWithoutFee } = cowTrade;
+    const { sellAsset, buyAsset, feeAmountInSellTokenCryptoBaseUnit: feeAmountInSellToken, sellAmountDeductFeeCryptoBaseUnit: sellAmountWithoutFee, } = cowTrade;
     const { assetReference: sellAssetErc20Address, assetNamespace: sellAssetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
     const { assetReference: buyAssetErc20Address, chainId: buyAssetChainId } = (0, caip_1.fromAssetId)(buyAsset.assetId);
     if (sellAssetNamespace !== 'erc20') {
@@ -32,7 +32,7 @@ async function cowExecuteTrade({ apiUrl, adapter }, { trade, wallet }) {
             sellToken: sellAssetErc20Address,
             buyToken,
             sellAmount: sellAmountWithoutFee,
-            buyAmount: trade.buyAmountCryptoPrecision,
+            buyAmount: trade.buyAmountCryptoBaseUnit,
             validTo: (0, helpers_1.getNowPlusThirtyMinutesTimestamp)(),
             appData: constants_1.DEFAULT_APP_DATA,
             feeAmount: feeAmountInSellToken,

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

@@ -17,7 +17,7 @@ const helpers_2 = require("../utils/helpers/helpers");
 async function getCowSwapTradeQuote(deps, input) {
     var _a, _b;
     try {
-        const { sellAsset, buyAsset, sellAmountCryptoPrecision, bip44Params, receiveAddress } = input;
+        const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit, bip44Params, receiveAddress } = input;
         const { adapter, web3 } = deps;
         const { assetReference: sellAssetErc20Address, assetNamespace: sellAssetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const { assetReference: buyAssetErc20Address, chainId: buyAssetChainId } = (0, caip_1.fromAssetId)(buyAsset.assetId);
@@ -37,9 +37,9 @@ async function getCowSwapTradeQuote(deps, input) {
         const { minimum, maximum } = await (0, getCowSwapMinMax_1.getCowSwapMinMax)(deps, sellAsset, buyAsset);
         const minQuoteSellAmount = (0, bignumber_1.bnOrZero)(minimum).times((0, bignumber_1.bn)(10).exponentiatedBy(sellAsset.precision));
         // making sure we do not have decimals for cowswap api (can happen at least from minQuoteSellAmount)
-        const normalizedSellAmount = (0, helpers_1.normalizeIntegerAmount)((0, bignumber_1.bnOrZero)(sellAmountCryptoPrecision).lt(minQuoteSellAmount)
+        const normalizedSellAmount = (0, helpers_1.normalizeIntegerAmount)((0, bignumber_1.bnOrZero)(sellAmountBeforeFeesCryptoBaseUnit).lt(minQuoteSellAmount)
             ? minQuoteSellAmount
-            : sellAmountCryptoPrecision);
+            : sellAmountBeforeFeesCryptoBaseUnit);
         const apiInput = {
             sellToken: sellAssetErc20Address,
             buyToken,
@@ -66,10 +66,8 @@ async function getCowSwapTradeQuote(deps, input) {
          * }
          */
         const quoteResponse = await cowService_1.cowService.post(`${deps.apiUrl}/v1/quote/`, apiInput);
-        const { data: { quote }, } = quoteResponse;
-        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();
+        const { data: { quote: { buyAmount: buyAmountCryptoBaseUnit, sellAmount: sellAmountCryptoBaseUnit, feeAmount: feeAmountInSellTokenCryptoBaseUnit, }, }, } = quoteResponse;
+        const rate = (0, bignumber_1.bn)(buyAmountCryptoBaseUnit).div(sellAmountCryptoBaseUnit).toString();
         const data = (0, helpers_1.getApproveContractData)({
             web3,
             spenderAddress: constants_1.COW_SWAP_VAULT_RELAYER_ADDRESS,
@@ -83,34 +81,34 @@ async function getCowSwapTradeQuote(deps, input) {
             }),
             (0, helpers_2.getUsdRate)(deps, sellAsset),
         ]);
-        const sellAssetTradeFeeUsd = (0, bignumber_1.bnOrZero)(quote.feeAmount)
+        const sellAssetTradeFeeUsd = (0, bignumber_1.bnOrZero)(feeAmountInSellTokenCryptoBaseUnit)
             .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)(sellAmountCryptoPrecision).lt(minQuoteSellAmount)
-            ? sellAmountCryptoPrecision
+        const quoteSellAmount = (0, bignumber_1.bnOrZero)(sellAmountCryptoBaseUnit).lt(minQuoteSellAmount)
+            ? sellAmountBeforeFeesCryptoBaseUnit
             : normalizedSellAmount;
         return {
             rate,
             minimumCryptoHuman: minimum,
             maximum,
             feeData: {
-                networkFee: '0',
+                networkFeeCryptoBaseUnit: '0',
                 chainSpecific: {
                     estimatedGas: feeData.chainSpecific.gasLimit,
-                    gasPrice: feeData.chainSpecific.gasPrice,
-                    approvalFee: (0, bignumber_1.bnOrZero)(feeData.chainSpecific.gasLimit)
+                    gasPriceCryptoBaseUnit: feeData.chainSpecific.gasPrice,
+                    approvalFeeCryptoBaseUnit: (0, bignumber_1.bnOrZero)(feeData.chainSpecific.gasLimit)
                         .multipliedBy((0, bignumber_1.bnOrZero)(feeData.chainSpecific.gasPrice))
                         .toString(),
                 },
                 buyAssetTradeFeeUsd: '0',
                 sellAssetTradeFeeUsd,
             },
-            sellAmountCryptoPrecision: quoteSellAmount,
-            buyAmountCryptoPrecision: quote.buyAmount,
+            sellAmountBeforeFeesCryptoBaseUnit: quoteSellAmount,
+            buyAmountCryptoBaseUnit,
             sources: constants_1.DEFAULT_SOURCE,
             allowanceContract: constants_1.COW_SWAP_VAULT_RELAYER_ADDRESS,
             buyAsset,

package/dist/swappers/cow/types.d.ts

@@ -24,6 +24,6 @@ export declare type CowSwapGetTradesElement = {
 };
 export declare type CowSwapGetTradesResponse = CowSwapGetTradesElement[];
 export interface CowTrade<C extends ChainId> extends Trade<C> {
-    feeAmountInSellToken: string;
-    sellAmountWithoutFee: string;
+    feeAmountInSellTokenCryptoBaseUnit: string;
+    sellAmountDeductFeeCryptoBaseUnit: string;
 }

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

@@ -75,14 +75,14 @@ const getUsdRate = async ({ apiUrl }, input) => {
          * }
          */
         const quoteResponse = await cowService_1.cowService.post(`${apiUrl}/v1/quote/`, apiInput);
-        const { data: { quote }, } = quoteResponse;
-        const sellCryptoAmount = (0, bignumber_1.bn)(quote.sellAmount).div((0, bignumber_1.bn)(10).exponentiatedBy(asset.precision));
-        if (!sellCryptoAmount.gt(0))
+        const { data: { quote: { sellAmount: sellAmountCryptoBaseUnit }, }, } = quoteResponse;
+        const sellAmountCryptoPrecision = (0, bignumber_1.bn)(sellAmountCryptoBaseUnit).div((0, bignumber_1.bn)(10).exponentiatedBy(asset.precision));
+        if (!sellAmountCryptoPrecision.gt(0))
             throw new api_1.SwapError('[getUsdRate] - Failed to get sell token amount', {
                 code: api_1.SwapErrorTypes.RESPONSE_ERROR,
             });
         // dividing $1000 by amount of sell token received
-        return (0, bignumber_1.bn)(buyAmountInDollars).div(sellCryptoAmount).toString();
+        return (0, bignumber_1.bn)(buyAmountInDollars).div(sellAmountCryptoPrecision).toString();
     }
     catch (e) {
         if (e instanceof api_1.SwapError)

package/dist/swappers/cow/utils.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isCowTrade = void 0;
-const isCowTrade = (trade) => Boolean(trade.feeAmountInSellToken);
+const isCowTrade = (trade) => Boolean(trade.feeAmountInSellTokenCryptoBaseUnit);
 exports.isCowTrade = isCowTrade;

package/dist/swappers/osmosis/OsmosisSwapper.js

@@ -87,15 +87,15 @@ class OsmosisSwapper {
         return this.supportedAssetIds;
     }
     async buildTrade(args) {
-        const { sellAsset, buyAsset, sellAmountCryptoPrecision, receiveAddress, bip44Params } = args;
-        if (!sellAmountCryptoPrecision) {
+        const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, receiveAddress, bip44Params, } = args;
+        if (!sellAmountCryptoBaseUnit) {
             throw new api_1.SwapError('sellAmountCryptoPrecision is required', {
                 code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
             });
         }
-        const { buyAssetTradeFeeUsd, rate, buyAmount } = await (0, helpers_1.getRateInfo)(sellAsset.symbol, buyAsset.symbol, sellAmountCryptoPrecision !== '0' ? sellAmountCryptoPrecision : '1', this.deps.osmoUrl);
+        const { buyAssetTradeFeeUsd, rate, buyAmountCryptoBaseUnit } = await (0, helpers_1.getRateInfo)(sellAsset.symbol, buyAsset.symbol, sellAmountCryptoBaseUnit !== '0' ? sellAmountCryptoBaseUnit : '1', this.deps.osmoUrl);
         //convert amount to base
-        const sellAmountCryptoBase = String((0, bignumber_1.bnOrZero)(sellAmountCryptoPrecision).dp(0));
+        const sellAmountCryptoBase = String((0, bignumber_1.bnOrZero)(sellAmountCryptoBaseUnit).dp(0));
         const osmosisAdapter = this.deps.adapterManager.get(caip_1.osmosisChainId);
         if (!osmosisAdapter)
             throw new api_1.SwapError('Failed to get Osmosis adapter', {
@@ -104,29 +104,29 @@ class OsmosisSwapper {
         const feeData = await osmosisAdapter.getFeeData({});
         const fee = feeData.fast.txFee;
         return {
-            buyAmountCryptoPrecision: buyAmount,
+            buyAmountCryptoBaseUnit,
             buyAsset,
             feeData: {
-                networkFee: fee,
+                networkFeeCryptoBaseUnit: fee,
                 sellAssetTradeFeeUsd: '0',
                 buyAssetTradeFeeUsd,
             },
             rate,
             receiveAddress,
-            sellAmountCryptoPrecision: sellAmountCryptoBase,
+            sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBase,
             sellAsset,
             bip44Params,
             sources: [{ name: api_1.SwapperName.Osmosis, proportion: '100' }],
         };
     }
     async getTradeQuote(input) {
-        const { bip44Params, sellAsset, buyAsset, sellAmountCryptoPrecision } = input;
-        if (!sellAmountCryptoPrecision) {
+        const { bip44Params, sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, } = input;
+        if (!sellAmountCryptoBaseUnit) {
             throw new api_1.SwapError('sellAmount is required', {
                 code: api_1.SwapErrorTypes.RESPONSE_ERROR,
             });
         }
-        const { buyAssetTradeFeeUsd, rate, buyAmount } = await (0, helpers_1.getRateInfo)(sellAsset.symbol, buyAsset.symbol, sellAmountCryptoPrecision !== '0' ? sellAmountCryptoPrecision : '1', this.deps.osmoUrl);
+        const { buyAssetTradeFeeUsd, rate, buyAmountCryptoBaseUnit } = await (0, helpers_1.getRateInfo)(sellAsset.symbol, buyAsset.symbol, sellAmountCryptoBaseUnit !== '0' ? sellAmountCryptoBaseUnit : '1', this.deps.osmoUrl);
         const { minimum, maximum } = await this.getMinMax(input);
         const osmosisAdapter = this.deps.adapterManager.get(caip_1.osmosisChainId);
         if (!osmosisAdapter)
@@ -138,7 +138,7 @@ class OsmosisSwapper {
         return {
             buyAsset,
             feeData: {
-                networkFee: fee,
+                networkFeeCryptoBaseUnit: fee,
                 sellAssetTradeFeeUsd: '0',
                 buyAssetTradeFeeUsd,
             },
@@ -147,14 +147,14 @@ class OsmosisSwapper {
             bip44Params,
             rate,
             sellAsset,
-            sellAmountCryptoPrecision,
-            buyAmountCryptoPrecision: buyAmount,
+            sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit,
+            buyAmountCryptoBaseUnit,
             sources: constants_1.DEFAULT_SOURCE,
             allowanceContract: '',
         };
     }
     async executeTrade({ trade, wallet }) {
-        const { sellAsset, buyAsset, sellAmountCryptoPrecision, bip44Params, receiveAddress } = trade;
+        const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, bip44Params, receiveAddress, } = trade;
         const isFromOsmo = sellAsset.assetId === caip_1.osmosisAssetId;
         const sellAssetDenom = helpers_1.symbolDenomMapping[sellAsset.symbol];
         const buyAssetDenom = helpers_1.symbolDenomMapping[buyAsset.symbol];
@@ -179,7 +179,7 @@ class OsmosisSwapper {
             const transfer = {
                 sender: sellAddress,
                 receiver: receiveAddress,
-                amount: sellAmountCryptoPrecision,
+                amount: sellAmountCryptoBaseUnit,
             };
             const responseAccount = await cosmosAdapter.getAccount(sellAddress);
             const accountNumber = responseAccount.chainSpecific.accountNumber || '0';
@@ -211,7 +211,7 @@ class OsmosisSwapper {
             adapter: osmosisAdapter,
             buyAssetDenom,
             sellAssetDenom,
-            sellAmount: ibcSellAmount !== null && ibcSellAmount !== void 0 ? ibcSellAmount : sellAmountCryptoPrecision,
+            sellAmount: ibcSellAmount !== null && ibcSellAmount !== void 0 ? ibcSellAmount : sellAmountCryptoBaseUnit,
             gas,
             wallet,
         });

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

@@ -19,7 +19,7 @@ export declare const getRateInfo: (sellAsset: string, buyAsset: string, sellAmou
     rate: string;
     priceImpact: string;
     buyAssetTradeFeeUsd: string;
-    buyAmount: string;
+    buyAmountCryptoBaseUnit: 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>;
 export declare const buildTradeTx: ({ osmoAddress, adapter, buyAssetDenom, sellAssetDenom, sellAmount, gas, wallet, }: {

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

@@ -141,10 +141,10 @@ const getInfoFromPool = (sellAmount, pool, sellAssetIndex, buyAssetIndex) => {
     const sellAssetFinalPoolSize = sellAssetInitialPoolSize.plus(sellAmount);
     const buyAssetFinalPoolSize = constantProduct.dividedBy(sellAssetFinalPoolSize);
     const finalMarketPrice = sellAssetFinalPoolSize.dividedBy(buyAssetFinalPoolSize);
-    const buyAmount = buyAssetInitialPoolSize.minus(buyAssetFinalPoolSize).toString();
-    const rate = (0, bignumber_1.bnOrZero)(buyAmount).dividedBy(sellAmount).toString();
+    const buyAmountCryptoBaseUnit = buyAssetInitialPoolSize.minus(buyAssetFinalPoolSize).toString();
+    const rate = (0, bignumber_1.bnOrZero)(buyAmountCryptoBaseUnit).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.pool_params.swap_fee));
+    const tradeFeeBase = (0, bignumber_1.bnOrZero)(buyAmountCryptoBaseUnit).times((0, bignumber_1.bnOrZero)(pool.pool_params.swap_fee));
     const buyAssetTradeFeeUsd = tradeFeeBase
         .dividedBy((0, bignumber_1.bn)(10).exponentiatedBy(constants_1.OSMOSIS_PRECISION))
         .toString();
@@ -152,7 +152,7 @@ const getInfoFromPool = (sellAmount, pool, sellAssetIndex, buyAssetIndex) => {
         rate,
         priceImpact,
         buyAssetTradeFeeUsd,
-        buyAmount,
+        buyAmountCryptoBaseUnit,
     };
 };
 const getRateInfo = async (sellAsset, buyAsset, sellAmount, osmoUrl) => {

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

@@ -12,7 +12,7 @@ const makeTradeTx_1 = require("../utils/evm/makeTradeTx");
 const buildTrade = async ({ deps, input }) => {
     var _a, _b, _c, _d;
     try {
-        const { buyAsset, receiveAddress: destinationAddress, sellAmountCryptoPrecision, sellAsset, bip44Params, slippage: slippageTolerance = constants_1.DEFAULT_SLIPPAGE, wallet, sendMax, } = input;
+        const { buyAsset, receiveAddress: destinationAddress, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, sellAsset, bip44Params, slippage: slippageTolerance = constants_1.DEFAULT_SLIPPAGE, wallet, sendMax, } = input;
         const quote = await (0, getTradeQuote_1.getThorTradeQuote)({ deps, input });
         const sellAdapter = deps.adapterManager.get(sellAsset.chainId);
         if (!sellAdapter)
@@ -30,10 +30,10 @@ const buildTrade = async ({ deps, input }) => {
                 sellAsset,
                 buyAsset,
                 adapter: sellAdapter,
-                sellAmountCryptoPrecision,
+                sellAmountCryptoBaseUnit,
                 destinationAddress,
                 deps,
-                gasPrice: (_b = (_a = quote.feeData.chainSpecific) === null || _a === void 0 ? void 0 : _a.gasPrice) !== null && _b !== void 0 ? _b : '0',
+                gasPriceCryptoBaseUnit: (_b = (_a = quote.feeData.chainSpecific) === null || _a === void 0 ? void 0 : _a.gasPriceCryptoBaseUnit) !== 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',
                 buyAssetTradeFeeUsd: quote.feeData.buyAssetTradeFeeUsd,
             });
@@ -49,14 +49,14 @@ const buildTrade = async ({ deps, input }) => {
                 deps,
                 sellAsset,
                 buyAsset,
-                sellAmountCryptoPrecision,
+                sellAmountCryptoBaseUnit,
                 slippageTolerance,
                 destinationAddress,
                 xpub: input.xpub,
                 buyAssetTradeFeeUsd: quote.feeData.buyAssetTradeFeeUsd,
             });
             const buildTxResponse = await sellAdapter.buildSendTransaction({
-                value: sellAmountCryptoPrecision,
+                value: sellAmountCryptoBaseUnit,
                 wallet,
                 to: vault,
                 bip44Params: input.bip44Params,
@@ -83,7 +83,7 @@ const buildTrade = async ({ deps, input }) => {
                 bip44Params,
                 deps,
                 sellAdapter: sellAdapter,
-                sellAmountCryptoPrecision,
+                sellAmountCryptoBaseUnit,
                 sellAsset,
                 slippageTolerance,
                 chainId: input.chainId,

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

@@ -16,7 +16,7 @@ const getEvmTxFees_1 = require("../utils/txFeeHelpers/evmTxFees/getEvmTxFees");
 const getUtxoTxFees_1 = require("../utils/txFeeHelpers/utxoTxFees/getUtxoTxFees");
 const getSlippage_1 = require("./getSlippage");
 const getThorTradeQuote = async ({ deps, input }) => {
-    const { sellAsset, buyAsset, sellAmountCryptoPrecision, bip44Params, chainId, receiveAddress, sendMax, } = input;
+    const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, bip44Params, chainId, receiveAddress, sendMax, } = input;
     if (!bip44Params) {
         throw new Error('bip44Params required in getThorTradeQuote');
     }
@@ -30,10 +30,10 @@ const getThorTradeQuote = async ({ deps, input }) => {
                 code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,
                 details: { sellAssetChainId: chainId, buyAssetChainId },
             });
-        const rate = await (0, getTradeRate_1.getTradeRate)(sellAsset, buyAsset.assetId, sellAmountCryptoPrecision, deps);
-        const buyAmountCryptoPrecision = (0, bignumber_1.toBaseUnit)((0, bignumber_1.bnOrZero)((0, bignumber_1.fromBaseUnit)(sellAmountCryptoPrecision, sellAsset.precision)).times(rate), buyAsset.precision);
+        const rate = await (0, getTradeRate_1.getTradeRate)(sellAsset, buyAsset.assetId, sellAmountCryptoBaseUnit, deps);
+        const buyAmountCryptoBaseUnit = (0, bignumber_1.toBaseUnit)((0, bignumber_1.bnOrZero)((0, bignumber_1.fromBaseUnit)(sellAmountCryptoBaseUnit, sellAsset.precision)).times(rate), buyAsset.precision);
         const buyAssetAddressData = await (0, getInboundAddressDataForChain_1.getInboundAddressDataForChain)(deps.daemonUrl, buyAsset.assetId);
-        const sellAmountThorPrecision = (0, bignumber_1.toBaseUnit)((0, bignumber_1.fromBaseUnit)(sellAmountCryptoPrecision, sellAsset.precision), constants_3.THORCHAIN_FIXED_PRECISION);
+        const sellAmountThorPrecision = (0, bignumber_1.toBaseUnit)((0, bignumber_1.fromBaseUnit)(sellAmountCryptoBaseUnit, sellAsset.precision), constants_3.THORCHAIN_FIXED_PRECISION);
         const recommendedSlippage = await (0, getSlippage_1.getSlippage)({
             inputAmountThorPrecision: (0, bignumber_1.bn)(sellAmountThorPrecision),
             daemonUrl: deps.daemonUrl,
@@ -60,8 +60,8 @@ const getThorTradeQuote = async ({ deps, input }) => {
         const commonQuoteFields = {
             rate,
             maximum: constants_3.MAX_THORCHAIN_TRADE,
-            sellAmountCryptoPrecision,
-            buyAmountCryptoPrecision,
+            sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit,
+            buyAmountCryptoBaseUnit,
             sources: [{ name: api_1.SwapperName.Thorchain, proportion: '1' }],
             buyAsset,
             sellAsset,
@@ -95,14 +95,14 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         deps,
                         sellAsset,
                         buyAsset,
-                        sellAmountCryptoPrecision,
+                        sellAmountCryptoBaseUnit,
                         slippageTolerance: constants_1.DEFAULT_SLIPPAGE,
                         destinationAddress: receiveAddress,
                         xpub: input.xpub,
                         buyAssetTradeFeeUsd,
                     });
                     const feeData = await (0, getUtxoTxFees_1.getUtxoTxFees)({
-                        sellAmountCryptoPrecision,
+                        sellAmountCryptoBaseUnit,
                         vault,
                         opReturnData,
                         pubkey,
@@ -123,7 +123,7 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         ...commonQuoteFields,
                         allowanceContract: '0x0',
                         feeData: {
-                            networkFee: feeData.fast.txFee,
+                            networkFeeCryptoBaseUnit: feeData.fast.txFee,
                             buyAssetTradeFeeUsd,
                             sellAssetTradeFeeUsd: '0',
                             chainSpecific: { estimatedGas: feeData.fast.chainSpecific.gasLimit },

package/dist/swappers/thorchain/thorTradeApprovalNeeded/thorTradeApprovalNeeded.js

@@ -41,13 +41,13 @@ const thorTradeApprovalNeeded = async ({ deps, input, }) => {
             ownerAddress: receiveAddress,
         });
         const allowanceOnChain = (0, bignumber_1.bnOrZero)(allowanceResult);
-        if (!((_a = quote.feeData.chainSpecific) === null || _a === void 0 ? void 0 : _a.gasPrice))
+        if (!((_a = quote.feeData.chainSpecific) === null || _a === void 0 ? void 0 : _a.gasPriceCryptoBaseUnit))
             throw new api_1.SwapError('[thorTradeApprovalNeeded] - no gas price with quote', {
                 code: api_1.SwapErrorTypes.RESPONSE_ERROR,
                 details: { feeData: quote.feeData },
             });
         return {
-            approvalNeeded: allowanceOnChain.lt((0, bignumber_1.bnOrZero)(quote.sellAmountCryptoPrecision)),
+            approvalNeeded: allowanceOnChain.lt((0, bignumber_1.bnOrZero)(quote.sellAmountBeforeFeesCryptoBaseUnit)),
         };
     }
     catch (e) {

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

@@ -4,7 +4,7 @@ declare type GetBtcThorTxInfoArgs = {
     deps: ThorchainSwapperDeps;
     sellAsset: Asset;
     buyAsset: Asset;
-    sellAmountCryptoPrecision: string;
+    sellAmountCryptoBaseUnit: string;
     slippageTolerance: string;
     destinationAddress: string;
     xpub: string;