@shapeshiftoss/swapper 11.2.0 → 11.3.0

package/dist/api.d.ts

@@ -74,13 +74,12 @@ export declare type SupportedSellAssetsInput = {
     assetIds: AssetId[];
 };
 declare type CommonTradeInput = {
-    bip44Params?: BIP44Params;
     sellAsset: Asset;
     buyAsset: Asset;
     sellAmount: string;
     sendMax: boolean;
-    sellAssetAccountNumber: number;
     receiveAddress: string;
+    bip44Params: BIP44Params;
 };
 export declare type EvmSupportedChainIds = KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet;
 export declare type CosmosSdkSupportedChainIds = KnownChainIds.CosmosMainnet | KnownChainIds.OsmosisMainnet | KnownChainIds.ThorchainMainnet;
@@ -112,7 +111,7 @@ interface TradeBase<C extends ChainId> {
     sources: SwapSource[];
     buyAsset: Asset;
     sellAsset: Asset;
-    sellAssetAccountNumber: number;
+    bip44Params: BIP44Params;
 }
 export interface TradeQuote<C extends ChainId> extends TradeBase<C> {
     allowanceContract: string;

package/dist/swappercli.js

@@ -139,7 +139,6 @@ const main = async () => {
             sellAsset,
             buyAsset,
             sellAmount: sellAmountBase,
-            sellAssetAccountNumber: 0,
             sendMax: false,
             accountType: utxoAccountType || chain_adapters_1.bitcoin.ChainAdapter.defaultUtxoAccountType,
             bip44Params,
@@ -165,7 +164,6 @@ const main = async () => {
             sendMax: false,
             sellAmount: sellAmountBase,
             sellAsset,
-            sellAssetAccountNumber: 0,
             receiveAddress: buyAssetReceiveAddr,
             accountType: utxoAccountType || chain_adapters_1.bitcoin.ChainAdapter.defaultUtxoAccountType,
             bip44Params,

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, sellAmount, sellAssetAccountNumber, wallet } = input;
+        const { sellAsset, buyAsset, sellAmount, 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);
@@ -86,7 +86,7 @@ async function cowBuildTrade(deps, input) {
             sources: constants_1.DEFAULT_SOURCE,
             buyAsset,
             sellAsset,
-            sellAssetAccountNumber,
+            bip44Params,
             receiveAddress,
             feeAmountInSellToken: quote.feeAmount,
             sellAmountWithoutFee: quote.sellAmount,

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

package/dist/swappers/osmosis/OsmosisSwapper.js

@@ -87,7 +87,7 @@ class OsmosisSwapper {
         return this.supportedAssetIds;
     }
     async buildTrade(args) {
-        const { sellAsset, buyAsset, sellAmount, receiveAddress } = args;
+        const { sellAsset, buyAsset, sellAmount, receiveAddress, bip44Params } = args;
         if (!sellAmount) {
             throw new api_1.SwapError('sellAmount is required', {
                 code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED,
@@ -111,12 +111,12 @@ class OsmosisSwapper {
             receiveAddress,
             sellAmount: amountBaseSell,
             sellAsset,
-            sellAssetAccountNumber: 0,
+            bip44Params,
             sources: [{ name: 'Osmosis', proportion: '100' }],
         };
     }
     async getTradeQuote(input) {
-        const { sellAsset, buyAsset, sellAmount } = input;
+        const { bip44Params, sellAsset, buyAsset, sellAmount } = input;
         if (!sellAmount) {
             throw new api_1.SwapError('sellAmount is required', {
                 code: api_1.SwapErrorTypes.RESPONSE_ERROR,
@@ -136,7 +136,7 @@ class OsmosisSwapper {
             feeData: { fee, tradeFee },
             maximum,
             minimum,
-            sellAssetAccountNumber: 0,
+            bip44Params,
             rate,
             sellAsset,
             sellAmount,
@@ -146,7 +146,7 @@ class OsmosisSwapper {
         };
     }
     async executeTrade({ trade, wallet }) {
-        const { sellAsset, buyAsset, sellAmount, sellAssetAccountNumber, receiveAddress } = trade;
+        const { sellAsset, buyAsset, sellAmount, bip44Params, receiveAddress } = trade;
         const isFromOsmo = sellAsset.assetId === caip_1.osmosisAssetId;
         const sellAssetDenom = helpers_1.symbolDenomMapping[sellAsset.symbol];
         const buyAssetDenom = helpers_1.symbolDenomMapping[buyAsset.symbol];
@@ -163,10 +163,7 @@ class OsmosisSwapper {
         let sellAddress;
         let cosmosIbcTradeId = '';
         if (!isFromOsmo) {
-            const sellBip44Params = cosmosAdapter.buildBIP44Params({
-                accountNumber: Number(sellAssetAccountNumber),
-            });
-            sellAddress = await cosmosAdapter.getAddress({ wallet, bip44Params: sellBip44Params });
+            sellAddress = await cosmosAdapter.getAddress({ wallet, bip44Params });
             if (!sellAddress)
                 throw new api_1.SwapError('Failed to get address', {
                     code: api_1.SwapErrorTypes.EXECUTE_TRADE_FAILED,
@@ -193,10 +190,7 @@ class OsmosisSwapper {
             await new Promise((resolve) => setTimeout(resolve, 5000));
         }
         else {
-            const sellBip44Params = osmosisAdapter.buildBIP44Params({
-                accountNumber: Number(sellAssetAccountNumber),
-            });
-            sellAddress = await osmosisAdapter.getAddress({ wallet, bip44Params: sellBip44Params });
+            sellAddress = await osmosisAdapter.getAddress({ wallet, bip44Params });
             if (!sellAddress)
                 throw new api_1.SwapError('failed to get osmoAddress', {
                     code: api_1.SwapErrorTypes.EXECUTE_TRADE_FAILED,

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

@@ -12,7 +12,7 @@ const makeTradeTx_1 = require("../utils/ethereum/makeTradeTx");
 const buildTrade = async ({ deps, input, }) => {
     var _a, _b, _c, _d;
     try {
-        const { bip44Params, buyAsset, receiveAddress: destinationAddress, sellAmount, sellAsset, sellAssetAccountNumber, slippage: slippageTolerance = constants_1.DEFAULT_SLIPPAGE, wallet, } = input;
+        const { buyAsset, receiveAddress: destinationAddress, sellAmount, sellAsset, bip44Params, slippage: slippageTolerance = constants_1.DEFAULT_SLIPPAGE, wallet, } = input;
         const quote = await (0, getTradeQuote_1.getThorTradeQuote)({ deps, input });
         const sellAdapter = deps.adapterManager.get(sellAsset.chainId);
         if (!sellAdapter)
@@ -23,13 +23,10 @@ const buildTrade = async ({ deps, input, }) => {
             });
         const { chainNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         if (chainNamespace === caip_1.CHAIN_NAMESPACE.Evm) {
-            const sellAssetBip44Params = sellAdapter.buildBIP44Params({
-                accountNumber: sellAssetAccountNumber,
-            });
             const ethTradeTx = await (0, makeTradeTx_1.makeTradeTx)({
                 wallet,
                 slippageTolerance,
-                bip44Params: sellAssetBip44Params,
+                bip44Params,
                 sellAsset,
                 buyAsset,
                 adapter: sellAdapter,

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

@@ -15,7 +15,10 @@ const getBtcTxFees_1 = require("../utils/txFeeHelpers/btcTxFees/getBtcTxFees");
 const getEthTxFees_1 = require("../utils/txFeeHelpers/ethTxFees/getEthTxFees");
 const MINIMUM_USD_TRADE_AMOUNT = (0, bignumber_1.bn)(1);
 const getThorTradeQuote = async ({ deps, input }) => {
-    const { sellAsset, buyAsset, sellAmount, sellAssetAccountNumber, chainId, receiveAddress } = input;
+    const { sellAsset, buyAsset, sellAmount, bip44Params, chainId, receiveAddress } = input;
+    if (!bip44Params) {
+        throw new Error('bip44Params required in getThorTradeQuote');
+    }
     try {
         const { assetReference: sellAssetReference } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const sellAdapter = deps.adapterManager.get(chainId);
@@ -44,7 +47,7 @@ const getThorTradeQuote = async ({ deps, input }) => {
             sources: [{ name: 'thorchain', proportion: '1' }],
             buyAsset,
             sellAsset,
-            sellAssetAccountNumber,
+            bip44Params,
             minimum,
         };
         const { chainNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);

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

@@ -10,13 +10,12 @@ const thorTradeApprovalNeeded = async ({ deps, input, }) => {
     var _a;
     try {
         const { quote, wallet } = input;
-        const { sellAsset } = quote;
+        const { sellAsset, bip44Params } = quote;
         const { adapterManager, web3 } = deps;
         const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const { chainNamespace } = (0, caip_1.fromChainId)(sellAsset.chainId);
         if (chainNamespace !== caip_1.CHAIN_NAMESPACE.Evm)
             return { approvalNeeded: false };
-        const accountNumber = quote.sellAssetAccountNumber;
         const adapter = adapterManager.get(sellAsset.chainId);
         if (!adapter)
             throw new api_1.SwapError(`[thorTradeApprovalNeeded] - no chain adapter found for chain Id: ${sellAsset.chainId}`, {
@@ -27,7 +26,6 @@ const thorTradeApprovalNeeded = async ({ deps, input, }) => {
         if (sellAsset.assetId === adapter.getFeeAssetId()) {
             return { approvalNeeded: false };
         }
-        const bip44Params = adapter.buildBIP44Params({ accountNumber });
         const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
         if (!quote.allowanceContract) {
             throw new api_1.SwapError('[thorTradeApprovalNeeded] - allowanceTarget is required', {

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

@@ -56,8 +56,7 @@ const grantAllowance = async ({ quote, wallet, adapter, erc20Abi, web3, }) => {
         const approveTx = erc20Contract.methods
             .approve(quote.allowanceContract, quote.sellAmount)
             .encodeABI();
-        const accountNumber = quote.sellAssetAccountNumber;
-        const bip44Params = adapter.buildBIP44Params({ accountNumber });
+        const { bip44Params } = quote;
         const { txToSign } = await adapter.buildSendTransaction({
             wallet,
             to: sellAssetErc20Address,

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

@@ -10,13 +10,12 @@ export declare const setupQuote: () => {
 };
 export declare const setupBuildTrade: () => {
     buildTradeInput: {
-        bip44Params?: import("@shapeshiftoss/types").BIP44Params | undefined;
         sellAsset: Asset;
         buyAsset: Asset;
         sellAmount: string;
         sendMax: boolean;
-        sellAssetAccountNumber: number;
         receiveAddress: string;
+        bip44Params: import("@shapeshiftoss/types").BIP44Params;
     } & {
         chainId: import("../../../api").EvmSupportedChainIds;
     } & {

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

@@ -12,7 +12,7 @@ const setupQuote = () => {
         sellAsset,
         buyAsset,
         allowanceContract: 'allowanceContractAddress',
-        sellAssetAccountNumber: 0,
+        bip44Params: { purpose: 44, coinType: 60, accountNumber: 0 },
         minimum: '0',
         maximum: '999999999999',
         feeData: { fee: '0', tradeFee: '0', chainSpecific: {} },
@@ -24,7 +24,7 @@ const setupQuote = () => {
         sellAmount: '1000000000000000000',
         sellAsset,
         buyAsset,
-        sellAssetAccountNumber: 0,
+        bip44Params: { purpose: 44, coinType: 60, accountNumber: 0 },
         sendMax: false,
         receiveAddress: '0xc770eefad204b5180df6a14ee197d99d808ee52d',
     };
@@ -39,7 +39,7 @@ const setupBuildTrade = () => {
         sellAmount: '1000000000000000000',
         buyAsset,
         sendMax: false,
-        sellAssetAccountNumber: 0,
+        bip44Params: { purpose: 44, coinType: 60, 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, sellAmount, sellAssetAccountNumber } = input;
+        const { sellAsset, buyAsset, sellAmount, 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,
@@ -72,7 +72,7 @@ async function getZrxTradeQuote(input) {
             allowanceContract: allowanceTarget,
             buyAsset,
             sellAsset,
-            sellAssetAccountNumber,
+            bip44Params,
         };
     }
     catch (e) {

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

@@ -17,7 +17,11 @@ export declare const setupExecuteTrade: () => {
         buyAsset: Asset;
         sellAsset: Asset;
         sendMax: boolean;
-        sellAssetAccountNumber: number;
+        bip44Params: {
+            purpose: number;
+            coinType: 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,
-        sellAssetAccountNumber: 0,
+        bip44Params: { purpose: 44, coinType: 60, accountNumber: 0 },
         txData: '0x0',
         depositAddress: '0x0',
         receiveAddress: '0x0',

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

@@ -21,9 +21,7 @@ async function zrxApprovalNeeded({ adapter, web3 }, { quote, wallet }) {
         if (sellAsset.assetId === adapter.getFeeAssetId()) {
             return { approvalNeeded: false };
         }
-        const accountNumber = quote.sellAssetAccountNumber;
-        const bip44Params = adapter.buildBIP44Params({ accountNumber });
-        const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
+        const receiveAddress = await adapter.getAddress({ wallet, bip44Params: quote.bip44Params });
         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

@@ -37,7 +37,7 @@ const helpers_2 = require("../utils/helpers/helpers");
 const zrxService_1 = require("../utils/zrxService");
 async function zrxBuildTrade({ adapter, web3 }, input) {
     var _a, _b, _c;
-    const { sellAsset, buyAsset, sellAmount, slippage, sellAssetAccountNumber, receiveAddress } = input;
+    const { sellAsset, buyAsset, sellAmount, 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);
@@ -94,7 +94,7 @@ async function zrxBuildTrade({ adapter, web3 }, input) {
         const trade = {
             sellAsset,
             buyAsset,
-            sellAssetAccountNumber,
+            bip44Params,
             receiveAddress,
             rate: data.price,
             depositAddress: data.to,

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

@@ -6,13 +6,10 @@ 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 { sellAsset } = trade;
+    const { bip44Params, sellAsset } = trade;
     try {
         // value is 0 for erc20s
         const value = (0, helpers_1.isNativeEvmAsset)(sellAsset.assetId) ? trade.sellAmount : '0';
-        const bip44Params = adapter.buildBIP44Params({
-            accountNumber: trade.sellAssetAccountNumber,
-        });
         const buildTxResponse = await adapter.buildSendTransaction({
             value,
             wallet,

package/package.json

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