@shapeshiftoss/swapper 15.0.2 → 15.0.4

package/dist/api.d.ts

@@ -2,7 +2,7 @@ import { Asset } from '@shapeshiftoss/asset-service';
 import { AssetId, ChainId } from '@shapeshiftoss/caip';
 import { avalanche, cosmos, ethereum, osmosis } from '@shapeshiftoss/chain-adapters';
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
-import { BIP44Params, ChainSpecific, KnownChainIds, UtxoAccountType } from '@shapeshiftoss/types';
+import { ChainSpecific, KnownChainIds, UtxoAccountType } from '@shapeshiftoss/types';
 export declare const SwapError: {
     new <V extends {
         cause?: unknown;
@@ -80,7 +80,7 @@ declare type CommonTradeInput = {
     sellAmountBeforeFeesCryptoBaseUnit: string;
     sendMax: boolean;
     receiveAddress: string;
-    bip44Params: BIP44Params;
+    accountNumber: number;
 };
 export declare type EvmSupportedChainIds = KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet;
 export declare type CosmosSdkSupportedChainIds = KnownChainIds.CosmosMainnet | KnownChainIds.OsmosisMainnet | KnownChainIds.ThorchainMainnet;
@@ -96,7 +96,7 @@ export declare type GetCosmosSdkTradeQuoteInput = CommonTradeInput & {
 export declare type GetUtxoTradeQuoteInput = CommonTradeInput & {
     chainId: UtxoSupportedChainIds;
     accountType: UtxoAccountType;
-    bip44Params: BIP44Params;
+    accountNumber: number;
     xpub: string;
 };
 export declare type GetTradeQuoteInput = GetUtxoTradeQuoteInput | GetEvmTradeQuoteInput | GetCosmosSdkTradeQuoteInput;
@@ -112,7 +112,7 @@ interface TradeBase<C extends ChainId> {
     sources: SwapSource[];
     buyAsset: Asset;
     sellAsset: Asset;
-    bip44Params: BIP44Params;
+    accountNumber: number;
 }
 export interface TradeQuote<C extends ChainId> extends TradeBase<C> {
     allowanceContract: string;

package/dist/swappercli.js

@@ -107,8 +107,9 @@ const main = async () => {
     if (sellAdapter.getSupportedAccountTypes) {
         utxoAccountType = chain_adapters_1.bitcoin.ChainAdapter.defaultUtxoAccountType;
     }
+    const accountNumber = 0;
     const bip44Params = sellAdapter.getBIP44Params({
-        accountNumber: 0,
+        accountNumber,
         accountType: utxoAccountType,
     });
     if (!bip44Params) {
@@ -125,13 +126,13 @@ const main = async () => {
         if (!utxoAccountType) {
             throw new Error('utxoAccountType must be defined');
         }
-        publicKey = await sellAdapter.getPublicKey(wallet, bip44Params, utxoAccountType);
+        publicKey = await sellAdapter.getPublicKey(wallet, accountNumber, utxoAccountType);
     }
     const sellAmountBeforeFeesCryptoBaseUnit = toBaseUnit(sellAmountBeforeFeesCryptoPrecision, sellAsset.precision);
     const buyAssetReceiveAddr = await buyAdapter.getAddress({
         wallet,
         accountType: utxoAccountType,
-        bip44Params,
+        accountNumber,
     });
     console.info(`${buyAsset.name} using receive addr ${buyAssetReceiveAddr}`);
     let quote;
@@ -143,7 +144,7 @@ const main = async () => {
             sellAmountBeforeFeesCryptoBaseUnit,
             sendMax: false,
             accountType: utxoAccountType || chain_adapters_1.bitcoin.ChainAdapter.defaultUtxoAccountType,
-            bip44Params,
+            accountNumber,
             xpub: (publicKey === null || publicKey === void 0 ? void 0 : publicKey.xpub) || '',
             receiveAddress: buyAssetReceiveAddr,
         });
@@ -168,7 +169,7 @@ const main = async () => {
             sellAsset,
             receiveAddress: buyAssetReceiveAddr,
             accountType: utxoAccountType || chain_adapters_1.bitcoin.ChainAdapter.defaultUtxoAccountType,
-            bip44Params,
+            accountNumber,
             xpub: (publicKey === null || publicKey === void 0 ? void 0 : publicKey.xpub) || '',
         });
         const tradeResult = await swapper.executeTrade({ trade, wallet });

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

@@ -17,7 +17,8 @@ async function cowApprovalNeeded({ adapter, web3 }, { quote, wallet }) {
                 details: { assetNamespace },
             });
         }
-        const receiveAddress = await adapter.getAddress({ wallet, bip44Params: quote.bip44Params });
+        const { accountNumber } = quote;
+        const receiveAddress = await adapter.getAddress({ accountNumber, wallet });
         const allowanceResult = await (0, helpers_1.getERC20Allowance)({
             web3,
             erc20AllowanceAbi: erc20Allowance_abi_1.erc20AllowanceAbi,

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, sellAmountBeforeFeesCryptoBaseUnit: sellAmountExcludeFeeCryptoBaseUnit, bip44Params, wallet, } = input;
+        const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountExcludeFeeCryptoBaseUnit, accountNumber, 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);
@@ -29,7 +29,7 @@ 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 receiveAddress = await adapter.getAddress({ accountNumber, wallet });
         /**
          * /v1/quote
          * params: {
@@ -91,7 +91,7 @@ async function cowBuildTrade(deps, input) {
             sources: constants_1.DEFAULT_SOURCE,
             buyAsset,
             sellAsset,
-            bip44Params,
+            accountNumber,
             receiveAddress,
             feeAmountInSellTokenCryptoBaseUnit,
             sellAmountDeductFeeCryptoBaseUnit: quoteSellAmountExcludeFeeCryptoBaseUnit,

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, sellAmountBeforeFeesCryptoBaseUnit, bip44Params, receiveAddress } = input;
+        const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit, accountNumber, 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);
@@ -115,7 +115,7 @@ async function getCowSwapTradeQuote(deps, input) {
             allowanceContract: constants_1.COW_SWAP_VAULT_RELAYER_ADDRESS,
             buyAsset,
             sellAsset,
-            bip44Params,
+            accountNumber,
         };
     }
     catch (e) {

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

@@ -5,11 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cowService = void 0;
 const axios_1 = __importDefault(require("axios"));
+const utils_1 = require("../../../utils");
+const maxAge = 5 * 1000; // 5 seconds
+const cachedUrls = ['/mainnet/api/v1/quote'];
+const cache = (0, utils_1.createCache)(maxAge, cachedUrls);
 const axiosConfig = {
     timeout: 10000,
     headers: {
         Accept: 'application/json',
         'Content-Type': 'application/json',
     },
+    adapter: cache.adapter,
 };
 exports.cowService = axios_1.default.create(axiosConfig);

package/dist/swappers/osmosis/OsmosisSwapper.js

@@ -87,7 +87,7 @@ class OsmosisSwapper {
         return this.supportedAssetIds;
     }
     async buildTrade(args) {
-        const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, receiveAddress, bip44Params, } = args;
+        const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, receiveAddress, accountNumber, } = args;
         if (!sellAmountCryptoBaseUnit) {
             throw new api_1.SwapError('sellAmountCryptoPrecision is required', {
                 code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
@@ -115,12 +115,12 @@ class OsmosisSwapper {
             receiveAddress,
             sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBase,
             sellAsset,
-            bip44Params,
+            accountNumber,
             sources: [{ name: api_1.SwapperName.Osmosis, proportion: '100' }],
         };
     }
     async getTradeQuote(input) {
-        const { bip44Params, sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, } = input;
+        const { accountNumber, sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, } = input;
         if (!sellAmountCryptoBaseUnit) {
             throw new api_1.SwapError('sellAmount is required', {
                 code: api_1.SwapErrorTypes.RESPONSE_ERROR,
@@ -144,7 +144,7 @@ class OsmosisSwapper {
             },
             maximum,
             minimumCryptoHuman: minimum,
-            bip44Params,
+            accountNumber,
             rate,
             sellAsset,
             sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit,
@@ -154,7 +154,7 @@ class OsmosisSwapper {
         };
     }
     async executeTrade({ trade, wallet }) {
-        const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, bip44Params, receiveAddress, } = trade;
+        const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, accountNumber, receiveAddress, } = trade;
         const isFromOsmo = sellAsset.assetId === caip_1.osmosisAssetId;
         const sellAssetDenom = helpers_1.symbolDenomMapping[sellAsset.symbol];
         const buyAssetDenom = helpers_1.symbolDenomMapping[buyAsset.symbol];
@@ -171,7 +171,7 @@ class OsmosisSwapper {
         let sellAddress;
         let cosmosIbcTradeId = '';
         if (!isFromOsmo) {
-            sellAddress = await cosmosAdapter.getAddress({ wallet, bip44Params });
+            sellAddress = await cosmosAdapter.getAddress({ wallet, accountNumber });
             if (!sellAddress)
                 throw new api_1.SwapError('Failed to get address', {
                     code: api_1.SwapErrorTypes.EXECUTE_TRADE_FAILED,
@@ -182,9 +182,8 @@ class OsmosisSwapper {
                 amount: sellAmountCryptoBaseUnit,
             };
             const responseAccount = await cosmosAdapter.getAccount(sellAddress);
-            const accountNumber = responseAccount.chainSpecific.accountNumber || '0';
             const sequence = responseAccount.chainSpecific.sequence || '0';
-            const { tradeId } = await (0, helpers_1.performIbcTransfer)(transfer, cosmosAdapter, wallet, this.deps.osmoUrl, 'uatom', constants_1.COSMO_OSMO_CHANNEL, feeData.fast.txFee, accountNumber, sequence, gas, 'uatom');
+            const { tradeId } = await (0, helpers_1.performIbcTransfer)(transfer, cosmosAdapter, wallet, this.deps.osmoUrl, 'uatom', constants_1.COSMO_OSMO_CHANNEL, feeData.fast.txFee, accountNumber.toString(), sequence, gas, 'uatom');
             cosmosIbcTradeId = tradeId;
             // wait till confirmed
             const pollResult = await (0, helpers_1.pollForComplete)(tradeId, this.deps.cosmosUrl);
@@ -198,7 +197,7 @@ class OsmosisSwapper {
             await new Promise((resolve) => setTimeout(resolve, 5000));
         }
         else {
-            sellAddress = await osmosisAdapter.getAddress({ wallet, bip44Params });
+            sellAddress = await osmosisAdapter.getAddress({ wallet, accountNumber });
             if (!sellAddress)
                 throw new api_1.SwapError('failed to get osmoAddress', {
                     code: api_1.SwapErrorTypes.EXECUTE_TRADE_FAILED,

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

@@ -209,7 +209,7 @@ const performIbcTransfer = async (input, adapter, wallet, blockBaseUrl, denom, s
     const signed = await adapter.signTransaction({
         txToSign: {
             tx,
-            addressNList: (0, chain_adapters_1.toAddressNList)(adapter.buildBIP44Params({ accountNumber: 0 })),
+            addressNList: (0, chain_adapters_1.toAddressNList)(adapter.getBIP44Params({ accountNumber: 0 })),
             chain_id: (0, caip_1.fromChainId)(adapter.getChainId()).chainReference,
             account_number: accountNumber,
             sequence,
@@ -262,7 +262,7 @@ const buildTradeTx = async ({ osmoAddress, adapter, buyAssetDenom, sellAssetDeno
     return {
         txToSign: {
             tx,
-            addressNList: (0, chain_adapters_1.toAddressNList)(adapter.buildBIP44Params({ accountNumber: 0 })),
+            addressNList: (0, chain_adapters_1.toAddressNList)(adapter.getBIP44Params({ accountNumber: 0 })),
             chain_id: caip_1.CHAIN_REFERENCE.OsmosisMainnet,
             account_number: accountNumber,
             sequence,

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, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, sellAsset, bip44Params, slippage: slippageTolerance = constants_1.DEFAULT_SLIPPAGE, wallet, sendMax, } = input;
+        const { buyAsset, receiveAddress: destinationAddress, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, sellAsset, accountNumber, 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)
@@ -26,7 +26,7 @@ const buildTrade = async ({ deps, input }) => {
             const ethTradeTx = await (0, makeTradeTx_1.makeTradeTx)({
                 wallet,
                 slippageTolerance,
-                bip44Params,
+                accountNumber,
                 sellAsset,
                 buyAsset,
                 adapter: sellAdapter,
@@ -59,7 +59,7 @@ const buildTrade = async ({ deps, input }) => {
                 value: sellAmountCryptoBaseUnit,
                 wallet,
                 to: vault,
-                bip44Params: input.bip44Params,
+                accountNumber,
                 chainSpecific: {
                     accountType: input.accountType,
                     satoshiPerByte: quote.feeData.chainSpecific
@@ -76,11 +76,8 @@ const buildTrade = async ({ deps, input }) => {
             };
         }
         else if (chainNamespace === caip_1.CHAIN_NAMESPACE.CosmosSdk) {
-            if (!bip44Params) {
-                throw new Error('bip44Params required as input');
-            }
             const txData = await (0, getCosmosTxData_1.getCosmosTxData)({
-                bip44Params,
+                accountNumber,
                 deps,
                 sellAdapter: sellAdapter,
                 sellAmountCryptoBaseUnit,

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

@@ -16,10 +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, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, bip44Params, chainId, receiveAddress, sendMax, } = input;
-    if (!bip44Params) {
-        throw new Error('bip44Params required in getThorTradeQuote');
-    }
+    const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, accountNumber, chainId, receiveAddress, sendMax, } = input;
     try {
         const { assetReference: sellAssetReference } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const { chainId: buyAssetChainId } = (0, caip_1.fromAssetId)(buyAsset.assetId);
@@ -65,7 +62,7 @@ const getThorTradeQuote = async ({ deps, input }) => {
             sources: [{ name: api_1.SwapperName.Thorchain, proportion: '1' }],
             buyAsset,
             sellAsset,
-            bip44Params,
+            accountNumber,
             minimumCryptoHuman: minimumSellAssetAmountPaddedCryptoHuman,
             recommendedSlippage: recommendedSlippage.toPrecision(),
         };

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

@@ -10,7 +10,7 @@ const thorTradeApprovalNeeded = async ({ deps, input, }) => {
     var _a;
     try {
         const { quote, wallet } = input;
-        const { sellAsset, bip44Params } = quote;
+        const { sellAsset, accountNumber } = quote;
         const { adapterManager, web3 } = deps;
         const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const { chainNamespace } = (0, caip_1.fromChainId)(sellAsset.chainId);
@@ -26,7 +26,7 @@ const thorTradeApprovalNeeded = async ({ deps, input, }) => {
         if (sellAsset.assetId === adapter.getFeeAssetId()) {
             return { approvalNeeded: false };
         }
-        const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
+        const receiveAddress = await adapter.getAddress({ wallet, accountNumber });
         if (!quote.allowanceContract) {
             throw new api_1.SwapError('[thorTradeApprovalNeeded] - allowanceTarget is required', {
                 code: api_1.SwapErrorTypes.VALIDATION_FAILED,

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

@@ -2,11 +2,11 @@ import { Asset } from '@shapeshiftoss/asset-service';
 import { ChainId } from '@shapeshiftoss/caip';
 import { ChainAdapter } from '@shapeshiftoss/chain-adapters';
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
-import { BIP44Params, KnownChainIds } from '@shapeshiftoss/types';
+import { KnownChainIds } from '@shapeshiftoss/types';
 import { TradeQuote } from '../../../../api';
 import type { ThorchainSwapperDeps } from '../../types';
 declare type GetCosmosTxDataInput = {
-    bip44Params: BIP44Params;
+    accountNumber: number;
     destinationAddress: string;
     deps: ThorchainSwapperDeps;
     sellAmountCryptoBaseUnit: 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, sellAmountCryptoBaseUnit, sellAsset, buyAsset, slippageTolerance, quote, wallet, sellAdapter, } = input;
+    const { accountNumber, 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;
@@ -35,7 +35,7 @@ const getCosmosTxData = async (input) => {
         switch (true) {
             case fromThorAsset:
                 return await sellAdapter.buildDepositTransaction({
-                    bip44Params,
+                    accountNumber,
                     value: sellAmountCryptoBaseUnit,
                     wallet,
                     memo,
@@ -52,7 +52,7 @@ const getCosmosTxData = async (input) => {
                         details: { chainId: input.chainId },
                     });
                 return await sellAdapter.buildSendTransaction({
-                    bip44Params,
+                    accountNumber,
                     value: sellAmountCryptoBaseUnit,
                     wallet,
                     to: vault,

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

@@ -1,11 +1,10 @@
 import { Asset } from '@shapeshiftoss/asset-service';
 import { ETHSignTx, HDWallet } from '@shapeshiftoss/hdwallet-core';
-import { BIP44Params } from '@shapeshiftoss/types';
 import { EvmSupportedChainAdapter } from '../../../../api';
 import type { ThorchainSwapperDeps } from '../../types';
 declare type MakeTradeTxArgs = {
     wallet: HDWallet;
-    bip44Params: BIP44Params;
+    accountNumber: number;
     sellAmountCryptoBaseUnit: string;
     buyAsset: Asset;
     sellAsset: Asset;
@@ -24,7 +23,7 @@ declare type MakeTradeTxArgs = {
     maxFeePerGas: string;
     maxPriorityFeePerGas: string;
 });
-export declare const makeTradeTx: ({ wallet, bip44Params, sellAmountCryptoBaseUnit, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPriceCryptoBaseUnit, slippageTolerance, deps, gasLimit, buyAssetTradeFeeUsd, }: MakeTradeTxArgs) => Promise<{
+export declare const makeTradeTx: ({ wallet, accountNumber, 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, sellAmountCryptoBaseUnit, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPriceCryptoBaseUnit, slippageTolerance, deps, gasLimit, buyAssetTradeFeeUsd, }) => {
+const makeTradeTx = async ({ wallet, accountNumber, 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';
@@ -20,7 +20,7 @@ const makeTradeTx = async ({ wallet, bip44Params, sellAmountCryptoBaseUnit, buyA
         });
         return adapter.buildCustomTx({
             wallet,
-            bip44Params,
+            accountNumber,
             to: router,
             gasLimit,
             ...(gasPriceCryptoBaseUnit !== undefined

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

@@ -21,7 +21,6 @@ const setupThorswapDeps = () => {
         [
             types_1.KnownChainIds.EthereumMainnet,
             {
-                buildBIP44Params: jest.fn(() => ({ purpose: 44, coinType: 60, accountNumber: 0 })),
                 getAddress: jest.fn(() => Promise.resolve('0xthisIsMyAddress')),
                 getFeeData: jest.fn(() => feeData),
                 getFeeAssetId: jest.fn(() => caip_1.ethAssetId),

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

@@ -5,11 +5,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.thorService = void 0;
 const axios_1 = __importDefault(require("axios"));
+const utils_1 = require("../../../utils");
+// Important: maxAge should be small because inbound address info must be recent
+const maxAge = 5 * 1000; // 5 seconds
+const cachedUrls = [
+    '/lcd/thorchain/pools',
+    '/lcd/thorchain/inbound_addresses',
+    '/lcd/thorchain/pool/',
+];
+const cache = (0, utils_1.createCache)(maxAge, cachedUrls);
 const axiosConfig = {
     timeout: 10000,
     headers: {
         Accept: 'application/json',
         'Content-Type': 'application/json',
     },
+    adapter: cache.adapter,
 };
 exports.thorService = axios_1.default.create(axiosConfig);

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

@@ -56,11 +56,11 @@ const grantAllowance = async ({ quote, wallet, adapter, erc20Abi, web3, }) => {
         const approveTx = erc20Contract.methods
             .approve(quote.allowanceContract, quote.sellAmountBeforeFeesCryptoBaseUnit)
             .encodeABI();
-        const { bip44Params } = quote;
+        const { accountNumber } = quote;
         const { txToSign } = await adapter.buildSendTransaction({
             wallet,
             to: sellAssetErc20Address,
-            bip44Params,
+            accountNumber,
             value: '0',
             chainSpecific: {
                 erc20ContractAddress: sellAssetErc20Address,

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

@@ -15,7 +15,7 @@ export declare const setupBuildTrade: () => {
         sellAmountBeforeFeesCryptoBaseUnit: string;
         sendMax: boolean;
         receiveAddress: string;
-        bip44Params: import("@shapeshiftoss/types").BIP44Params;
+        accountNumber: number;
     } & {
         chainId: import("../../../api").EvmSupportedChainIds;
     } & {

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

@@ -12,7 +12,7 @@ const setupQuote = () => {
         sellAsset,
         buyAsset,
         allowanceContract: 'allowanceContractAddress',
-        bip44Params: { purpose: 44, coinType: 60, accountNumber: 0 },
+        accountNumber: 0,
         minimumCryptoHuman: '0',
         maximum: '999999999999',
         feeData: {
@@ -29,7 +29,7 @@ const setupQuote = () => {
         sellAmountBeforeFeesCryptoBaseUnit: '1000000000000000000',
         sellAsset,
         buyAsset,
-        bip44Params: { purpose: 44, coinType: 60, accountNumber: 0 },
+        accountNumber: 0,
         sendMax: false,
         receiveAddress: '0xc770eefad204b5180df6a14ee197d99d808ee52d',
     };
@@ -44,7 +44,7 @@ const setupBuildTrade = () => {
         sellAmountBeforeFeesCryptoBaseUnit: '1000000000000000000',
         buyAsset,
         sendMax: false,
-        bip44Params: { purpose: 44, coinType: 60, accountNumber: 0 },
+        accountNumber: 0,
         sellAsset,
         wallet: {},
         receiveAddress: '',

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, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, bip44Params, } = input;
+        const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, accountNumber, } = 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,
@@ -75,7 +75,7 @@ async function getZrxTradeQuote(input) {
             allowanceContract: allowanceTarget,
             buyAsset,
             sellAsset,
-            bip44Params,
+            accountNumber,
         };
         return tradeQuote;
     }

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

@@ -17,11 +17,7 @@ export declare const setupExecuteTrade: () => {
         buyAsset: Asset;
         sellAsset: Asset;
         sendMax: boolean;
-        bip44Params: {
-            purpose: number;
-            coinType: number;
-            accountNumber: number;
-        };
+        accountNumber: number;
         txData: string;
         depositAddress: string;
         receiveAddress: string;

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

@@ -33,7 +33,7 @@ const setupExecuteTrade = () => {
         buyAsset,
         sellAsset,
         sendMax: false,
-        bip44Params: { purpose: 44, coinType: 60, accountNumber: 0 },
+        accountNumber: 0,
         txData: '0x0',
         depositAddress: '0x0',
         receiveAddress: '0x0',

package/dist/swappers/zrx/utils/zrxService.js

@@ -5,12 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zrxServiceFactory = void 0;
 const axios_1 = __importDefault(require("axios"));
+const utils_1 = require("../../../utils");
+const maxAge = 5 * 1000; // 5 seconds
+const cachedUrls = ['/swap/v1/price'];
+const cache = (0, utils_1.createCache)(maxAge, cachedUrls);
 const axiosConfig = {
     timeout: 10000,
     headers: {
         Accept: 'application/json',
         'Content-Type': 'application/json',
     },
+    adapter: cache.adapter,
 };
 const zrxServiceFactory = (baseUrl) => axios_1.default.create({ ...axiosConfig, baseURL: baseUrl });
 exports.zrxServiceFactory = zrxServiceFactory;

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

@@ -21,7 +21,8 @@ async function zrxApprovalNeeded({ adapter, web3 }, { quote, wallet }) {
         if (sellAsset.assetId === adapter.getFeeAssetId()) {
             return { approvalNeeded: false };
         }
-        const receiveAddress = await adapter.getAddress({ wallet, bip44Params: quote.bip44Params });
+        const { accountNumber } = quote;
+        const receiveAddress = await adapter.getAddress({ accountNumber, wallet });
         if (!quote.allowanceContract) {
             throw new api_1.SwapError('[zrxApprovalNeeded] - allowanceTarget is required', {
                 code: api_1.SwapErrorTypes.VALIDATION_FAILED,

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) {
-    const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountExcludeFeeCryptoBaseUnit, slippage, bip44Params, receiveAddress, } = input;
+    const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountExcludeFeeCryptoBaseUnit, slippage, accountNumber, 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);
@@ -108,7 +108,7 @@ async function zrxBuildTrade({ adapter, web3 }, input) {
         const trade = {
             sellAsset,
             buyAsset,
-            bip44Params,
+            accountNumber,
             receiveAddress,
             rate: price,
             depositAddress: to,

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

@@ -6,7 +6,7 @@ const api_1 = require("../../../api");
 const helpers_1 = require("../utils/helpers/helpers");
 async function zrxExecuteTrade({ adapter }, { trade, wallet }) {
     var _a, _b, _c, _d, _e, _f;
-    const { bip44Params, sellAsset } = trade;
+    const { accountNumber, sellAsset } = trade;
     try {
         // value is 0 for erc20s
         const value = (0, helpers_1.isNativeEvmAsset)(sellAsset.assetId)
@@ -20,7 +20,7 @@ async function zrxExecuteTrade({ adapter }, { trade, wallet }) {
                 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,
+            accountNumber,
         });
         const { txToSign } = buildTxResponse;
         const txWithQuoteData = { ...txToSign, data: (_e = trade.txData) !== null && _e !== void 0 ? _e : '' };

package/dist/utils.d.ts

@@ -1 +1,3 @@
+import { ISetupCache } from 'axios-cache-adapter';
 export declare function assertIsDefined<T>(val: T): asserts val is NonNullable<T>;
+export declare const createCache: (maxAge: number, cachedUrls: string[]) => ISetupCache;

package/dist/utils.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.assertIsDefined = void 0;
+exports.createCache = exports.assertIsDefined = void 0;
 const assert_1 = require("assert");
+const axios_cache_adapter_1 = require("axios-cache-adapter");
 // asserts x is type doesn't work when using arrow functions
 function assertIsDefined(val) {
     if (val === undefined || val === null) {
@@ -9,3 +10,15 @@ function assertIsDefined(val) {
     }
 }
 exports.assertIsDefined = assertIsDefined;
+const getRequestFilter = (cachedUrls) => (request) => !cachedUrls.some((url) => request.url.includes(url));
+const createCache = (maxAge, cachedUrls) => {
+    const filter = getRequestFilter(cachedUrls);
+    return (0, axios_cache_adapter_1.setupCache)({
+        maxAge,
+        exclude: { filter, query: false },
+        clearOnStale: true,
+        readOnError: false,
+        readHeaders: false,
+    });
+};
+exports.createCache = createCache;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "15.0.2",
+  "version": "15.0.4",
   "description": "An interface and implementations to trade coins via various protocols",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",
@@ -24,6 +24,7 @@
   },
   "dependencies": {
     "axios": "^0.26.1",
+    "axios-cache-adapter": "^2.7.3",
     "bignumber.js": "^9.0.2",
     "lodash": "^4.17.21",
     "retry-axios": "^2.6.0",
@@ -44,9 +45,9 @@
     "@shapeshiftoss/errors": "^1.1.2",
     "@shapeshiftoss/hdwallet-core": "^1.41.0",
     "@shapeshiftoss/types": "^8.1.0",
+    "@shapeshiftoss/unchained-client": "^10.0.1",
     "@types/readline-sync": "^1.4.4",
     "readline-sync": "^1.4.10",
-    "web3-utils": "1.7.4",
-    "@shapeshiftoss/unchained-client": "^10.0.1"
+    "web3-utils": "1.7.4"
   }
 }