@shapeshiftoss/swapper 6.3.0 → 7.2.0

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

@@ -1,13 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEthTxFees = void 0;
+const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../../../api");
 const bignumber_1 = require("../../../../utils/bignumber");
 const constants_1 = require("../../../../utils/constants");
 const estimateTradeFee_1 = require("../../estimateTradeFee/estimateTradeFee");
 const getEthTxFees = async ({ deps, data, router, buyAsset, sellAmount, adapterManager, receiveAddress, sellAssetReference }) => {
     try {
-        const adapter = adapterManager.byChainId('eip155:1');
+        const adapter = adapterManager.get(types_1.KnownChainIds.EthereumMainnet);
+        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,

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

@@ -1,7 +1,40 @@
+import { ethereum } from '@shapeshiftoss/chain-adapters';
+import { HDWallet } from '@shapeshiftoss/hdwallet-core';
+import { Asset } from '@shapeshiftoss/types';
+import BigNumber from 'bignumber.js';
+import Web3 from 'web3';
+import { AbiItem } from 'web3-utils';
+import { TradeQuote } from '../../../api';
 import { BN } from '../bignumber';
+export declare type GetAllowanceRequiredArgs = {
+    receiveAddress: string;
+    allowanceContract: string;
+    sellAsset: Asset;
+    sellAmount: string;
+    web3: Web3;
+    erc20AllowanceAbi: AbiItem[];
+};
+export declare type GetERC20AllowanceArgs = {
+    erc20AllowanceAbi: AbiItem[];
+    web3: Web3;
+    sellAssetErc20Address: string;
+    ownerAddress: string;
+    spenderAddress: string;
+};
+declare type GrantAllowanceArgs = {
+    quote: TradeQuote<'eip155:1'>;
+    wallet: HDWallet;
+    adapter: ethereum.ChainAdapter;
+    erc20Abi: AbiItem[];
+    web3: Web3;
+};
+export declare const getERC20Allowance: ({ erc20AllowanceAbi, web3, sellAssetErc20Address, ownerAddress, spenderAddress }: GetERC20AllowanceArgs) => Promise<any>;
+export declare const getAllowanceRequired: ({ receiveAddress, allowanceContract, sellAsset, sellAmount, web3, erc20AllowanceAbi }: GetAllowanceRequiredArgs) => Promise<BigNumber>;
+export declare const grantAllowance: ({ quote, wallet, adapter, erc20Abi, web3 }: GrantAllowanceArgs) => Promise<string>;
 /**
  * This function keeps 17 significant digits, so even if we try to trade 1 Billion of an
  * ETH or ERC20, we still keep 7 decimal places.
  * @param amount
  */
 export declare const normalizeAmount: (amount: string | number | BN) => string;
+export {};

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

@@ -1,7 +1,104 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeAmount = void 0;
+exports.normalizeAmount = exports.grantAllowance = exports.getAllowanceRequired = exports.getERC20Allowance = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const web3_utils_1 = require("web3-utils");
+const api_1 = require("../../../api");
 const bignumber_1 = require("../bignumber");
+const getERC20Allowance = async ({ erc20AllowanceAbi, web3, sellAssetErc20Address, ownerAddress, spenderAddress }) => {
+    const erc20Contract = new web3.eth.Contract(erc20AllowanceAbi, sellAssetErc20Address);
+    return erc20Contract.methods.allowance(ownerAddress, spenderAddress).call();
+};
+exports.getERC20Allowance = getERC20Allowance;
+const getAllowanceRequired = async ({ receiveAddress, allowanceContract, sellAsset, sellAmount, web3, erc20AllowanceAbi }) => {
+    try {
+        if (sellAsset.assetId === 'eip155:1/slip44:60') {
+            return (0, bignumber_1.bn)(0);
+        }
+        const ownerAddress = receiveAddress;
+        const spenderAddress = allowanceContract;
+        const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(sellAsset.assetId);
+        const allowanceOnChain = await (0, exports.getERC20Allowance)({
+            web3,
+            erc20AllowanceAbi,
+            ownerAddress,
+            spenderAddress,
+            sellAssetErc20Address
+        });
+        if (allowanceOnChain === '0')
+            return (0, bignumber_1.bnOrZero)(sellAmount);
+        if (!allowanceOnChain) {
+            throw new api_1.SwapError(`[getAllowanceRequired] - No allowance data`, {
+                details: { allowanceContract, receiveAddress },
+                code: api_1.SwapErrorTypes.RESPONSE_ERROR
+            });
+        }
+        const allowanceRequired = (0, bignumber_1.bnOrZero)(sellAmount).minus(allowanceOnChain);
+        return allowanceRequired.lt(0) ? (0, bignumber_1.bn)(0) : allowanceRequired;
+    }
+    catch (e) {
+        if (e instanceof api_1.SwapError)
+            throw e;
+        throw new api_1.SwapError('[getAllowanceRequired]', {
+            cause: e,
+            code: api_1.SwapErrorTypes.ALLOWANCE_REQUIRED_FAILED
+        });
+    }
+};
+exports.getAllowanceRequired = getAllowanceRequired;
+const grantAllowance = async ({ quote, wallet, adapter, erc20Abi, web3 }) => {
+    var _a, _b, _c, _d, _e;
+    try {
+        const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(quote.sellAsset.assetId);
+        const erc20Contract = new web3.eth.Contract(erc20Abi, sellAssetErc20Address);
+        const approveTx = erc20Contract.methods
+            .approve(quote.allowanceContract, quote.sellAmount)
+            .encodeABI();
+        const accountNumber = quote.sellAssetAccountNumber;
+        const bip44Params = adapter.buildBIP44Params({ accountNumber });
+        const { txToSign } = await adapter.buildSendTransaction({
+            wallet,
+            to: sellAssetErc20Address,
+            bip44Params,
+            value: '0',
+            chainSpecific: {
+                erc20ContractAddress: sellAssetErc20Address,
+                gasPrice: (0, web3_utils_1.numberToHex)(((_b = (_a = quote.feeData) === null || _a === void 0 ? void 0 : _a.chainSpecific) === null || _b === void 0 ? void 0 : _b.gasPrice) || 0),
+                gasLimit: (0, web3_utils_1.numberToHex)(((_d = (_c = quote.feeData) === null || _c === void 0 ? void 0 : _c.chainSpecific) === null || _d === void 0 ? void 0 : _d.estimatedGas) || 0)
+            }
+        });
+        const grantAllowanceTxToSign = {
+            ...txToSign,
+            data: approveTx
+        };
+        if (wallet.supportsOfflineSigning()) {
+            const signedTx = await adapter.signTransaction({ txToSign: grantAllowanceTxToSign, wallet });
+            const broadcastedTxId = await adapter.broadcastTransaction(signedTx);
+            return broadcastedTxId;
+        }
+        else if (wallet.supportsBroadcast() && adapter.signAndBroadcastTransaction) {
+            const broadcastedTxId = await ((_e = adapter.signAndBroadcastTransaction) === null || _e === void 0 ? void 0 : _e.call(adapter, {
+                txToSign: grantAllowanceTxToSign,
+                wallet
+            }));
+            return broadcastedTxId;
+        }
+        else {
+            throw new api_1.SwapError('[grantAllowance] - invalid HDWallet config', {
+                code: api_1.SwapErrorTypes.SIGN_AND_BROADCAST_FAILED
+            });
+        }
+    }
+    catch (e) {
+        if (e instanceof api_1.SwapError)
+            throw e;
+        throw new api_1.SwapError('[grantAllowance]', {
+            cause: e,
+            code: api_1.SwapErrorTypes.GRANT_ALLOWANCE_FAILED
+        });
+    }
+};
+exports.grantAllowance = grantAllowance;
 /**
  * This function keeps 17 significant digits, so even if we try to trade 1 Billion of an
  * ETH or ERC20, we still keep 7 decimal places.

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

@@ -1,13 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UNSUPPORTED = exports.ETH = exports.WBTC = exports.FOX = exports.WETH = exports.BTC = void 0;
-const types_1 = require("@shapeshiftoss/types");
 exports.BTC = {
     assetId: 'bip122:000000000019d6689c085ae165831e93/slip44:0',
     chainId: 'bip122:000000000019d6689c085ae165831e93',
     name: 'bitcoin',
-    chain: types_1.ChainTypes.Bitcoin,
-    network: types_1.NetworkTypes.MAINNET,
     precision: 8,
     color: '#FFFFFF',
     icon: 'https://assets.coincap.io/assets/icons/btc@2x.png',
@@ -20,8 +17,6 @@ exports.WETH = {
     assetId: 'eip155:1/erc20:0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
     chainId: 'eip155:1',
     name: 'WETH',
-    chain: types_1.ChainTypes.Ethereum,
-    network: types_1.NetworkTypes.MAINNET,
     precision: 18,
     color: '#FFFFFF',
     icon: 'https://assets.coingecko.com/coins/images/2518/thumb/weth.png?1628852295',
@@ -34,8 +29,6 @@ exports.FOX = {
     assetId: 'eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d',
     chainId: 'eip155:1',
     name: 'FOX',
-    chain: types_1.ChainTypes.Ethereum,
-    network: types_1.NetworkTypes.MAINNET,
     precision: 18,
     color: '#FFFFFF',
     icon: 'https://assets.coincap.io/assets/icons/fox@2x.png',
@@ -48,21 +41,17 @@ exports.WBTC = {
     assetId: 'eip155:1/erc20:0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
     chainId: 'eip155:1',
     color: '#FFFFFF',
-    chain: types_1.ChainTypes.Ethereum,
     explorer: 'https://etherscan.io',
     explorerAddressLink: 'https://etherscan.io/address/',
     explorerTxLink: 'https://etherscan.io/tx/',
     icon: 'https://rawcdn.githack.com/trustwallet/assets/master/blockchains/ethereum/assets/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599/logo.png',
     name: 'Wrapped Bitcoin',
-    network: types_1.NetworkTypes.MAINNET,
     precision: 8,
     symbol: 'WBTC'
 };
 exports.ETH = {
     assetId: 'eip155:1/slip44:60',
     chainId: 'eip155:1',
-    chain: types_1.ChainTypes.Ethereum,
-    network: types_1.NetworkTypes.MAINNET,
     symbol: 'ETH',
     name: 'Ethereum',
     precision: 18,
@@ -75,8 +64,6 @@ exports.ETH = {
 exports.UNSUPPORTED = {
     assetId: 'eip155:1/slip44:420',
     chainId: 'eip155:1',
-    chain: types_1.ChainTypes.Ethereum,
-    network: types_1.NetworkTypes.MAINNET,
     symbol: 'ETH',
     name: 'Ethereum',
     precision: 18,

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

@@ -0,0 +1,6 @@
+import { ethereum } from '@shapeshiftoss/chain-adapters';
+import Web3 from 'web3';
+export declare const setupDeps: () => {
+    web3: Web3;
+    adapter: ethereum.ChainAdapter;
+};

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

@@ -0,0 +1,48 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupDeps = void 0;
+const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
+const unchained = __importStar(require("@shapeshiftoss/unchained-client"));
+const web3_1 = __importDefault(require("web3"));
+jest.mock('@shapeshiftoss/chain-adapters');
+const setupDeps = () => {
+    const ethChainAdapter = new chain_adapters_1.ethereum.ChainAdapter({
+        providers: {
+            ws: new unchained.ws.Client('wss://dev-api.ethereum.shapeshift.com'),
+            http: new unchained.ethereum.V1Api(new unchained.ethereum.Configuration({
+                basePath: 'https://dev-api.ethereum.shapeshift.com'
+            }))
+        },
+        rpcUrl: 'https://mainnet.infura.io/v3/d734c7eebcdf400185d7eb67322a7e57'
+    });
+    const ethNodeUrl = 'http://localhost:1000';
+    const web3Provider = new web3_1.default.providers.HttpProvider(ethNodeUrl);
+    return { web3: new web3_1.default(web3Provider), adapter: ethChainAdapter };
+};
+exports.setupDeps = setupDeps;

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

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

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

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupQuote = void 0;
+const assets_1 = require("./assets");
+const setupQuote = () => {
+    const sellAsset = { ...assets_1.FOX };
+    const buyAsset = { ...assets_1.WETH };
+    const tradeQuote = {
+        buyAmount: '',
+        sellAmount: '1000000000000000000',
+        sellAsset,
+        buyAsset,
+        allowanceContract: 'allowanceContractAddress',
+        sellAssetAccountNumber: 0,
+        minimum: '0',
+        maximum: '999999999999',
+        feeData: { fee: '0', tradeFee: '0', chainSpecific: {} },
+        rate: '1',
+        sources: []
+    };
+    const quoteInput = {
+        sellAmount: '1000000000000000000',
+        sellAsset,
+        buyAsset,
+        sellAssetAccountNumber: 0,
+        sendMax: false
+    };
+    return { quoteInput, tradeQuote, buyAsset, sellAsset };
+};
+exports.setupQuote = setupQuote;

package/dist/swappers/zrx/ZrxApprovalNeeded/ZrxApprovalNeeded.d.ts

@@ -1,3 +1,3 @@
 import { ApprovalNeededInput, ApprovalNeededOutput } from '../../../api';
 import { ZrxSwapperDeps } from '../ZrxSwapper';
-export declare function ZrxApprovalNeeded({ adapterManager, web3 }: ZrxSwapperDeps, { quote, wallet }: ApprovalNeededInput<'eip155:1'>): Promise<ApprovalNeededOutput>;
+export declare function ZrxApprovalNeeded({ adapter, web3 }: ZrxSwapperDeps, { quote, wallet }: ApprovalNeededInput<'eip155:1'>): Promise<ApprovalNeededOutput>;

package/dist/swappers/zrx/ZrxApprovalNeeded/ZrxApprovalNeeded.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZrxApprovalNeeded = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../api");
+const erc20Allowance_abi_1 = require("../../utils/abi/erc20Allowance-abi");
 const bignumber_1 = require("../../utils/bignumber");
-const erc20Allowance_abi_1 = require("../utils/abi/erc20Allowance-abi");
-const helpers_1 = require("../utils/helpers/helpers");
-async function ZrxApprovalNeeded({ adapterManager, web3 }, { quote, wallet }) {
+const helpers_1 = require("../../utils/helpers/helpers");
+async function ZrxApprovalNeeded({ adapter, web3 }, { quote, wallet }) {
     var _a;
     const { sellAsset } = quote;
     const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(sellAsset.assetId);
@@ -22,7 +22,6 @@ async function ZrxApprovalNeeded({ adapterManager, web3 }, { quote, wallet }) {
             return { approvalNeeded: false };
         }
         const accountNumber = quote.sellAssetAccountNumber;
-        const adapter = await adapterManager.byChainId(sellAsset.chainId);
         const bip44Params = adapter.buildBIP44Params({ accountNumber });
         const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
         if (!quote.allowanceContract) {

package/dist/swappers/zrx/ZrxApproveInfinite/ZrxApproveInfinite.d.ts

@@ -1,4 +1,3 @@
-import { SupportedChainIds } from '@shapeshiftoss/types';
 import { ApproveInfiniteInput } from '../../../api';
 import { ZrxSwapperDeps } from '../ZrxSwapper';
-export declare function ZrxApproveInfinite({ adapterManager, web3 }: ZrxSwapperDeps, { quote, wallet }: ApproveInfiniteInput<SupportedChainIds>): Promise<string>;
+export declare function ZrxApproveInfinite({ adapter, web3 }: ZrxSwapperDeps, { quote, wallet }: ApproveInfiniteInput<'eip155:1'>): Promise<string>;

package/dist/swappers/zrx/ZrxApproveInfinite/ZrxApproveInfinite.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZrxApproveInfinite = void 0;
 const api_1 = require("../../../api");
-const erc20_abi_1 = require("../utils/abi/erc20-abi");
+const erc20_abi_1 = require("../../utils/abi/erc20-abi");
+const helpers_1 = require("../../utils/helpers/helpers");
 const constants_1 = require("../utils/constants");
-const helpers_1 = require("../utils/helpers/helpers");
-async function ZrxApproveInfinite({ adapterManager, web3 }, { quote, wallet }) {
+async function ZrxApproveInfinite({ adapter, web3 }, { quote, wallet }) {
     try {
         const allowanceGrantRequired = await (0, helpers_1.grantAllowance)({
             quote: {
@@ -13,7 +13,7 @@ async function ZrxApproveInfinite({ adapterManager, web3 }, { quote, wallet }) {
                 sellAmount: constants_1.MAX_ALLOWANCE
             },
             wallet,
-            adapterManager,
+            adapter,
             erc20Abi: erc20_abi_1.erc20Abi,
             web3
         });

package/dist/swappers/zrx/ZrxSwapper.d.ts

@@ -1,24 +1,24 @@
 import { AssetId } from '@shapeshiftoss/caip';
-import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
-import { Asset, SupportedChainIds } from '@shapeshiftoss/types';
+import { ethereum } from '@shapeshiftoss/chain-adapters';
+import { Asset } from '@shapeshiftoss/types';
 import Web3 from 'web3';
 import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, TradeQuote, TradeResult, TradeTxs, ZrxTrade } from '../../api';
 export declare type ZrxSwapperDeps = {
-    adapterManager: ChainAdapterManager;
+    adapter: ethereum.ChainAdapter;
     web3: Web3;
 };
-export declare class ZrxSwapper implements Swapper {
+export declare class ZrxSwapper implements Swapper<'eip155:1'> {
     static swapperName: string;
     deps: ZrxSwapperDeps;
     constructor(deps: ZrxSwapperDeps);
     initialize(): Promise<void>;
     getType(): SwapperType;
-    buildTrade(args: BuildTradeInput): Promise<ZrxTrade<SupportedChainIds>>;
-    getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<SupportedChainIds>>;
+    buildTrade(args: BuildTradeInput): Promise<ZrxTrade>;
+    getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<'eip155:1'>>;
     getUsdRate(input: Asset): Promise<string>;
     executeTrade(args: ExecuteTradeInput<'eip155:1'>): Promise<TradeResult>;
     approvalNeeded(args: ApprovalNeededInput<'eip155:1'>): Promise<ApprovalNeededOutput>;
-    approveInfinite(args: ApproveInfiniteInput<SupportedChainIds>): Promise<string>;
+    approveInfinite(args: ApproveInfiniteInput<'eip155:1'>): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];
     filterAssetIdsBySellable(assetIds?: AssetId[]): AssetId[];
     getTradeTxs(tradeResult: TradeResult): Promise<TradeTxs>;

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

@@ -1,34 +1,2 @@
-import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
-import { HDWallet } from '@shapeshiftoss/hdwallet-core';
-import { Asset, SupportedChainIds } from '@shapeshiftoss/types';
-import Web3 from 'web3';
-import { AbiItem } from 'web3-utils';
-import { TradeQuote } from '../../../../api';
-import { BN } from '../../../utils/bignumber';
-export declare type GetAllowanceRequiredArgs = {
-    receiveAddress: string;
-    allowanceContract: string;
-    sellAsset: Asset;
-    sellAmount: string;
-    web3: Web3;
-    erc20AllowanceAbi: AbiItem[];
-};
-export declare type GetERC20AllowanceArgs = {
-    erc20AllowanceAbi: AbiItem[];
-    web3: Web3;
-    sellAssetErc20Address: string;
-    ownerAddress: string;
-    spenderAddress: string;
-};
-declare type GrantAllowanceArgs = {
-    quote: TradeQuote<SupportedChainIds>;
-    wallet: HDWallet;
-    adapterManager: ChainAdapterManager;
-    erc20Abi: AbiItem[];
-    web3: Web3;
-};
-export declare const getERC20Allowance: ({ erc20AllowanceAbi, web3, sellAssetErc20Address, ownerAddress, spenderAddress }: GetERC20AllowanceArgs) => Promise<any>;
-export declare const getAllowanceRequired: ({ receiveAddress, allowanceContract, sellAsset, sellAmount, web3, erc20AllowanceAbi }: GetAllowanceRequiredArgs) => Promise<BN>;
+import { Asset } from '@shapeshiftoss/types';
 export declare const getUsdRate: (asset: Asset) => Promise<string>;
-export declare const grantAllowance: ({ quote, wallet, adapterManager, erc20Abi, web3 }: GrantAllowanceArgs) => Promise<string>;
-export {};

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

@@ -1,52 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.grantAllowance = exports.getUsdRate = exports.getAllowanceRequired = exports.getERC20Allowance = void 0;
+exports.getUsdRate = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
-const web3_utils_1 = require("web3-utils");
 const api_1 = require("../../../../api");
 const bignumber_1 = require("../../../utils/bignumber");
 const zrxService_1 = require("../zrxService");
-const getERC20Allowance = async ({ erc20AllowanceAbi, web3, sellAssetErc20Address, ownerAddress, spenderAddress }) => {
-    const erc20Contract = new web3.eth.Contract(erc20AllowanceAbi, sellAssetErc20Address);
-    return erc20Contract.methods.allowance(ownerAddress, spenderAddress).call();
-};
-exports.getERC20Allowance = getERC20Allowance;
-const getAllowanceRequired = async ({ receiveAddress, allowanceContract, sellAsset, sellAmount, web3, erc20AllowanceAbi }) => {
-    try {
-        if (sellAsset.assetId === 'eip155:1/slip44:60') {
-            return (0, bignumber_1.bn)(0);
-        }
-        const ownerAddress = receiveAddress;
-        const spenderAddress = allowanceContract;
-        const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(sellAsset.assetId);
-        const allowanceOnChain = await (0, exports.getERC20Allowance)({
-            web3,
-            erc20AllowanceAbi,
-            ownerAddress,
-            spenderAddress,
-            sellAssetErc20Address
-        });
-        if (allowanceOnChain === '0')
-            return (0, bignumber_1.bnOrZero)(sellAmount);
-        if (!allowanceOnChain) {
-            throw new api_1.SwapError(`[getAllowanceRequired] - No allowance data`, {
-                details: { allowanceContract, receiveAddress },
-                code: api_1.SwapErrorTypes.RESPONSE_ERROR
-            });
-        }
-        const allowanceRequired = (0, bignumber_1.bnOrZero)(sellAmount).minus(allowanceOnChain);
-        return allowanceRequired.lt(0) ? (0, bignumber_1.bn)(0) : allowanceRequired;
-    }
-    catch (e) {
-        if (e instanceof api_1.SwapError)
-            throw e;
-        throw new api_1.SwapError('[getAllowanceRequired]', {
-            cause: e,
-            code: api_1.SwapErrorTypes.ALLOWANCE_REQUIRED_FAILED
-        });
-    }
-};
-exports.getAllowanceRequired = getAllowanceRequired;
 const getUsdRate = async (asset) => {
     const { assetReference: erc20Address, assetNamespace } = (0, caip_1.fromAssetId)(asset.assetId);
     const { symbol } = asset;
@@ -78,57 +36,3 @@ const getUsdRate = async (asset) => {
     }
 };
 exports.getUsdRate = getUsdRate;
-const grantAllowance = async ({ quote, wallet, adapterManager, erc20Abi, web3 }) => {
-    var _a, _b, _c, _d, _e;
-    try {
-        const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(quote.sellAsset.assetId);
-        const adapter = await adapterManager.byChainId('eip155:1');
-        const erc20Contract = new web3.eth.Contract(erc20Abi, sellAssetErc20Address);
-        const approveTx = erc20Contract.methods
-            .approve(quote.allowanceContract, quote.sellAmount)
-            .encodeABI();
-        const accountNumber = quote.sellAssetAccountNumber;
-        const bip44Params = adapter.buildBIP44Params({ accountNumber });
-        const { txToSign } = await adapter.buildSendTransaction({
-            wallet,
-            to: sellAssetErc20Address,
-            bip44Params,
-            value: '0',
-            chainSpecific: {
-                erc20ContractAddress: sellAssetErc20Address,
-                gasPrice: (0, web3_utils_1.numberToHex)(((_b = (_a = quote.feeData) === null || _a === void 0 ? void 0 : _a.chainSpecific) === null || _b === void 0 ? void 0 : _b.gasPrice) || 0),
-                gasLimit: (0, web3_utils_1.numberToHex)(((_d = (_c = quote.feeData) === null || _c === void 0 ? void 0 : _c.chainSpecific) === null || _d === void 0 ? void 0 : _d.estimatedGas) || 0)
-            }
-        });
-        const grantAllowanceTxToSign = {
-            ...txToSign,
-            data: approveTx
-        };
-        if (wallet.supportsOfflineSigning()) {
-            const signedTx = await adapter.signTransaction({ txToSign: grantAllowanceTxToSign, wallet });
-            const broadcastedTxId = await adapter.broadcastTransaction(signedTx);
-            return broadcastedTxId;
-        }
-        else if (wallet.supportsBroadcast() && adapter.signAndBroadcastTransaction) {
-            const broadcastedTxId = await ((_e = adapter.signAndBroadcastTransaction) === null || _e === void 0 ? void 0 : _e.call(adapter, {
-                txToSign: grantAllowanceTxToSign,
-                wallet
-            }));
-            return broadcastedTxId;
-        }
-        else {
-            throw new api_1.SwapError('[grantAllowance] - invalid HDWallet config', {
-                code: api_1.SwapErrorTypes.SIGN_AND_BROADCAST_FAILED
-            });
-        }
-    }
-    catch (e) {
-        if (e instanceof api_1.SwapError)
-            throw e;
-        throw new api_1.SwapError('[grantAllowance]', {
-            cause: e,
-            code: api_1.SwapErrorTypes.GRANT_ALLOWANCE_FAILED
-        });
-    }
-};
-exports.grantAllowance = grantAllowance;

package/dist/swappers/zrx/utils/test-data/{setupSwapQuote.d.ts → setupZrxSwapQuote.d.ts}

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

package/dist/swappers/zrx/utils/test-data/{setupSwapQuote.js → setupZrxSwapQuote.js}

@@ -1,33 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupExecuteTrade = exports.setupBuildTrade = exports.setupZrxTradeQuoteResponse = exports.setupQuote = void 0;
+exports.setupExecuteTrade = exports.setupBuildTrade = exports.setupZrxTradeQuoteResponse = void 0;
 const assets_1 = require("../../../utils/test-data/assets");
-const setupQuote = () => {
-    const sellAsset = { ...assets_1.FOX };
-    const buyAsset = { ...assets_1.WETH };
-    const tradeQuote = {
-        buyAmount: '',
-        sellAmount: '1000000000000000000',
-        sellAsset,
-        buyAsset,
-        allowanceContract: 'allowanceContractAddress',
-        sellAssetAccountNumber: 0,
-        minimum: '0',
-        maximum: '999999999999',
-        feeData: { fee: '0', tradeFee: '0', chainSpecific: {} },
-        rate: '1',
-        sources: []
-    };
-    const quoteInput = {
-        sellAmount: '1000000000000000000',
-        sellAsset,
-        buyAsset,
-        sellAssetAccountNumber: 0,
-        sendMax: false
-    };
-    return { quoteInput, tradeQuote, buyAsset, sellAsset };
-};
-exports.setupQuote = setupQuote;
 const setupZrxTradeQuoteResponse = () => {
     const sellAsset = { ...assets_1.FOX };
     const buyAsset = { ...assets_1.WETH };

package/dist/swappers/zrx/zrxBuildTrade/zrxBuildTrade.d.ts

@@ -1,4 +1,3 @@
-import { SupportedChainIds } from '@shapeshiftoss/types';
 import { BuildTradeInput, ZrxTrade } from '../../..';
 import { ZrxSwapperDeps } from '../ZrxSwapper';
-export declare function zrxBuildTrade({ adapterManager, web3 }: ZrxSwapperDeps, input: BuildTradeInput): Promise<ZrxTrade<SupportedChainIds>>;
+export declare function zrxBuildTrade({ adapter, web3 }: ZrxSwapperDeps, input: BuildTradeInput): Promise<ZrxTrade>;