@shapeshiftoss/swapper 9.15.1 → 9.16.2

package/dist/swappers/cow/CowSwapper.d.ts

@@ -3,7 +3,7 @@ import { AssetId } from '@shapeshiftoss/caip';
 import { ethereum } from '@shapeshiftoss/chain-adapters';
 import { KnownChainIds } from '@shapeshiftoss/types';
 import Web3 from 'web3';
-import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, TradeQuote, TradeResult, TradeTxs } from '../../api';
+import { ApprovalNeededInput, ApprovalNeededOutput, ApproveAmountInput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, TradeQuote, TradeResult, TradeTxs } from '../../api';
 import { CowTrade } from './types';
 export declare type CowSwapperDeps = {
     apiUrl: string;
@@ -21,7 +21,7 @@ export declare class CowSwapper implements Swapper<KnownChainIds.EthereumMainnet
     executeTrade(args: ExecuteTradeInput<KnownChainIds.EthereumMainnet>): Promise<TradeResult>;
     approvalNeeded(args: ApprovalNeededInput<KnownChainIds.EthereumMainnet>): Promise<ApprovalNeededOutput>;
     approveInfinite(args: ApproveInfiniteInput<KnownChainIds.EthereumMainnet>): Promise<string>;
-    approveAmount(): Promise<string>;
+    approveAmount(args: ApproveAmountInput<KnownChainIds.EthereumMainnet>): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];
     filterAssetIdsBySellable(assetIds: AssetId[]): AssetId[];
     getTradeTxs(args: TradeResult): Promise<TradeTxs>;

package/dist/swappers/cow/CowSwapper.js

@@ -19,7 +19,7 @@ const caip_1 = require("@shapeshiftoss/caip");
 const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../api");
 const cowApprovalNeeded_1 = require("./cowApprovalNeeded/cowApprovalNeeded");
-const cowApproveInfinite_1 = require("./cowApproveInfinite/cowApproveInfinite");
+const cowApprove_1 = require("./cowApprove/cowApprove");
 const cowBuildTrade_1 = require("./cowBuildTrade/cowBuildTrade");
 const cowExecuteTrade_1 = require("./cowExecuteTrade/cowExecuteTrade");
 const cowGetTradeTxs_1 = require("./cowGetTradeTxs/cowGetTradeTxs");
@@ -50,12 +50,10 @@ class CowSwapper {
         return (0, cowApprovalNeeded_1.cowApprovalNeeded)(this.deps, args);
     }
     async approveInfinite(args) {
-        return (0, cowApproveInfinite_1.cowApproveInfinite)(this.deps, args);
+        return (0, cowApprove_1.cowApproveInfinite)(this.deps, args);
     }
-    async approveAmount() {
-        throw new api_1.SwapError('CowSwapper: approveAmount unimplemented', {
-            code: api_1.SwapErrorTypes.RESPONSE_ERROR,
-        });
+    async approveAmount(args) {
+        return (0, cowApprove_1.cowApproveAmount)(this.deps, args);
     }
     filterBuyAssetsBySellAssetId(args) {
         const { assetIds = [], sellAssetId } = args;

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

@@ -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/{cowApproveInfinite/cowApproveInfinite.d.ts → cowApprove/cowApprove.d.ts}

@@ -1,4 +1,5 @@
 import { KnownChainIds } from '@shapeshiftoss/types';
-import { ApproveInfiniteInput } from '../../../api';
+import { ApproveAmountInput, ApproveInfiniteInput } from '../../../api';
 import { CowSwapperDeps } from '../CowSwapper';
 export declare function cowApproveInfinite({ adapter, web3 }: CowSwapperDeps, { quote, wallet }: ApproveInfiniteInput<KnownChainIds.EthereumMainnet>): Promise<string>;
+export declare function cowApproveAmount({ adapter, web3 }: CowSwapperDeps, { quote, wallet, amount }: ApproveAmountInput<KnownChainIds.EthereumMainnet>): Promise<string>;

package/dist/swappers/cow/{cowApproveInfinite/cowApproveInfinite.js → cowApprove/cowApprove.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cowApproveInfinite = void 0;
+exports.cowApproveAmount = exports.cowApproveInfinite = void 0;
 const api_1 = require("../../../api");
 const erc20_abi_1 = require("../../utils/abi/erc20-abi");
 const helpers_1 = require("../../utils/helpers/helpers");
@@ -29,3 +29,28 @@ async function cowApproveInfinite({ adapter, web3 }, { quote, wallet }) {
     }
 }
 exports.cowApproveInfinite = cowApproveInfinite;
+async function cowApproveAmount({ adapter, web3 }, { quote, wallet, amount }) {
+    try {
+        const approvalAmount = amount !== null && amount !== void 0 ? amount : quote.sellAmount;
+        const allowanceGrantRequired = await (0, helpers_1.grantAllowance)({
+            quote: {
+                ...quote,
+                sellAmount: approvalAmount,
+            },
+            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('[cowApproveAmount]', {
+            cause: e,
+            code: api_1.SwapErrorTypes.APPROVE_AMOUNT_FAILED,
+        });
+    }
+}
+exports.cowApproveAmount = cowApproveAmount;

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

@@ -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/zrx/zrxApprovalNeeded/zrxApprovalNeeded.js

@@ -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

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