@shapeshiftoss/swapper 7.5.1 → 7.7.1

package/dist/api.d.ts

@@ -1,6 +1,6 @@
 import { AssetId, ChainId } from '@shapeshiftoss/caip';
 import { BTCSignTx, ETHSignTx, HDWallet } from '@shapeshiftoss/hdwallet-core';
-import { Asset, ChainSpecific, KnownChainIds } from '@shapeshiftoss/types';
+import { Asset, BIP44Params, ChainSpecific, KnownChainIds, UtxoAccountType } from '@shapeshiftoss/types';
 export declare const SwapError: {
     new <V extends {
         cause?: unknown;
@@ -58,8 +58,17 @@ export declare type CommonTradeInput = {
     sellAssetAccountNumber: number;
     wallet?: HDWallet;
 };
-export declare type GetTradeQuoteInput = CommonTradeInput;
-export declare type BuildTradeInput = CommonTradeInput & {
+export declare type GetEthTradeQuoteInput = CommonTradeInput & {
+    chainId: 'eip155:1';
+};
+export declare type GetBtcTradeQuoteInput = CommonTradeInput & {
+    chainId: 'bip122:000000000019d6689c085ae165831e93';
+    accountType: UtxoAccountType;
+    bip44Params: BIP44Params;
+    wallet: HDWallet;
+};
+export declare type GetTradeQuoteInput = GetEthTradeQuoteInput | GetBtcTradeQuoteInput;
+export declare type BuildTradeInput = GetTradeQuoteInput & {
     buyAssetAccountNumber: number;
     slippage?: string;
     wallet: HDWallet;

package/dist/swappercli.js

@@ -109,11 +109,11 @@ const main = async () => {
     let quote;
     try {
         quote = await swapper.getTradeQuote({
+            chainId: 'eip155:1',
             sellAsset,
             buyAsset,
             sellAmount: sellAmountBase,
             sellAssetAccountNumber: 0,
-            wallet,
             sendMax: false
         });
     }
@@ -128,6 +128,7 @@ const main = async () => {
     const answer = readline_sync_1.default.question(`Swap ${sellAmount} ${sellAsset.symbol} for ${buyAmount} ${buyAsset.symbol} on ${swapper.getType()}? (y/n): `);
     if (answer === 'y') {
         const trade = await swapper.buildTrade({
+            chainId: 'eip155:1',
             wallet,
             buyAsset,
             sendMax: false,

package/dist/swappers/thorchain/ThorchainSwapper.d.ts

@@ -1,6 +1,6 @@
 import { AssetId, ChainId } from '@shapeshiftoss/caip';
 import type { Asset } from '@shapeshiftoss/types';
-import { ApprovalNeededInput, ApprovalNeededOutput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
+import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
 import { ThorchainSwapperDeps } from './types';
 export declare class ThorchainSwapper implements Swapper<ChainId> {
     private swapSupportedChainIds;
@@ -11,7 +11,7 @@ export declare class ThorchainSwapper implements Swapper<ChainId> {
     getType(): SwapperType;
     getUsdRate(input: Pick<Asset, 'symbol' | 'assetId'>): Promise<string>;
     approvalNeeded(input: ApprovalNeededInput<'eip155:1'>): Promise<ApprovalNeededOutput>;
-    approveInfinite(): Promise<string>;
+    approveInfinite(input: ApproveInfiniteInput<'eip155:1'>): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];
     filterAssetIdsBySellable(): AssetId[];
     buildTrade(): Promise<Trade<ChainId>>;

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -5,6 +5,7 @@ const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../api");
 const getTradeQuote_1 = require("./getThorTradeQuote/getTradeQuote");
 const thorTradeApprovalNeeded_1 = require("./thorTradeApprovalNeeded/thorTradeApprovalNeeded");
+const thorTradeApproveInfinite_1 = require("./thorTradeApproveInfinite/thorTradeApproveInfinite");
 const getUsdRate_1 = require("./utils/getUsdRate/getUsdRate");
 const thorService_1 = require("./utils/thorService");
 class ThorchainSwapper {
@@ -44,8 +45,8 @@ class ThorchainSwapper {
     async approvalNeeded(input) {
         return (0, thorTradeApprovalNeeded_1.thorTradeApprovalNeeded)({ deps: this.deps, input });
     }
-    async approveInfinite() {
-        throw new Error('ThorchainSwapper: approveInfinite unimplemented');
+    async approveInfinite(input) {
+        return (0, thorTradeApproveInfinite_1.thorTradeApproveInfinite)({ deps: this.deps, input });
     }
     filterBuyAssetsBySellAssetId(args) {
         const { assetIds = [], sellAssetId } = args;

package/dist/swappers/thorchain/thorTradeApproveInfinite/thorTradeApproveInfinite.d.ts

@@ -0,0 +1,6 @@
+import { ApproveInfiniteInput } from '../../../api';
+import { ThorchainSwapperDeps } from '../types';
+export declare const thorTradeApproveInfinite: ({ deps, input }: {
+    deps: ThorchainSwapperDeps;
+    input: ApproveInfiniteInput<'eip155:1'>;
+}) => Promise<string>;

package/dist/swappers/thorchain/thorTradeApproveInfinite/thorTradeApproveInfinite.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.thorTradeApproveInfinite = void 0;
+const types_1 = require("@shapeshiftoss/types");
+const api_1 = require("../../../api");
+const erc20_abi_1 = require("../../utils/abi/erc20-abi");
+const helpers_1 = require("../../utils/helpers/helpers");
+const constants_1 = require("../utils/constants");
+const thorTradeApproveInfinite = async ({ deps, input }) => {
+    try {
+        const { adapterManager, web3 } = deps;
+        const { quote, wallet } = input;
+        const sellAssetChainId = quote.sellAsset.chainId;
+        const adapter = adapterManager.get(types_1.KnownChainIds.EthereumMainnet);
+        if (!adapter)
+            throw new api_1.SwapError(`[thorTradeApproveInfinite] - No chain adapter found for ${sellAssetChainId}.`, {
+                code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,
+                details: { sellAssetChainId }
+            });
+        const allowanceGrantRequired = await (0, helpers_1.grantAllowance)({
+            quote: {
+                ...quote,
+                sellAmount: constants_1.MAX_ALLOWANCE
+            },
+            wallet,
+            adapter,
+            erc20Abi: erc20_abi_1.erc20Abi,
+            web3
+        });
+        return allowanceGrantRequired;
+    }
+    catch (e) {
+        if (e instanceof api_1.SwapError)
+            throw e;
+        throw new api_1.SwapError('[ZrxApproveInfinite]', {
+            cause: e,
+            code: api_1.SwapErrorTypes.APPROVE_INFINITE_FAILED
+        });
+    }
+};
+exports.thorTradeApproveInfinite = thorTradeApproveInfinite;

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

@@ -1 +1,2 @@
 export declare const MAX_THORCHAIN_TRADE = "100000000000000000000000000";
+export declare const MAX_ALLOWANCE = "100000000000000000000000000";

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

@@ -1,4 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAX_THORCHAIN_TRADE = void 0;
+exports.MAX_ALLOWANCE = exports.MAX_THORCHAIN_TRADE = void 0;
 exports.MAX_THORCHAIN_TRADE = '100000000000000000000000000';
+exports.MAX_ALLOWANCE = '100000000000000000000000000';

package/dist/swappers/thorchain/utils/txFeeHelpers/ethTxFees/getEthTxFees.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEthTxFees = void 0;
+const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../../../api");
 const bignumber_1 = require("../../../../utils/bignumber");
@@ -9,17 +10,36 @@ const estimateTradeFee_1 = require("../../estimateTradeFee/estimateTradeFee");
 const getEthTxFees = async ({ deps, data, router, buyAsset, sellAmount, adapterManager, receiveAddress, sellAssetReference }) => {
     try {
         const adapter = adapterManager.get(types_1.KnownChainIds.EthereumMainnet);
-        if (!adapter)
+        if (!adapter) {
             throw new api_1.SwapError(`[getThorTxInfo] - No chain adapter found for ${types_1.KnownChainIds.EthereumMainnet}.`, {
                 code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,
                 details: { chainId: types_1.KnownChainIds.EthereumMainnet }
             });
-        // TODO(ryankk): add falling back on hard coded gas Limit * new chain adapter method if it fails
-        const feeDataOptions = await adapter.getFeeData({
-            to: router,
-            value: sellAmount,
-            chainSpecific: { from: receiveAddress, contractData: data }
-        });
+        }
+        let feeDataOptions;
+        try {
+            feeDataOptions = await adapter.getFeeData({
+                to: router,
+                value: sellAmount,
+                chainSpecific: { from: receiveAddress, contractData: data }
+            });
+        }
+        catch (e) {
+            // Fallback to fixed fee amount in case of failure so that quote will not fail
+            // eslint-disable-next-line no-console
+            console.debug('[ThorSwapper:getEthTxFees] precise gas estimate failed, falling back on hard coded limit');
+            const gasFeeData = await adapter.getGasFeeData();
+            const gasLimit = '100000'; // good value to cover all thortrades out of eth/erc20
+            feeDataOptions = {
+                fast: {
+                    txFee: (0, bignumber_1.bn)(gasLimit).times(gasFeeData[chain_adapters_1.FeeDataKey.Fast].gasPrice).toString(),
+                    chainSpecific: {
+                        gasPrice: gasFeeData[chain_adapters_1.FeeDataKey.Fast].gasPrice,
+                        gasLimit
+                    }
+                }
+            };
+        }
         const feeData = feeDataOptions['fast'];
         const tradeFee = await (0, estimateTradeFee_1.estimateTradeFee)(deps, buyAsset.assetId);
         return {

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

@@ -1,7 +1,7 @@
 import { Asset } from '@shapeshiftoss/types';
 import { TradeQuote } from '../../../api';
 export declare const setupQuote: () => {
-    quoteInput: import("../../../api").CommonTradeInput;
+    quoteInput: import("../../../api").GetEthTradeQuoteInput;
     tradeQuote: TradeQuote<"eip155:1">;
     buyAsset: Asset;
     sellAsset: Asset;

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

@@ -19,6 +19,7 @@ const setupQuote = () => {
         sources: []
     };
     const quoteInput = {
+        chainId: 'eip155:1',
         sellAmount: '1000000000000000000',
         sellAsset,
         buyAsset,

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

@@ -1,3 +1,4 @@
+import { HDWallet } from '@shapeshiftoss/hdwallet-core';
 import { Asset } from '@shapeshiftoss/types';
 import { ZrxQuoteResponse } from '../../types';
 export declare const setupZrxTradeQuoteResponse: () => {
@@ -6,17 +7,12 @@ export declare const setupZrxTradeQuoteResponse: () => {
     sellAsset: Asset;
 };
 export declare const setupBuildTrade: () => {
-    buildTradeInput: {
-        sellAmount: string;
-        allowanceTarget: string;
-        price: string;
-        to: string;
-        buyAmount: string;
-        buyAsset: Asset;
-        sendMax: boolean;
-        sellAssetAccountNumber: number;
+    buildTradeInput: import("../../../../api").CommonTradeInput & {
+        chainId: "eip155:1";
+    } & {
         buyAssetAccountNumber: number;
-        sellAsset: Asset;
+        slippage?: string | undefined;
+        wallet: HDWallet;
     };
     buyAsset: Asset;
     sellAsset: Asset;

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

@@ -23,16 +23,14 @@ const setupBuildTrade = () => {
     const sellAsset = { ...assets_1.FOX };
     const buyAsset = { ...assets_1.WETH };
     const buildTradeInput = {
+        chainId: 'eip155:1',
         sellAmount: '1000000000000000000',
-        allowanceTarget: 'allowanceTargetAddress',
-        price: '1',
-        to: '0x123',
-        buyAmount: '',
         buyAsset,
         sendMax: false,
         sellAssetAccountNumber: 0,
         buyAssetAccountNumber: 0,
-        sellAsset
+        sellAsset,
+        wallet: {}
     };
     return { buildTradeInput, buyAsset, sellAsset };
 };

package/package.json

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