@shapeshiftoss/swapper 5.8.0 → 5.10.0

package/dist/api.d.ts

@@ -123,8 +123,6 @@ export declare type GetMinMaxInput = {
 };
 export declare type ApprovalNeededOutput = {
     approvalNeeded: boolean;
-    gas?: string;
-    gasPrice?: string;
 };
 export declare enum SwapperType {
     Zrx = "0x",
@@ -172,11 +170,7 @@ export interface Swapper {
     /**
      * Get the usd rate from either the assets symbol or tokenId
      */
-    getUsdRate(input: Pick<Asset, 'symbol' | 'tokenId'>): Promise<string>;
-    /**
-     * Get the minimum and maximum trade value of the sellAsset and buyAsset
-     */
-    getMinMax(input: GetMinMaxInput): Promise<MinMaxOutput>;
+    getUsdRate(input: Asset): Promise<string>;
     /**
      * Execute a trade built with buildTrade by signing and broadcasting
      */

package/dist/swappercli.js

@@ -48,19 +48,8 @@ const main = async () => {
     `);
         return;
     }
-    const assetService = new asset_service_1.AssetService('');
-    await assetService.initialize();
-    const assets = assetService.byNetwork(types_1.NetworkTypes.MAINNET);
-    if (!assets) {
-        console.error('No assets found in asset service');
-        return;
-    }
-    const assetMap = assets.reduce((acc, val) => {
-        if (val) {
-            acc[val.symbol] = val;
-        }
-        return acc;
-    }, {});
+    const assetService = new asset_service_1.AssetService();
+    const assetMap = assetService.getAll();
     const sellAsset = assetMap[sellSymbol];
     const buyAsset = assetMap[buySymbol];
     if (!sellAsset) {

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

@@ -1,6 +1,6 @@
 import { AssetId } from '@shapeshiftoss/caip';
 import { Asset, SupportedChainIds } from '@shapeshiftoss/types';
-import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetMinMaxInput, GetTradeQuoteInput, MinMaxOutput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
+import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
 export declare class CowSwapper implements Swapper {
     static swapperName: string;
     initialize(): Promise<void>;
@@ -8,7 +8,6 @@ export declare class CowSwapper implements Swapper {
     buildTrade(args: BuildTradeInput): Promise<Trade<SupportedChainIds>>;
     getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<SupportedChainIds>>;
     getUsdRate(input: Pick<Asset, 'symbol' | 'assetId'>): Promise<string>;
-    getMinMax(input: GetMinMaxInput): Promise<MinMaxOutput>;
     executeTrade(args: ExecuteTradeInput<SupportedChainIds>): Promise<TradeResult>;
     approvalNeeded(args: ApprovalNeededInput<SupportedChainIds>): Promise<ApprovalNeededOutput>;
     approveInfinite(args: ApproveInfiniteInput<SupportedChainIds>): Promise<string>;

package/dist/swappers/cow/CowSwapper.js

@@ -20,10 +20,6 @@ class CowSwapper {
         console.info(input);
         throw new Error('CowSwapper: getUsdRate unimplemented');
     }
-    getMinMax(input) {
-        console.info(input);
-        throw new Error('CowSwapper: getMinMax unimplemented');
-    }
     async executeTrade(args) {
         console.info(args);
         throw new Error('CowSwapper: executeTrade unimplemented');

package/dist/swappers/test/TestSwapper.d.ts

@@ -1,6 +1,6 @@
 import { AssetId } from '@shapeshiftoss/caip';
 import { Asset, SupportedChainIds } from '@shapeshiftoss/types';
-import { ApprovalNeededOutput, BuyAssetBySellIdInput, GetMinMaxInput, MinMaxOutput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
+import { ApprovalNeededOutput, BuyAssetBySellIdInput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
 /**
  * Playground for testing different scenarios of multiple swappers in the manager.
  * Meant for local testing only
@@ -11,7 +11,6 @@ export declare class TestSwapper implements Swapper {
     getType(): SwapperType;
     constructor();
     getUsdRate(input: Pick<Asset, 'symbol' | 'assetId'>): Promise<string>;
-    getMinMax(input: GetMinMaxInput): Promise<MinMaxOutput>;
     approvalNeeded(): Promise<ApprovalNeededOutput>;
     approveInfinite(): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];

package/dist/swappers/test/TestSwapper.js

@@ -24,10 +24,6 @@ class TestSwapper {
         console.info(input);
         throw new Error('TestSwapper: getUsdRate unimplemented');
     }
-    getMinMax(input) {
-        console.info(input);
-        throw new Error('TestSwapper: getMinMax unimplemented');
-    }
     async approvalNeeded() {
         throw new Error('TestSwapper: approvalNeeded unimplemented');
     }

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

@@ -1,6 +1,6 @@
 import { AssetId } from '@shapeshiftoss/caip';
 import { Asset, SupportedChainIds } from '@shapeshiftoss/types';
-import { ApprovalNeededOutput, BuyAssetBySellIdInput, GetMinMaxInput, MinMaxOutput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
+import { ApprovalNeededOutput, BuyAssetBySellIdInput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
 import { ThorchainSwapperDeps } from './types';
 export declare class ThorchainSwapper implements Swapper {
     private supportedAssetIds;
@@ -9,7 +9,6 @@ export declare class ThorchainSwapper implements Swapper {
     initialize(): Promise<void>;
     getType(): SwapperType;
     getUsdRate(input: Pick<Asset, 'symbol' | 'assetId'>): Promise<string>;
-    getMinMax(input: GetMinMaxInput): Promise<MinMaxOutput>;
     approvalNeeded(): Promise<ApprovalNeededOutput>;
     approveInfinite(): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -35,10 +35,6 @@ class ThorchainSwapper {
     getUsdRate(input) {
         return (0, getUsdRate_1.getUsdRate)({ deps: this.deps, input });
     }
-    getMinMax(input) {
-        console.info(input);
-        throw new Error('ThorchainSwapper: getMinMax unimplemented');
-    }
     async approvalNeeded() {
         throw new Error('ThorchainSwapper: approvalNeeded unimplemented');
     }

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

@@ -5,10 +5,9 @@ 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 constants_1 = require("../utils/constants");
 const helpers_1 = require("../utils/helpers/helpers");
 async function ZrxApprovalNeeded({ adapterManager, web3 }, { quote, wallet }) {
-    var _a, _b;
+    var _a;
     const { sellAsset } = quote;
     const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(sellAsset.assetId);
     try {
@@ -46,9 +45,7 @@ async function ZrxApprovalNeeded({ adapterManager, web3 }, { quote, wallet }) {
                 details: { feeData: quote.feeData }
             });
         return {
-            approvalNeeded: allowanceOnChain.lte((0, bignumber_1.bnOrZero)(quote.sellAmount)),
-            gas: constants_1.APPROVAL_GAS_LIMIT,
-            gasPrice: (_b = quote.feeData.chainSpecific) === null || _b === void 0 ? void 0 : _b.gasPrice
+            approvalNeeded: allowanceOnChain.lte((0, bignumber_1.bnOrZero)(quote.sellAmount))
         };
     }
     catch (e) {

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

@@ -2,7 +2,7 @@ import { AssetId } from '@shapeshiftoss/caip';
 import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
 import { Asset, SupportedChainIds } from '@shapeshiftoss/types';
 import Web3 from 'web3';
-import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetMinMaxInput, GetTradeQuoteInput, MinMaxOutput, Swapper, SwapperType, TradeQuote, TradeResult, TradeTxs, ZrxTrade } from '../../api';
+import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, TradeQuote, TradeResult, TradeTxs, ZrxTrade } from '../../api';
 export declare type ZrxSwapperDeps = {
     adapterManager: ChainAdapterManager;
     web3: Web3;
@@ -15,8 +15,7 @@ export declare class ZrxSwapper implements Swapper {
     getType(): SwapperType;
     buildTrade(args: BuildTradeInput): Promise<ZrxTrade<SupportedChainIds>>;
     getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<SupportedChainIds>>;
-    getUsdRate(input: Pick<Asset, 'symbol' | 'assetId'>): Promise<string>;
-    getMinMax(input: GetMinMaxInput): Promise<MinMaxOutput>;
+    getUsdRate(input: Asset): Promise<string>;
     executeTrade(args: ExecuteTradeInput<SupportedChainIds>): Promise<TradeResult>;
     approvalNeeded(args: ApprovalNeededInput<SupportedChainIds>): Promise<ApprovalNeededOutput>;
     approveInfinite(args: ApproveInfiniteInput<SupportedChainIds>): Promise<string>;

package/dist/swappers/zrx/ZrxSwapper.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZrxSwapper = void 0;
 const api_1 = require("../../api");
-const getZrxMinMax_1 = require("./getZrxMinMax/getZrxMinMax");
 const getZrxTradeQuote_1 = require("./getZrxTradeQuote/getZrxTradeQuote");
 const blacklist_1 = require("./utils/blacklist");
 const helpers_1 = require("./utils/helpers/helpers");
@@ -29,9 +28,6 @@ class ZrxSwapper {
     async getUsdRate(input) {
         return (0, helpers_1.getUsdRate)(input);
     }
-    async getMinMax(input) {
-        return (0, getZrxMinMax_1.getZrxMinMax)(input.sellAsset, input.buyAsset);
-    }
     async executeTrade(args) {
         return (0, zrxExecuteTrade_1.zrxExecuteTrade)(this.deps, args);
     }

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

@@ -38,6 +38,6 @@ declare type GrantAllowanceArgs = {
 export declare const normalizeAmount: (amount: string | number | BigNumber) => string;
 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 getUsdRate: (input: Pick<Asset, 'symbol' | 'assetId'>) => Promise<string>;
+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

@@ -59,9 +59,9 @@ const getAllowanceRequired = async ({ receiveAddress, allowanceContract, sellAss
     }
 };
 exports.getAllowanceRequired = getAllowanceRequired;
-const getUsdRate = async (input) => {
-    const { symbol, assetId } = input;
-    const { assetReference: erc20Address, assetNamespace } = (0, caip_1.fromAssetId)(assetId);
+const getUsdRate = async (asset) => {
+    const { assetReference: erc20Address, assetNamespace } = (0, caip_1.fromAssetId)(asset.assetId);
+    const { symbol } = asset;
     try {
         const USDC_CONTRACT_ADDRESS = '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48';
         if ((erc20Address === null || erc20Address === void 0 ? void 0 : erc20Address.toLowerCase()) === USDC_CONTRACT_ADDRESS)

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

@@ -7,19 +7,13 @@ exports.BTC = {
     chainId: 'bip122:000000000019d6689c085ae165831e93',
     name: 'bitcoin',
     chain: types_1.ChainTypes.Bitcoin,
-    dataSource: types_1.AssetDataSource.CoinGecko,
     network: types_1.NetworkTypes.MAINNET,
     precision: 8,
-    slip44: 44,
-    contractType: 'erc20',
     color: '#FFFFFF',
-    secondaryColor: '#FFFFFF',
     icon: 'https://assets.coincap.io/assets/icons/btc@2x.png',
     explorer: 'https://live.blockcypher.com',
     explorerTxLink: 'https://live.blockcypher.com/btc/tx/',
     explorerAddressLink: 'https://live.blockcypher.com/btc/address/',
-    sendSupport: false,
-    receiveSupport: false,
     symbol: 'BTC'
 };
 exports.WETH = {
@@ -27,20 +21,13 @@ exports.WETH = {
     chainId: 'eip155:1',
     name: 'WETH',
     chain: types_1.ChainTypes.Ethereum,
-    dataSource: types_1.AssetDataSource.CoinGecko,
     network: types_1.NetworkTypes.MAINNET,
     precision: 18,
-    tokenId: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-    contractType: 'erc20',
     color: '#FFFFFF',
-    secondaryColor: '#FFFFFF',
     icon: 'https://assets.coingecko.com/coins/images/2518/thumb/weth.png?1628852295',
-    slip44: 60,
     explorer: 'https://etherscan.io',
     explorerTxLink: 'https://etherscan.io/tx/',
     explorerAddressLink: 'https://etherscan.io/address/',
-    sendSupport: true,
-    receiveSupport: true,
     symbol: 'WETH'
 };
 exports.FOX = {
@@ -48,19 +35,12 @@ exports.FOX = {
     chainId: 'eip155:1',
     name: 'FOX',
     chain: types_1.ChainTypes.Ethereum,
-    dataSource: types_1.AssetDataSource.CoinGecko,
     network: types_1.NetworkTypes.MAINNET,
     precision: 18,
-    tokenId: '0xc770eefad204b5180df6a14ee197d99d808ee52d',
-    contractType: 'erc20',
     color: '#FFFFFF',
-    secondaryColor: '#FFFFFF',
     icon: 'https://assets.coincap.io/assets/icons/fox@2x.png',
-    sendSupport: true,
-    slip44: 60,
     explorer: 'https://etherscan.io',
     explorerTxLink: 'https://etherscan.io/tx/',
     explorerAddressLink: 'https://etherscan.io/address/',
-    receiveSupport: true,
     symbol: 'FOX'
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "5.8.0",
+  "version": "5.10.0",
   "description": "TODO: description",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",
@@ -30,19 +30,19 @@
     "web3": "^1.6.1"
   },
   "peerDependencies": {
-    "@shapeshiftoss/asset-service": "^4.2.4",
+    "@shapeshiftoss/asset-service": "^4.6.0",
     "@shapeshiftoss/caip": "^5.2.1",
-    "@shapeshiftoss/chain-adapters": "^4.3.3",
+    "@shapeshiftoss/chain-adapters": "^4.7.0",
     "@shapeshiftoss/hdwallet-core": "1.20.0",
-    "@shapeshiftoss/types": "^4.3.1",
+    "@shapeshiftoss/types": "^4.4.0",
     "@shapeshiftoss/errors": "^1.1.0"
   },
   "devDependencies": {
-    "@shapeshiftoss/asset-service": "^4.2.4",
+    "@shapeshiftoss/asset-service": "^4.6.0",
     "@shapeshiftoss/caip": "^5.2.1",
-    "@shapeshiftoss/chain-adapters": "^4.3.3",
+    "@shapeshiftoss/chain-adapters": "^4.7.0",
     "@shapeshiftoss/hdwallet-core": "^1.20.0",
-    "@shapeshiftoss/types": "^4.3.1",
+    "@shapeshiftoss/types": "^4.4.0",
     "@shapeshiftoss/errors": "^1.1.0",
     "@types/readline-sync": "^1.4.4",
     "readline-sync": "^1.4.10",