npm - @shapeshiftoss/swapper - Versions diffs - 9.16.0 → 9.17.0 - Mend

@shapeshiftoss/swapper 9.16.0 → 9.17.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/dist/api.d.ts CHANGED Viewed

@@ -79,7 +79,6 @@ declare type CommonTradeInput = {
     sellAmount: string;
     sendMax: boolean;
     sellAssetAccountNumber: number;
-    wallet: HDWallet;
     receiveAddress: string;
 };
 export declare type EvmSupportedChainIds = KnownChainIds.EthereumMainnet | KnownChainIds.AvalancheMainnet;
@@ -97,7 +96,7 @@ export declare type GetUtxoTradeQuoteInput = CommonTradeInput & {
     chainId: UtxoSupportedChainIds;
     accountType: UtxoAccountType;
     bip44Params: BIP44Params;
-    wallet: HDWallet;
+    xpub: string;
 };
 export declare type GetTradeQuoteInput = GetUtxoTradeQuoteInput | GetEvmTradeQuoteInput | GetCosmosSdkTradeQuoteInput;
 export declare type BuildTradeInput = GetTradeQuoteInput & {

package/dist/swappercli.js CHANGED Viewed

@@ -116,7 +116,6 @@ const main = async () => {
             sellAssetAccountNumber: 0,
             sendMax: false,
             receiveAddress: '0xc770eefad204b5180df6a14ee197d99d808ee52d',
-            wallet,
         });
     }
     catch (e) {

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

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

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

@@ -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, wallet } = input;
+        const { sellAsset, buyAsset, sellAmount, sellAssetAccountNumber, 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);
@@ -68,7 +68,6 @@ async function getCowSwapTradeQuote(deps, input) {
         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 receiveAddress = wallet ? await adapter.getAddress({ wallet }) : constants_1.DEFAULT_ADDRESS;
         const data = (0, helpers_1.getApproveContractData)({
             web3,
             spenderAddress: constants_1.COW_SWAP_VAULT_RELAYER_ADDRESS,

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

@@ -55,9 +55,7 @@ const buildTrade = async ({ deps, input, }) => {
                 sellAmount,
                 slippageTolerance,
                 destinationAddress,
-                wallet,
-                bip44Params: input.bip44Params,
-                accountType: input.accountType,
+                xpub: input.xpub,
                 tradeFee: quote.feeData.tradeFee,
             });
             const buildTxResponse = await sellAdapter.buildSendTransaction({

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

@@ -13,11 +13,7 @@ const getTradeRate_1 = require("../utils/getTradeRate/getTradeRate");
 const getBtcTxFees_1 = require("../utils/txFeeHelpers/btcTxFees/getBtcTxFees");
 const getEthTxFees_1 = require("../utils/txFeeHelpers/ethTxFees/getEthTxFees");
 const getThorTradeQuote = async ({ deps, input }) => {
-    const { sellAsset, buyAsset, sellAmount, sellAssetAccountNumber, wallet, chainId, receiveAddress, } = input;
-    if (!wallet)
-        throw new api_1.SwapError('[getThorTradeQuote] - wallet is required', {
-            code: api_1.SwapErrorTypes.VALIDATION_FAILED,
-        });
+    const { sellAsset, buyAsset, sellAmount, sellAssetAccountNumber, chainId, receiveAddress } = input;
     try {
         const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const sellAdapter = deps.adapterManager.get(chainId);
@@ -77,9 +73,7 @@ const getThorTradeQuote = async ({ deps, input }) => {
                         sellAmount,
                         slippageTolerance: constants_1.DEFAULT_SLIPPAGE,
                         destinationAddress: receiveAddress,
-                        wallet,
-                        bip44Params: input.bip44Params,
-                        accountType: input.accountType,
+                        xpub: input.xpub,
                         tradeFee,
                     });
                     const feeData = await (0, getBtcTxFees_1.getBtcTxFees)({

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

@@ -49,7 +49,7 @@ const thorTradeApprovalNeeded = async ({ deps, input, }) => {
                 details: { feeData: quote.feeData },
             });
         return {
-            approvalNeeded: allowanceOnChain.lte((0, bignumber_1.bnOrZero)(quote.sellAmount)),
+            approvalNeeded: allowanceOnChain.lt((0, bignumber_1.bnOrZero)(quote.sellAmount)),
         };
     }
     catch (e) {

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

@@ -1,6 +1,4 @@
 import { Asset } from '@shapeshiftoss/asset-service';
-import { HDWallet } from '@shapeshiftoss/hdwallet-core';
-import { BIP44Params, UtxoAccountType } from '@shapeshiftoss/types';
 import { ThorchainSwapperDeps } from '../../../types';
 declare type GetBtcThorTxInfoArgs = {
     deps: ThorchainSwapperDeps;
@@ -9,9 +7,7 @@ declare type GetBtcThorTxInfoArgs = {
     sellAmount: string;
     slippageTolerance: string;
     destinationAddress: string;
-    wallet: HDWallet;
-    bip44Params: BIP44Params;
-    accountType: UtxoAccountType;
+    xpub: string;
     tradeFee: string;
 };
 declare type GetBtcThorTxInfoReturn = Promise<{

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

@@ -5,7 +5,7 @@ const api_1 = require("../../../../../api");
 const getLimit_1 = require("../../getLimit/getLimit");
 const makeSwapMemo_1 = require("../../makeSwapMemo/makeSwapMemo");
 const thorService_1 = require("../../thorService");
-const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress, wallet, bip44Params, accountType, tradeFee, }) => {
+const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress, xpub, tradeFee, }) => {
     try {
         const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.midgardUrl}/thorchain/inbound_addresses`);
         const sellAssetInboundAddresses = inboundAddresses.find((inbound) => inbound.chain === sellAsset.symbol.toUpperCase());
@@ -30,12 +30,10 @@ const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTo
             destinationAddress,
             limit,
         });
-        const adapter = deps.adapterManager.get(sellAsset.chainId);
-        const pubkey = await adapter.getPublicKey(wallet, bip44Params, accountType);
         return {
             opReturnData: memo,
             vault,
-            pubkey: pubkey.xpub,
+            pubkey: xpub,
         };
     }
     catch (e) {

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

@@ -15,7 +15,6 @@ export declare const setupBuildTrade: () => {
         sellAmount: string;
         sendMax: boolean;
         sellAssetAccountNumber: number;
-        wallet: HDWallet;
         receiveAddress: string;
     } & {
         chainId: import("../../../api").EvmSupportedChainIds;

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

@@ -27,7 +27,6 @@ const setupQuote = () => {
         sellAssetAccountNumber: 0,
         sendMax: false,
         receiveAddress: '0xc770eefad204b5180df6a14ee197d99d808ee52d',
-        wallet: {},
     };
     return { quoteInput, tradeQuote, buyAsset, sellAsset };
 };

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

@@ -44,7 +44,7 @@ async function zrxApprovalNeeded({ adapter, web3 }, { quote, wallet }) {
                 details: { feeData: quote.feeData },
             });
         return {
-            approvalNeeded: allowanceOnChain.lte((0, bignumber_1.bnOrZero)(quote.sellAmount)),
+            approvalNeeded: allowanceOnChain.lt((0, bignumber_1.bnOrZero)(quote.sellAmount)),
         };
     }
     catch (e) {

package/package.json CHANGED Viewed

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