@shapeshiftoss/swapper 9.12.0 → 9.14.0

package/dist/api.d.ts

@@ -173,6 +173,7 @@ export declare enum SwapErrorTypes {
     RESPONSE_ERROR = "RESPONSE_ERROR",
     SIGN_AND_BROADCAST_FAILED = "SIGN_AND_BROADCAST_FAILED",
     TRADE_QUOTE_FAILED = "TRADE_QUOTE_FAILED",
+    TRADE_QUOTE_AMOUNT_TOO_SMALL = "TRADE_QUOTE_AMOUNT_TOO_SMALL",
     TRADE_QUOTE_INPUT_LOWER_THAN_FEES = "TRADE_QUOTE_INPUT_LOWER_THAN_FEES",
     UNSUPPORTED_PAIR = "UNSUPPORTED_PAIR",
     USD_RATE_FAILED = "USD_RATE_FAILED",

package/dist/api.js

@@ -28,6 +28,7 @@ var SwapErrorTypes;
     SwapErrorTypes["RESPONSE_ERROR"] = "RESPONSE_ERROR";
     SwapErrorTypes["SIGN_AND_BROADCAST_FAILED"] = "SIGN_AND_BROADCAST_FAILED";
     SwapErrorTypes["TRADE_QUOTE_FAILED"] = "TRADE_QUOTE_FAILED";
+    SwapErrorTypes["TRADE_QUOTE_AMOUNT_TOO_SMALL"] = "TRADE_QUOTE_AMOUNT_TOO_SMALL";
     SwapErrorTypes["TRADE_QUOTE_INPUT_LOWER_THAN_FEES"] = "TRADE_QUOTE_INPUT_LOWER_THAN_FEES";
     SwapErrorTypes["UNSUPPORTED_PAIR"] = "UNSUPPORTED_PAIR";
     SwapErrorTypes["USD_RATE_FAILED"] = "USD_RATE_FAILED";

package/dist/swappers/osmosis/OsmosisSwapper.js

@@ -178,7 +178,6 @@ class OsmosisSwapper {
         const signTxInput = await (0, helpers_1.buildTradeTx)({
             osmoAddress,
             adapter: osmosisAdapter,
-            trade,
             buyAssetDenom,
             sellAssetDenom,
             sellAmount: ibcSellAmount !== null && ibcSellAmount !== void 0 ? ibcSellAmount : sellAmount,
@@ -205,7 +204,7 @@ class OsmosisSwapper {
             // delay to ensure all nodes we interact with are up to date at this point
             // seeing intermittent bugs that suggest the balances and sequence numbers were sometimes off
             await new Promise((resolve) => setTimeout(resolve, 3000));
-            await (0, helpers_1.performIbcTransfer)(transfer, osmosisAdapter, wallet, this.deps.cosmosUrl, buyAssetDenom, constants_1.OSMO_COSMO_CHANNEL, trade.feeData.fee, ibcAccountNumber, ibcSequence, gas);
+            await (0, helpers_1.performIbcTransfer)(transfer, osmosisAdapter, wallet, this.deps.cosmosUrl, buyAssetDenom, constants_1.OSMO_COSMO_CHANNEL, '0', ibcAccountNumber, ibcSequence, gas);
         }
         return { tradeId: tradeId || 'error' };
     }

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

@@ -1,7 +1,6 @@
-import { ChainId } from '@shapeshiftoss/caip';
 import { osmosis } from '@shapeshiftoss/chain-adapters';
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
-import { CosmosSdkSupportedChainAdapters, Trade, TradeResult } from '../../../index';
+import { CosmosSdkSupportedChainAdapters, TradeResult } from '../../../index';
 import { IbcTransferInput } from './types';
 export interface SymbolDenomMapping {
     OSMO: string;
@@ -23,10 +22,9 @@ export declare const getRateInfo: (sellAsset: string, buyAsset: string, sellAmou
     buyAmount: string;
 }>;
 export declare const performIbcTransfer: (input: IbcTransferInput, adapter: CosmosSdkSupportedChainAdapters, wallet: HDWallet, blockBaseUrl: string, denom: string, sourceChannel: string, feeAmount: string, accountNumber: string, sequence: string, gas: string) => Promise<TradeResult>;
-export declare const buildTradeTx: ({ osmoAddress, adapter, trade, buyAssetDenom, sellAssetDenom, sellAmount, gas, wallet }: {
+export declare const buildTradeTx: ({ osmoAddress, adapter, buyAssetDenom, sellAssetDenom, sellAmount, gas, wallet }: {
     osmoAddress: string;
     adapter: osmosis.ChainAdapter;
-    trade: Trade<ChainId>;
     buyAssetDenom: string;
     sellAssetDenom: string;
     sellAmount: string;

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

@@ -227,7 +227,7 @@ const performIbcTransfer = async (input, adapter, wallet, blockBaseUrl, denom, s
 };
 exports.performIbcTransfer = performIbcTransfer;
 // TODO: move to chain adapters
-const buildTradeTx = async ({ osmoAddress, adapter, trade, buyAssetDenom, sellAssetDenom, sellAmount, gas, wallet }) => {
+const buildTradeTx = async ({ osmoAddress, adapter, buyAssetDenom, sellAssetDenom, sellAmount, gas, wallet }) => {
     const responseAccount = await adapter.getAccount(osmoAddress);
     const accountNumber = responseAccount.chainSpecific.accountNumber || '0';
     const sequence = responseAccount.chainSpecific.sequence || '0';
@@ -241,7 +241,7 @@ const buildTradeTx = async ({ osmoAddress, adapter, trade, buyAssetDenom, sellAs
         fee: {
             amount: [
                 {
-                    amount: trade.feeData.fee.toString(),
+                    amount: '0',
                     denom: 'uosmo'
                 }
             ],

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

@@ -26,11 +26,10 @@ const getThorTradeQuote = async ({ deps, input }) => {
                 code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,
                 details: { chainId }
             });
-        const tradeRate = await (0, getTradeRate_1.getTradeRate)(sellAsset, buyAsset.assetId, sellAmount, deps);
-        const rate = (0, bignumber_1.bnOrZero)(1).div(tradeRate).toString();
-        const buyAmount = (0, bignumber_1.toBaseUnit)((0, bignumber_1.bnOrZero)((0, bignumber_1.fromBaseUnit)(sellAmount, sellAsset.precision)).times(tradeRate), buyAsset.precision);
+        const rate = await (0, getTradeRate_1.getTradeRate)(sellAsset, buyAsset.assetId, sellAmount, deps);
+        const buyAmount = (0, bignumber_1.toBaseUnit)((0, bignumber_1.bnOrZero)((0, bignumber_1.fromBaseUnit)(sellAmount, sellAsset.precision)).times(rate), buyAsset.precision);
         const tradeFee = await (0, estimateTradeFee_1.estimateTradeFee)(deps, buyAsset);
-        const sellAssetTradeFee = (0, bignumber_1.bnOrZero)(tradeFee).times((0, bignumber_1.bnOrZero)(rate));
+        const sellAssetTradeFee = (0, bignumber_1.bnOrZero)(tradeFee).dividedBy((0, bignumber_1.bnOrZero)(rate));
         // minimum is tradeFee padded by an amount to be sure they get something back
         // usually it will be slightly more than the amount because sellAssetTradeFee is already a high estimate
         const minimum = (0, bignumber_1.bnOrZero)(sellAssetTradeFee).times(constants_2.THOR_MINIMUM_PADDING).toString();

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

@@ -24,7 +24,7 @@ const getPriceRatio = async (deps, input) => {
                 code: api_1.SwapErrorTypes.RESPONSE_ERROR,
                 details: { buyPoolId, sellPoolId }
             });
-        return (0, bignumber_1.bnOrZero)(buyUsdPrice).dividedBy(sellUsdPrice).toString();
+        return (0, bignumber_1.bnOrZero)(sellUsdPrice).dividedBy(buyUsdPrice).toString();
     }
     catch (e) {
         if (e instanceof api_1.SwapError)

package/package.json

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