@shapeshiftoss/swapper 14.7.2 → 15.0.1

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

@@ -5,7 +5,7 @@ const api_1 = require("../../../../../api");
 const getInboundAddressDataForChain_1 = require("../../getInboundAddressDataForChain");
 const getLimit_1 = require("../../getLimit/getLimit");
 const makeSwapMemo_1 = require("../../makeSwapMemo/makeSwapMemo");
-const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmountCryptoPrecision, slippageTolerance, destinationAddress, xpub, buyAssetTradeFeeUsd, }) => {
+const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmountCryptoBaseUnit, slippageTolerance, destinationAddress, xpub, buyAssetTradeFeeUsd, }) => {
     try {
         const inboundAddress = await (0, getInboundAddressDataForChain_1.getInboundAddressDataForChain)(deps.daemonUrl, sellAsset.assetId);
         const vault = inboundAddress === null || inboundAddress === void 0 ? void 0 : inboundAddress.address;
@@ -16,7 +16,7 @@ const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmountCryptoPrecis
             });
         const limit = await (0, getLimit_1.getLimit)({
             buyAssetId: buyAsset.assetId,
-            sellAmountCryptoPrecision,
+            sellAmountCryptoBaseUnit,
             sellAsset,
             slippageTolerance,
             deps,

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

@@ -9,7 +9,7 @@ declare type GetCosmosTxDataInput = {
     bip44Params: BIP44Params;
     destinationAddress: string;
     deps: ThorchainSwapperDeps;
-    sellAmountCryptoPrecision: string;
+    sellAmountCryptoBaseUnit: string;
     sellAsset: Asset;
     buyAsset: Asset;
     slippageTolerance: string;

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

@@ -8,7 +8,7 @@ const getInboundAddressDataForChain_1 = require("../getInboundAddressDataForChai
 const getLimit_1 = require("../getLimit/getLimit");
 const makeSwapMemo_1 = require("../makeSwapMemo/makeSwapMemo");
 const getCosmosTxData = async (input) => {
-    const { bip44Params, deps, destinationAddress, sellAmountCryptoPrecision, sellAsset, buyAsset, slippageTolerance, quote, wallet, sellAdapter, } = input;
+    const { bip44Params, deps, destinationAddress, sellAmountCryptoBaseUnit, sellAsset, buyAsset, slippageTolerance, quote, wallet, sellAdapter, } = input;
     const fromThorAsset = sellAsset.chainId == types_1.KnownChainIds.ThorchainMainnet;
     const gaiaAddressData = await (0, getInboundAddressDataForChain_1.getInboundAddressDataForChain)(deps.daemonUrl, caip_1.cosmosAssetId);
     const vault = gaiaAddressData === null || gaiaAddressData === void 0 ? void 0 : gaiaAddressData.address;
@@ -20,7 +20,7 @@ const getCosmosTxData = async (input) => {
         });
     const limit = await (0, getLimit_1.getLimit)({
         buyAssetId: buyAsset.assetId,
-        sellAmountCryptoPrecision,
+        sellAmountCryptoBaseUnit,
         sellAsset,
         slippageTolerance,
         deps,
@@ -36,12 +36,12 @@ const getCosmosTxData = async (input) => {
             case fromThorAsset:
                 return await sellAdapter.buildDepositTransaction({
                     bip44Params,
-                    value: sellAmountCryptoPrecision,
+                    value: sellAmountCryptoBaseUnit,
                     wallet,
                     memo,
                     chainSpecific: {
                         gas: quote.feeData.chainSpecific.estimatedGas,
-                        fee: quote.feeData.networkFee,
+                        fee: quote.feeData.networkFeeCryptoBaseUnit,
                     },
                 });
             default:
@@ -53,14 +53,14 @@ const getCosmosTxData = async (input) => {
                     });
                 return await sellAdapter.buildSendTransaction({
                     bip44Params,
-                    value: sellAmountCryptoPrecision,
+                    value: sellAmountCryptoBaseUnit,
                     wallet,
                     to: vault,
                     memo,
                     chainSpecific: {
                         gas: quote.feeData.chainSpecific
                             .estimatedGas,
-                        fee: quote.feeData.networkFee,
+                        fee: quote.feeData.networkFeeCryptoBaseUnit,
                     },
                 });
         }

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

@@ -6,7 +6,7 @@ import type { ThorchainSwapperDeps } from '../../types';
 declare type MakeTradeTxArgs = {
     wallet: HDWallet;
     bip44Params: BIP44Params;
-    sellAmountCryptoPrecision: string;
+    sellAmountCryptoBaseUnit: string;
     buyAsset: Asset;
     sellAsset: Asset;
     destinationAddress: string;
@@ -16,15 +16,15 @@ declare type MakeTradeTxArgs = {
     gasLimit: string;
     buyAssetTradeFeeUsd: string;
 } & ({
-    gasPrice: string;
+    gasPriceCryptoBaseUnit: string;
     maxFeePerGas?: never;
     maxPriorityFeePerGas?: never;
 } | {
-    gasPrice?: never;
+    gasPriceCryptoBaseUnit?: never;
     maxFeePerGas: string;
     maxPriorityFeePerGas: string;
 });
-export declare const makeTradeTx: ({ wallet, bip44Params, sellAmountCryptoPrecision, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPrice, slippageTolerance, deps, gasLimit, buyAssetTradeFeeUsd, }: MakeTradeTxArgs) => Promise<{
+export declare const makeTradeTx: ({ wallet, bip44Params, sellAmountCryptoBaseUnit, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPriceCryptoBaseUnit, slippageTolerance, deps, gasLimit, buyAssetTradeFeeUsd, }: MakeTradeTxArgs) => Promise<{
     txToSign: ETHSignTx;
 }>;
 export {};

package/dist/swappers/thorchain/utils/evm/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("./utils/getThorTxData");
-const makeTradeTx = async ({ wallet, bip44Params, sellAmountCryptoPrecision, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPrice, slippageTolerance, deps, gasLimit, buyAssetTradeFeeUsd, }) => {
+const makeTradeTx = async ({ wallet, bip44Params, sellAmountCryptoBaseUnit, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPriceCryptoBaseUnit, slippageTolerance, deps, gasLimit, buyAssetTradeFeeUsd, }) => {
     try {
         const { assetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const isErc20Trade = assetNamespace === 'erc20';
@@ -13,7 +13,7 @@ const makeTradeTx = async ({ wallet, bip44Params, sellAmountCryptoPrecision, buy
             deps,
             sellAsset,
             buyAsset,
-            sellAmountCryptoPrecision,
+            sellAmountCryptoBaseUnit,
             slippageTolerance,
             destinationAddress,
             buyAssetTradeFeeUsd,
@@ -23,8 +23,10 @@ const makeTradeTx = async ({ wallet, bip44Params, sellAmountCryptoPrecision, buy
             bip44Params,
             to: router,
             gasLimit,
-            ...(gasPrice !== undefined ? { gasPrice } : { maxFeePerGas, maxPriorityFeePerGas }),
-            value: isErc20Trade ? '0x0' : (0, web3_utils_1.numberToHex)(sellAmountCryptoPrecision),
+            ...(gasPriceCryptoBaseUnit !== undefined
+                ? { gasPrice: gasPriceCryptoBaseUnit }
+                : { maxFeePerGas, maxPriorityFeePerGas }),
+            value: isErc20Trade ? '0x0' : (0, web3_utils_1.numberToHex)(sellAmountCryptoBaseUnit),
             data,
         });
     }

package/dist/swappers/thorchain/utils/evm/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;
     buyAssetTradeFeeUsd: string;

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

@@ -7,7 +7,7 @@ const getInboundAddressDataForChain_1 = require("../../getInboundAddressDataForC
 const getLimit_1 = require("../../getLimit/getLimit");
 const makeSwapMemo_1 = require("../../makeSwapMemo/makeSwapMemo");
 const routerCalldata_1 = require("../routerCalldata");
-const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmountCryptoPrecision, slippageTolerance, destinationAddress, buyAssetTradeFeeUsd, }) => {
+const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmountCryptoBaseUnit, slippageTolerance, destinationAddress, buyAssetTradeFeeUsd, }) => {
     try {
         const { assetReference, assetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const isErc20Trade = assetNamespace === 'erc20';
@@ -21,7 +21,7 @@ const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmountCryptoPrecis
             });
         const limit = await (0, getLimit_1.getLimit)({
             buyAssetId: buyAsset.assetId,
-            sellAmountCryptoPrecision,
+            sellAmountCryptoBaseUnit,
             sellAsset,
             slippageTolerance,
             deps,
@@ -32,7 +32,7 @@ const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmountCryptoPrecis
             destinationAddress,
             limit,
         });
-        const data = await (0, routerCalldata_1.deposit)(router, vault, isErc20Trade ? assetReference : '0x0000000000000000000000000000000000000000', sellAmountCryptoPrecision, memo);
+        const data = await (0, routerCalldata_1.deposit)(router, vault, isErc20Trade ? assetReference : '0x0000000000000000000000000000000000000000', sellAmountCryptoBaseUnit, memo);
         return { data, router };
     }
     catch (e) {

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

@@ -3,9 +3,9 @@ import { ThorchainSwapperDeps } from '../../types';
 export declare type GetLimitArgs = {
     buyAssetId: string;
     sellAsset: Asset;
-    sellAmountCryptoPrecision: string;
+    sellAmountCryptoBaseUnit: string;
     deps: ThorchainSwapperDeps;
     slippageTolerance: string;
     buyAssetTradeFeeUsd: string;
 };
-export declare const getLimit: ({ sellAsset, buyAssetId, sellAmountCryptoPrecision, deps, slippageTolerance, buyAssetTradeFeeUsd, }: GetLimitArgs) => Promise<string>;
+export declare const getLimit: ({ sellAsset, buyAssetId, sellAmountCryptoBaseUnit, deps, slippageTolerance, buyAssetTradeFeeUsd, }: GetLimitArgs) => Promise<string>;

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

@@ -15,9 +15,9 @@ const getInboundAddressDataForChain_1 = require("../getInboundAddressDataForChai
 const getTradeRate_1 = require("../getTradeRate/getTradeRate");
 const getUsdRate_1 = require("../getUsdRate/getUsdRate");
 const isRune_1 = require("../isRune/isRune");
-const getLimit = async ({ sellAsset, buyAssetId, sellAmountCryptoPrecision, deps, slippageTolerance, buyAssetTradeFeeUsd, }) => {
+const getLimit = async ({ sellAsset, buyAssetId, sellAmountCryptoBaseUnit, deps, slippageTolerance, buyAssetTradeFeeUsd, }) => {
     var _a, _b;
-    const tradeRate = await (0, getTradeRate_1.getTradeRate)(sellAsset, buyAssetId, sellAmountCryptoPrecision, deps);
+    const tradeRate = await (0, getTradeRate_1.getTradeRate)(sellAsset, buyAssetId, sellAmountCryptoBaseUnit, deps);
     const sellAssetChainFeeAssetId = (_a = deps.adapterManager.get(sellAsset.chainId)) === null || _a === void 0 ? void 0 : _a.getFeeAssetId();
     const buyAssetChainFeeAssetId = (_b = deps.adapterManager
         .get((0, caip_1.fromAssetId)(buyAssetId).chainId)) === null || _b === void 0 ? void 0 : _b.getFeeAssetId();
@@ -29,7 +29,7 @@ const getLimit = async ({ sellAsset, buyAssetId, sellAmountCryptoPrecision, deps
     }
     const sellFeeAssetUsdRate = await (0, getUsdRate_1.getUsdRate)(deps.daemonUrl, sellAssetChainFeeAssetId);
     const buyAssetUsdRate = await (0, getUsdRate_1.getUsdRate)(deps.daemonUrl, buyAssetId);
-    const expectedBuyAmountCryptoPrecision8 = (0, bignumber_1.toBaseUnit)((0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(sellAmountCryptoPrecision).times(tradeRate), sellAsset.precision), constants_3.THORCHAIN_FIXED_PRECISION);
+    const expectedBuyAmountCryptoPrecision8 = (0, bignumber_1.toBaseUnit)((0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(sellAmountCryptoBaseUnit).times(tradeRate), sellAsset.precision), constants_3.THORCHAIN_FIXED_PRECISION);
     const isValidSlippageRange = (0, bignumber_1.bnOrZero)(slippageTolerance).gte(0) && (0, bignumber_1.bnOrZero)(slippageTolerance).lte(1);
     if ((0, bignumber_1.bnOrZero)(expectedBuyAmountCryptoPrecision8).lt(0) || !isValidSlippageRange)
         throw new api_1.SwapError('[getLimit]: bad expected buy amount or bad slippage tolerance', {

package/dist/swappers/thorchain/utils/test-data/setupThorswapDeps.js

@@ -13,7 +13,7 @@ const setupThorswapDeps = () => {
     const feeData = {
         fast: {
             txFee: '1',
-            chainSpecific: { approvalFee: '1', gasLimit: '1', gasPrice: '1' },
+            chainSpecific: { approvalFeeCryptoBaseUnit: '1', gasLimit: '1', gasPrice: '1' },
             tradeFee: '2',
         },
     };

package/dist/swappers/thorchain/utils/txFeeHelpers/evmTxFees/getEvmTxFees.js

@@ -24,11 +24,11 @@ const getEvmTxFees = async ({ adapter, sellAssetReference, buyAssetTradeFeeUsd,
         };
         const feeData = feeDataOptions['fast'];
         return {
-            networkFee: feeData.txFee,
+            networkFeeCryptoBaseUnit: feeData.txFee,
             chainSpecific: {
                 estimatedGas: feeData.chainSpecific.gasLimit,
-                gasPrice: feeData.chainSpecific.gasPrice,
-                approvalFee: sellAssetReference &&
+                gasPriceCryptoBaseUnit: feeData.chainSpecific.gasPrice,
+                approvalFeeCryptoBaseUnit: sellAssetReference &&
                     (0, bignumber_1.bnOrZero)(constants_1.APPROVAL_GAS_LIMIT)
                         .multipliedBy((0, bignumber_1.bnOrZero)(feeData.chainSpecific.gasPrice))
                         .toString(),

package/dist/swappers/thorchain/utils/txFeeHelpers/utxoTxFees/getUtxoTxFees.d.ts

@@ -3,11 +3,11 @@ import { QuoteFeeData, UtxoSupportedChainIds } from '../../../../../api';
 declare type GetUtxoTxFeesInput = {
     opReturnData: string;
     vault: string;
-    sellAmountCryptoPrecision: string;
+    sellAmountCryptoBaseUnit: string;
     sellAdapter: UtxoBaseAdapter<UtxoSupportedChainIds>;
     pubkey: string;
     buyAssetTradeFeeUsd: string;
     sendMax: boolean;
 };
-export declare const getUtxoTxFees: ({ opReturnData, vault, sellAmountCryptoPrecision, sellAdapter, pubkey, buyAssetTradeFeeUsd, sendMax, }: GetUtxoTxFeesInput) => Promise<QuoteFeeData<UtxoSupportedChainIds>>;
+export declare const getUtxoTxFees: ({ opReturnData, vault, sellAmountCryptoBaseUnit, sellAdapter, pubkey, buyAssetTradeFeeUsd, sendMax, }: GetUtxoTxFeesInput) => Promise<QuoteFeeData<UtxoSupportedChainIds>>;
 export {};

package/dist/swappers/thorchain/utils/txFeeHelpers/utxoTxFees/getUtxoTxFees.js

@@ -4,11 +4,11 @@ exports.getUtxoTxFees = void 0;
 const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../../../api");
 const bignumber_1 = require("../../../../utils/bignumber");
-const getUtxoTxFees = async ({ opReturnData, vault, sellAmountCryptoPrecision, sellAdapter, pubkey, buyAssetTradeFeeUsd, sendMax, }) => {
+const getUtxoTxFees = async ({ opReturnData, vault, sellAmountCryptoBaseUnit, sellAdapter, pubkey, buyAssetTradeFeeUsd, sendMax, }) => {
     try {
         const feeDataOptions = await sellAdapter.getFeeData({
             to: vault,
-            value: sellAmountCryptoPrecision,
+            value: sellAmountCryptoBaseUnit,
             chainSpecific: { pubkey, opReturnData },
             sendMax,
         });
@@ -23,7 +23,7 @@ const getUtxoTxFees = async ({ opReturnData, vault, sellAmountCryptoPrecision, s
         const networkFee = feeMultiplier.times(feeData.txFee).dp(0).toString();
         const satsPerByte = feeMultiplier.times(feeData.chainSpecific.satoshiPerByte).dp(0).toString();
         return {
-            networkFee,
+            networkFeeCryptoBaseUnit: networkFee,
             buyAssetTradeFeeUsd,
             sellAssetTradeFeeUsd: '0',
             chainSpecific: {

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

@@ -9,7 +9,7 @@ export declare type IsApprovalRequiredArgs = {
     receiveAddress: string;
     allowanceContract: string;
     sellAsset: Asset;
-    sellAmount: string;
+    sellAmountExcludeFeeCryptoBaseUnit: string;
     web3: Web3;
     erc20AllowanceAbi: AbiItem[];
 };
@@ -33,7 +33,7 @@ declare type GrantAllowanceArgs<T extends EvmSupportedChainIds> = {
     web3: Web3;
 };
 export declare const getERC20Allowance: ({ erc20AllowanceAbi, web3, sellAssetErc20Address, ownerAddress, spenderAddress, }: GetERC20AllowanceArgs) => Promise<any>;
-export declare const isApprovalRequired: ({ adapter, receiveAddress, allowanceContract, sellAsset, sellAmount, web3, erc20AllowanceAbi, }: IsApprovalRequiredArgs) => Promise<boolean>;
+export declare const isApprovalRequired: ({ adapter, receiveAddress, allowanceContract, sellAsset, sellAmountExcludeFeeCryptoBaseUnit, web3, erc20AllowanceAbi, }: IsApprovalRequiredArgs) => Promise<boolean>;
 export declare const grantAllowance: <T extends EvmSupportedChainIds>({ quote, wallet, adapter, erc20Abi, web3, }: GrantAllowanceArgs<T>) => Promise<string>;
 /**
  * This function keeps 17 significant digits, so even if we try to trade 1 Billion of an

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

@@ -12,7 +12,7 @@ const getERC20Allowance = async ({ erc20AllowanceAbi, web3, sellAssetErc20Addres
     return erc20Contract.methods.allowance(ownerAddress, spenderAddress).call();
 };
 exports.getERC20Allowance = getERC20Allowance;
-const isApprovalRequired = async ({ adapter, receiveAddress, allowanceContract, sellAsset, sellAmount, web3, erc20AllowanceAbi, }) => {
+const isApprovalRequired = async ({ adapter, receiveAddress, allowanceContract, sellAsset, sellAmountExcludeFeeCryptoBaseUnit, web3, erc20AllowanceAbi, }) => {
     try {
         if (sellAsset.assetId === adapter.getFeeAssetId()) {
             return false;
@@ -35,7 +35,7 @@ const isApprovalRequired = async ({ adapter, receiveAddress, allowanceContract,
         }
         if ((0, bignumber_1.bn)(allowanceOnChain).isZero())
             return true;
-        const allowanceRequired = (0, bignumber_1.bnOrZero)(sellAmount).minus(allowanceOnChain);
+        const allowanceRequired = (0, bignumber_1.bnOrZero)(sellAmountExcludeFeeCryptoBaseUnit).minus(allowanceOnChain);
         return allowanceRequired.gt(0);
     }
     catch (e) {
@@ -54,7 +54,7 @@ const grantAllowance = async ({ quote, wallet, adapter, erc20Abi, web3, }) => {
         const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(quote.sellAsset.assetId);
         const erc20Contract = new web3.eth.Contract(erc20Abi, sellAssetErc20Address);
         const approveTx = erc20Contract.methods
-            .approve(quote.allowanceContract, quote.sellAmountCryptoPrecision)
+            .approve(quote.allowanceContract, quote.sellAmountBeforeFeesCryptoBaseUnit)
             .encodeABI();
         const { bip44Params } = quote;
         const { txToSign } = await adapter.buildSendTransaction({
@@ -64,7 +64,7 @@ const grantAllowance = async ({ quote, wallet, adapter, erc20Abi, web3, }) => {
             value: '0',
             chainSpecific: {
                 erc20ContractAddress: sellAssetErc20Address,
-                gasPrice: (0, web3_utils_1.numberToHex)(((_b = (_a = quote.feeData) === null || _a === void 0 ? void 0 : _a.chainSpecific) === null || _b === void 0 ? void 0 : _b.gasPrice) || 0),
+                gasPrice: (0, web3_utils_1.numberToHex)(((_b = (_a = quote.feeData) === null || _a === void 0 ? void 0 : _a.chainSpecific) === null || _b === void 0 ? void 0 : _b.gasPriceCryptoBaseUnit) || 0),
                 gasLimit: (0, web3_utils_1.numberToHex)(((_d = (_c = quote.feeData) === null || _c === void 0 ? void 0 : _c.chainSpecific) === null || _d === void 0 ? void 0 : _d.estimatedGas) || 0),
             },
         });

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

@@ -12,7 +12,7 @@ export declare const setupBuildTrade: () => {
     buildTradeInput: {
         sellAsset: Asset;
         buyAsset: Asset;
-        sellAmountCryptoPrecision: string;
+        sellAmountBeforeFeesCryptoBaseUnit: string;
         sendMax: boolean;
         receiveAddress: string;
         bip44Params: import("@shapeshiftoss/types").BIP44Params;

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

@@ -7,8 +7,8 @@ const setupQuote = () => {
     const sellAsset = { ...assets_1.FOX };
     const buyAsset = { ...assets_1.WETH };
     const tradeQuote = {
-        buyAmountCryptoPrecision: '',
-        sellAmountCryptoPrecision: '1000000000000000000',
+        buyAmountCryptoBaseUnit: '',
+        sellAmountBeforeFeesCryptoBaseUnit: '1000000000000000000',
         sellAsset,
         buyAsset,
         allowanceContract: 'allowanceContractAddress',
@@ -18,7 +18,7 @@ const setupQuote = () => {
         feeData: {
             chainSpecific: {},
             sellAssetTradeFeeUsd: '0',
-            networkFee: '0',
+            networkFeeCryptoBaseUnit: '0',
             buyAssetTradeFeeUsd: '0',
         },
         rate: '1',
@@ -26,7 +26,7 @@ const setupQuote = () => {
     };
     const quoteInput = {
         chainId: types_1.KnownChainIds.EthereumMainnet,
-        sellAmountCryptoPrecision: '1000000000000000000',
+        sellAmountBeforeFeesCryptoBaseUnit: '1000000000000000000',
         sellAsset,
         buyAsset,
         bip44Params: { purpose: 44, coinType: 60, accountNumber: 0 },
@@ -41,7 +41,7 @@ const setupBuildTrade = () => {
     const buyAsset = { ...assets_1.WETH };
     const buildTradeInput = {
         chainId: types_1.KnownChainIds.EthereumMainnet,
-        sellAmountCryptoPrecision: '1000000000000000000',
+        sellAmountBeforeFeesCryptoBaseUnit: '1000000000000000000',
         buyAsset,
         sendMax: false,
         bip44Params: { purpose: 44, coinType: 60, accountNumber: 0 },

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

@@ -12,7 +12,7 @@ const helpers_2 = require("../utils/helpers/helpers");
 const zrxService_1 = require("../utils/zrxService");
 async function getZrxTradeQuote(input) {
     try {
-        const { sellAsset, buyAsset, sellAmountCryptoPrecision, bip44Params } = input;
+        const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, bip44Params, } = input;
         if (buyAsset.chainId !== input.chainId || sellAsset.chainId !== input.chainId) {
             throw new api_1.SwapError('[getZrxTradeQuote] - Both assets need to be on the same supported EVM chain to use Zrx', {
                 code: api_1.SwapErrorTypes.UNSUPPORTED_PAIR,
@@ -21,14 +21,14 @@ async function getZrxTradeQuote(input) {
         }
         const { assetReference: sellAssetErc20Address, assetNamespace: sellAssetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const { assetReference: buyAssetErc20Address, assetNamespace: buyAssetNamespace } = (0, caip_1.fromAssetId)(buyAsset.assetId);
-        const useSellAmount = !!sellAmountCryptoPrecision;
+        const useSellAmount = !!sellAmountCryptoBaseUnit;
         const buyToken = buyAssetNamespace === 'erc20' ? buyAssetErc20Address : buyAsset.symbol;
         const sellToken = sellAssetNamespace === 'erc20' ? sellAssetErc20Address : sellAsset.symbol;
         const { minimum, maximum } = await (0, getZrxMinMax_1.getZrxMinMax)(sellAsset, buyAsset);
-        const minQuotesellAmountCryptoPrecision = (0, bignumber_1.bnOrZero)(minimum).times((0, bignumber_1.bn)(10).exponentiatedBy(sellAsset.precision));
-        const normalizedSellAmount = (0, helpers_1.normalizeAmount)((0, bignumber_1.bnOrZero)(sellAmountCryptoPrecision).eq(0)
-            ? minQuotesellAmountCryptoPrecision
-            : sellAmountCryptoPrecision);
+        const minQuotesellAmountCryptoBaseUnit = (0, bignumber_1.bnOrZero)(minimum).times((0, bignumber_1.bn)(10).exponentiatedBy(sellAsset.precision));
+        const normalizedSellAmount = (0, helpers_1.normalizeAmount)((0, bignumber_1.bnOrZero)(sellAmountCryptoBaseUnit).eq(0)
+            ? minQuotesellAmountCryptoBaseUnit
+            : sellAmountCryptoBaseUnit);
         const baseUrl = (0, helpers_2.baseUrlFromChainId)(buyAsset.chainId);
         const zrxService = (0, zrxService_1.zrxServiceFactory)(baseUrl);
         /**
@@ -47,14 +47,14 @@ async function getZrxTradeQuote(input) {
                 sellAmount: normalizedSellAmount,
             },
         });
-        const { data: { estimatedGas: estimatedGasResponse, gasPrice, price, sellAmount: sellAmountResponse, buyAmount, sources, allowanceTarget, }, } = quoteResponse;
+        const { data: { estimatedGas: estimatedGasResponse, gasPrice: gasPriceCryptoBaseUnit, price, sellAmount: sellAmountResponse, buyAmount, sources, allowanceTarget, }, } = quoteResponse;
         const estimatedGas = (0, bignumber_1.bnOrZero)(estimatedGasResponse).times(1.5);
         const rate = useSellAmount ? price : (0, bignumber_1.bn)(1).div(price).toString();
-        const fee = (0, bignumber_1.bnOrZero)(estimatedGas).multipliedBy((0, bignumber_1.bnOrZero)(gasPrice)).toString();
+        const fee = estimatedGas.multipliedBy((0, bignumber_1.bnOrZero)(gasPriceCryptoBaseUnit)).toString();
         // 0x approvals are cheaper than trades, but we don't have dynamic quote data for them.
         // 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();
+        const approvalFeeCryptoBaseUnit = sellAssetErc20Address &&
+            (0, bignumber_1.bnOrZero)(constants_1.APPROVAL_GAS_LIMIT).multipliedBy((0, bignumber_1.bnOrZero)(gasPriceCryptoBaseUnit)).toString();
         const tradeQuote = {
             rate,
             minimumCryptoHuman: minimum,
@@ -62,15 +62,15 @@ async function getZrxTradeQuote(input) {
             feeData: {
                 chainSpecific: {
                     estimatedGas: estimatedGas.toString(),
-                    gasPrice,
-                    approvalFee,
+                    gasPriceCryptoBaseUnit,
+                    approvalFeeCryptoBaseUnit,
                 },
-                networkFee: fee,
+                networkFeeCryptoBaseUnit: fee,
                 buyAssetTradeFeeUsd: '0',
                 sellAssetTradeFeeUsd: '0',
             },
-            sellAmountCryptoPrecision: sellAmountResponse,
-            buyAmountCryptoPrecision: buyAmount,
+            sellAmountBeforeFeesCryptoBaseUnit: sellAmountResponse,
+            buyAmountCryptoBaseUnit: buyAmount,
             sources: (sources === null || sources === void 0 ? void 0 : sources.filter((s) => parseFloat(s.proportion) > 0)) || constants_2.DEFAULT_SOURCE,
             allowanceContract: allowanceTarget,
             buyAsset,

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

@@ -7,13 +7,13 @@ export declare const setupZrxTradeQuoteResponse: () => {
 };
 export declare const setupExecuteTrade: () => {
     executeTradeInput: {
-        sellAmountCryptoPrecision: string;
+        sellAmountBeforeFeesCryptoBaseUnit: string;
         allowanceTarget: string;
         price: string;
         to: string;
         gas: string;
         gasPrice: string;
-        buyAmountCryptoPrecision: string;
+        buyAmountCryptoBaseUnit: string;
         buyAsset: Asset;
         sellAsset: Asset;
         sendMax: boolean;
@@ -29,7 +29,7 @@ export declare const setupExecuteTrade: () => {
             chainSpecific: {};
             buyAssetTradeFeeUsd: string;
             sellAssetTradeFeeUsd: string;
-            networkFee: string;
+            networkFeeCryptoBaseUnit: string;
         };
         rate: string;
         sources: never[];

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

@@ -23,13 +23,13 @@ const setupExecuteTrade = () => {
     const sellAsset = { ...assets_1.FOX };
     const buyAsset = { ...assets_1.WETH };
     const executeTradeInput = {
-        sellAmountCryptoPrecision: '1000000000000000000',
+        sellAmountBeforeFeesCryptoBaseUnit: '1000000000000000000',
         allowanceTarget: 'allowanceTargetAddress',
         price: '1',
         to: '0x123',
         gas: '1235',
         gasPrice: '1236',
-        buyAmountCryptoPrecision: '',
+        buyAmountCryptoBaseUnit: '',
         buyAsset,
         sellAsset,
         sendMax: false,
@@ -41,7 +41,7 @@ const setupExecuteTrade = () => {
             chainSpecific: {},
             buyAssetTradeFeeUsd: '0',
             sellAssetTradeFeeUsd: '0',
-            networkFee: '0',
+            networkFeeCryptoBaseUnit: '0',
         },
         rate: '0',
         sources: [],

package/dist/swappers/zrx/zrxApprovalNeeded/zrxApprovalNeeded.js

@@ -36,13 +36,13 @@ async function zrxApprovalNeeded({ adapter, web3 }, { quote, wallet }) {
             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('[zrxApprovalNeeded] - 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/zrx/zrxApprove/zrxApprove.js

@@ -31,7 +31,7 @@ const grantAllowanceForAmount = async ({ adapter, web3 }, { quote, wallet }, app
 async function zrxApproveAmount(deps, args) {
     var _a;
     try {
-        const sellAmount = args.quote.sellAmountCryptoPrecision;
+        const sellAmount = args.quote.sellAmountBeforeFeesCryptoBaseUnit;
         // If no amount is specified we use the quotes sell amount
         const approvalAmount = (_a = args.amount) !== null && _a !== void 0 ? _a : sellAmount;
         return grantAllowanceForAmount(deps, args, approvalAmount);

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

@@ -36,8 +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;
-    const { sellAsset, buyAsset, sellAmountCryptoPrecision, slippage, bip44Params, receiveAddress } = input;
+    const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountExcludeFeeCryptoBaseUnit, slippage, bip44Params, receiveAddress, } = input;
     try {
         const { assetReference: buyAssetErc20Address, assetNamespace: buyAssetNamespace } = (0, caip_1.fromAssetId)(buyAsset.assetId);
         const { assetReference: sellAssetErc20Address, assetNamespace: sellAssetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
@@ -82,49 +81,51 @@ async function zrxBuildTrade({ adapter, web3 }, input) {
             params: {
                 buyToken,
                 sellToken,
-                sellAmount: (0, helpers_1.normalizeAmount)(sellAmountCryptoPrecision),
+                sellAmount: (0, helpers_1.normalizeAmount)(sellAmountExcludeFeeCryptoBaseUnit),
                 takerAddress: receiveAddress,
                 slippagePercentage,
                 skipValidation: false,
                 affiliateAddress: constants_2.AFFILIATE_ADDRESS,
             },
         });
-        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 { data: { allowanceTarget, sellAmount, gasPrice: gasPriceCryptoBaseUnit, gas: gasCryptoBaseUnit, price, to, buyAmount: buyAmountCryptoBaseUnit, data: txData, sources, }, } = quoteResponse;
+        const estimatedGas = (0, bignumber_1.bnOrZero)(gasCryptoBaseUnit || 0);
+        const networkFee = (0, bignumber_1.bnOrZero)(estimatedGas)
+            .multipliedBy((0, bignumber_1.bnOrZero)(gasPriceCryptoBaseUnit))
+            .toString();
         const approvalRequired = await (0, helpers_1.isApprovalRequired)({
             adapter,
             sellAsset,
-            allowanceContract: data.allowanceTarget,
+            allowanceContract: allowanceTarget,
             receiveAddress,
-            sellAmount: data.sellAmount,
+            sellAmountExcludeFeeCryptoBaseUnit,
             web3,
             erc20AllowanceAbi: erc20Allowance_abi_1.erc20AllowanceAbi,
         });
         const approvalFee = (0, bignumber_1.bnOrZero)(constants_1.APPROVAL_GAS_LIMIT)
-            .multipliedBy((0, bignumber_1.bnOrZero)(data.gasPrice))
+            .multipliedBy((0, bignumber_1.bnOrZero)(gasPriceCryptoBaseUnit))
             .toString();
         const trade = {
             sellAsset,
             buyAsset,
             bip44Params,
             receiveAddress,
-            rate: data.price,
-            depositAddress: data.to,
+            rate: price,
+            depositAddress: to,
             feeData: {
                 chainSpecific: {
                     estimatedGas: estimatedGas.toString(),
-                    gasPrice: data.gasPrice,
-                    approvalFee: approvalRequired ? approvalFee : undefined,
+                    gasPriceCryptoBaseUnit,
+                    approvalFeeCryptoBaseUnit: approvalRequired ? approvalFee : undefined,
                 },
-                networkFee,
+                networkFeeCryptoBaseUnit: networkFee,
                 buyAssetTradeFeeUsd: '0',
                 sellAssetTradeFeeUsd: '0',
             },
-            txData: data.data,
-            sellAmountCryptoPrecision: data.sellAmount,
-            buyAmountCryptoPrecision: data.buyAmount,
-            sources: ((_a = data.sources) === null || _a === void 0 ? void 0 : _a.filter((s) => parseFloat(s.proportion) > 0)) || constants_2.DEFAULT_SOURCE,
+            txData,
+            sellAmountBeforeFeesCryptoBaseUnit: sellAmount,
+            buyAmountCryptoBaseUnit,
+            sources: (sources === null || sources === void 0 ? void 0 : sources.filter((s) => parseFloat(s.proportion) > 0)) || constants_2.DEFAULT_SOURCE,
         };
         return trade;
     }

package/dist/swappers/zrx/zrxExecuteTrade/zrxExecuteTrade.js

@@ -9,13 +9,15 @@ async function zrxExecuteTrade({ adapter }, { trade, wallet }) {
     const { bip44Params, sellAsset } = trade;
     try {
         // value is 0 for erc20s
-        const value = (0, helpers_1.isNativeEvmAsset)(sellAsset.assetId) ? trade.sellAmountCryptoPrecision : '0';
+        const value = (0, helpers_1.isNativeEvmAsset)(sellAsset.assetId)
+            ? trade.sellAmountBeforeFeesCryptoBaseUnit
+            : '0';
         const buildTxResponse = await adapter.buildSendTransaction({
             value,
             wallet,
             to: trade.depositAddress,
             chainSpecific: {
-                gasPrice: (0, web3_utils_1.numberToHex)(((_b = (_a = trade.feeData) === null || _a === void 0 ? void 0 : _a.chainSpecific) === null || _b === void 0 ? void 0 : _b.gasPrice) || 0),
+                gasPrice: (0, web3_utils_1.numberToHex)(((_b = (_a = trade.feeData) === null || _a === void 0 ? void 0 : _a.chainSpecific) === null || _b === void 0 ? void 0 : _b.gasPriceCryptoBaseUnit) || 0),
                 gasLimit: (0, web3_utils_1.numberToHex)(((_d = (_c = trade.feeData) === null || _c === void 0 ? void 0 : _c.chainSpecific) === null || _d === void 0 ? void 0 : _d.estimatedGas) || 0),
             },
             bip44Params,