@shapeshiftoss/swapper 5.11.0 → 6.0.0

package/dist/api.d.ts

@@ -71,13 +71,13 @@ interface TradeBase<C extends SupportedChainIds> {
     sellAmount: string;
     feeData: QuoteFeeData<C>;
     rate: string;
-    allowanceContract: string;
     sources: Array<SwapSource>;
     buyAsset: Asset;
     sellAsset: Asset;
     sellAssetAccountId: string;
 }
 export interface TradeQuote<C extends SupportedChainIds> extends TradeBase<C> {
+    allowanceContract: string;
     minimum: string;
     maximum: string;
 }

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

@@ -1,13 +1,18 @@
 import { AssetId } from '@shapeshiftoss/caip';
 import { Asset, SupportedChainIds } from '@shapeshiftoss/types';
 import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
+export declare type CowSwapperDeps = {
+    apiUrl: string;
+};
 export declare class CowSwapper implements Swapper {
     static swapperName: string;
+    deps: CowSwapperDeps;
+    constructor(deps: CowSwapperDeps);
     initialize(): Promise<void>;
     getType(): SwapperType;
     buildTrade(args: BuildTradeInput): Promise<Trade<SupportedChainIds>>;
     getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<SupportedChainIds>>;
-    getUsdRate(input: Pick<Asset, 'symbol' | 'assetId'>): Promise<string>;
+    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/cow/CowSwapper.js

@@ -2,7 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CowSwapper = void 0;
 const api_1 = require("../../api");
+const helpers_1 = require("./utils/helpers/helpers");
 class CowSwapper {
+    constructor(deps) {
+        this.deps = deps;
+    }
     // eslint-disable-next-line @typescript-eslint/no-empty-function
     async initialize() { }
     getType() {
@@ -16,9 +20,8 @@ class CowSwapper {
         console.info(input);
         throw new Error('CowSwapper: getTradeQuote unimplemented');
     }
-    getUsdRate(input) {
-        console.info(input);
-        throw new Error('CowSwapper: getUsdRate unimplemented');
+    async getUsdRate(input) {
+        return (0, helpers_1.getUsdRate)(this.deps, input);
     }
     async executeTrade(args) {
         console.info(args);

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

@@ -0,0 +1,4 @@
+export declare type CowSwapPriceResponse = {
+    amount: string;
+    token: string;
+};

package/dist/swappers/cow/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/swappers/cow/utils/cowService.d.ts

@@ -0,0 +1 @@
+export declare const cowService: import("axios").AxiosInstance;

package/dist/swappers/cow/utils/cowService.js

@@ -0,0 +1,15 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cowService = void 0;
+const axios_1 = __importDefault(require("axios"));
+const axiosConfig = {
+    timeout: 10000,
+    headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json'
+    }
+};
+exports.cowService = axios_1.default.create(axiosConfig);

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

@@ -0,0 +1,3 @@
+import { Asset } from '@shapeshiftoss/types';
+import { CowSwapperDeps } from '../../CowSwapper';
+export declare const getUsdRate: ({ apiUrl }: CowSwapperDeps, input: Asset) => Promise<string>;

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

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getUsdRate = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const api_1 = require("../../../../api");
+const bignumber_1 = require("../../../utils/bignumber");
+const cowService_1 = require("../cowService");
+const USDC_CONTRACT_ADDRESS = '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48';
+const USDC_ASSET_PRECISION = 6;
+const getUsdRate = async ({ apiUrl }, input) => {
+    const asset = input;
+    const { assetReference: erc20Address, assetNamespace } = (0, caip_1.fromAssetId)(asset.assetId);
+    if (assetNamespace !== 'erc20') {
+        throw new api_1.SwapError('[getUsdRate] - unsupported asset namespace', {
+            code: api_1.SwapErrorTypes.USD_RATE_FAILED,
+            details: { assetNamespace }
+        });
+    }
+    const buyAmountInDollars = 1000;
+    const buyAmount = (0, bignumber_1.bn)(buyAmountInDollars).times((0, bignumber_1.bn)(10).exponentiatedBy(USDC_ASSET_PRECISION));
+    try {
+        // rate is imprecise for low $ values, hence asking for $1000
+        // cowSwap api used : markets/{baseToken}-{quoteToken}/{kind}/{amount}
+        // It returns the estimated amount in quoteToken for either buying or selling amount of baseToken.
+        const rateResponse = await cowService_1.cowService.get(`${apiUrl}/v1/markets/${USDC_CONTRACT_ADDRESS}-${erc20Address}/buy/${buyAmount}`);
+        const tokenAmount = (0, bignumber_1.bnOrZero)(rateResponse.data.amount).div((0, bignumber_1.bn)(10).exponentiatedBy(asset.precision));
+        if (!tokenAmount.gt(0))
+            throw new api_1.SwapError('[getUsdRate] - Failed to get token amount', {
+                code: api_1.SwapErrorTypes.RESPONSE_ERROR
+            });
+        // dividing $1000 by amount of token received
+        return (0, bignumber_1.bn)(buyAmountInDollars).dividedBy(tokenAmount).toString();
+    }
+    catch (e) {
+        if (e instanceof api_1.SwapError)
+            throw e;
+        throw new api_1.SwapError('[getUsdRate]', {
+            cause: e,
+            code: api_1.SwapErrorTypes.USD_RATE_FAILED
+        });
+    }
+};
+exports.getUsdRate = getUsdRate;

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.estimateTradeFee = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../../api");
-const bignumber_1 = require("../../../zrx/utils/bignumber");
+const bignumber_1 = require("../../../utils/bignumber");
 const thorService_1 = require("../thorService");
 const gweiGasPrecision = 9;
 // https://docs.thorchain.org/how-it-works/fees#outbound-fee

package/dist/swappers/thorchain/utils/ethereum/makeTradeTx.js

@@ -7,7 +7,7 @@ exports.makeTradeTx = exports.toBaseUnit = exports.fromBaseUnit = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const api_1 = require("../../../../api");
-const bignumber_1 = require("../../../zrx/utils/bignumber");
+const bignumber_1 = require("../../../utils/bignumber");
 const getPriceRatio_1 = require("../getPriceRatio/getPriceRatio");
 const makeSwapMemo_1 = require("../makeSwapMemo/makeSwapMemo");
 const thorService_1 = require("../thorService");

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPriceRatio = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../../api");
-const bignumber_1 = require("../../../zrx/utils/bignumber");
+const bignumber_1 = require("../../../utils/bignumber");
 const thorService_1 = require("../thorService");
 const getPriceRatio = async (deps, input) => {
     var _a, _b;

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

@@ -2,3 +2,5 @@ import { Asset } from '@shapeshiftoss/types';
 export declare const BTC: Asset;
 export declare const WETH: Asset;
 export declare const FOX: Asset;
+export declare const WBTC: Asset;
+export declare const ETH: Asset;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FOX = exports.WETH = exports.BTC = void 0;
+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',
@@ -44,3 +44,31 @@ exports.FOX = {
     explorerAddressLink: 'https://etherscan.io/address/',
     symbol: 'FOX'
 };
+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,
+    color: '#FFFFFF',
+    icon: 'https://assets.coincap.io/assets/icons/eth@2x.png',
+    explorer: 'https://etherscan.io',
+    explorerTxLink: 'https://etherscan.io/tx/',
+    explorerAddressLink: 'https://etherscan.io/address/'
+};

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZrxApprovalNeeded = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../api");
+const bignumber_1 = require("../../utils/bignumber");
 const erc20Allowance_abi_1 = require("../utils/abi/erc20Allowance-abi");
-const bignumber_1 = require("../utils/bignumber");
 const helpers_1 = require("../utils/helpers/helpers");
 async function ZrxApprovalNeeded({ adapterManager, web3 }, { quote, wallet }) {
     var _a;

package/dist/swappers/zrx/getZrxMinMax/getZrxMinMax.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getZrxMinMax = void 0;
 const api_1 = require("../../../api");
-const bignumber_1 = require("../utils/bignumber");
+const bignumber_1 = require("../../utils/bignumber");
 const constants_1 = require("../utils/constants");
 const helpers_1 = require("../utils/helpers/helpers");
 const getZrxMinMax = async (sellAsset, buyAsset) => {

package/dist/swappers/zrx/getZrxTradeQuote/getZrxTradeQuote.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getZrxTradeQuote = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../api");
+const bignumber_1 = require("../../utils/bignumber");
 const getZrxMinMax_1 = require("../getZrxMinMax/getZrxMinMax");
-const bignumber_1 = require("../utils/bignumber");
 const constants_1 = require("../utils/constants");
 const helpers_1 = require("../utils/helpers/helpers");
 const zrxService_1 = require("../utils/zrxService");

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

@@ -4,7 +4,7 @@ exports.grantAllowance = exports.getUsdRate = exports.getAllowanceRequired = exp
 const caip_1 = require("@shapeshiftoss/caip");
 const web3_utils_1 = require("web3-utils");
 const api_1 = require("../../../../api");
-const bignumber_1 = require("../bignumber");
+const bignumber_1 = require("../../../utils/bignumber");
 const zrxService_1 = require("../zrxService");
 /**
  * Very large amounts like those found in ERC20s with a precision of 18 get converted

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

@@ -50,7 +50,6 @@ export declare const setupExecuteTrade: () => {
             tradeFee: string;
         };
         rate: string;
-        allowanceContract: string;
         sources: never[];
     };
     buyAsset: Asset;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupExecuteTrade = exports.setupBuildTrade = exports.setupZrxTradeQuoteResponse = exports.setupQuote = void 0;
-const assets_1 = require("./assets");
+const assets_1 = require("../../../utils/test-data/assets");
 const setupQuote = () => {
     const sellAsset = { ...assets_1.FOX };
     const buyAsset = { ...assets_1.WETH };
@@ -83,7 +83,6 @@ const setupExecuteTrade = () => {
         receiveAddress: '0x0',
         feeData: { fee: '0', chainSpecific: {}, tradeFee: '0' },
         rate: '0',
-        allowanceContract: '0x0',
         sources: []
     };
     return { executeTradeInput, buyAsset, sellAsset };

package/dist/swappers/zrx/zrxBuildTrade/zrxBuildTrade.js

@@ -27,9 +27,9 @@ exports.zrxBuildTrade = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const rax = __importStar(require("retry-axios"));
 const __1 = require("../../..");
+const bignumber_1 = require("../../utils/bignumber");
 const erc20Allowance_abi_1 = require("../utils/abi/erc20Allowance-abi");
 const applyAxiosRetry_1 = require("../utils/applyAxiosRetry");
-const bignumber_1 = require("../utils/bignumber");
 const constants_1 = require("../utils/constants");
 const helpers_1 = require("../utils/helpers/helpers");
 const zrxService_1 = require("../utils/zrxService");
@@ -107,7 +107,6 @@ async function zrxBuildTrade({ adapterManager, web3 }, input) {
             txData: data.data,
             sellAmount: data.sellAmount,
             buyAmount: data.buyAmount,
-            allowanceContract: data.allowanceTarget,
             sources: ((_a = data.sources) === null || _a === void 0 ? void 0 : _a.filter((s) => parseFloat(s.proportion) > 0)) || constants_1.DEFAULT_SOURCE
         };
         const allowanceRequired = await (0, helpers_1.getAllowanceRequired)({

package/dist/swappers/zrx/zrxExecuteTrade/zrxExecuteTrade.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.zrxExecuteTrade = void 0;
 const web3_utils_1 = require("web3-utils");
 const api_1 = require("../../../api");
-const bignumber_1 = require("../utils/bignumber");
+const bignumber_1 = require("../../utils/bignumber");
 async function zrxExecuteTrade({ adapterManager }, { trade, wallet }) {
     var _a, _b, _c, _d, _e, _f;
     const zrxTrade = trade;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "5.11.0",
+  "version": "6.0.0",
   "description": "TODO: description",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",
@@ -23,29 +23,29 @@
     "swapcli": "yarn build && node ./dist/swappercli.js"
   },
   "dependencies": {
-    "axios": "^0.26.0",
-    "bignumber.js": "^9.0.1",
+    "axios": "^0.26.1",
+    "bignumber.js": "^9.0.2",
     "lodash": "^4.17.21",
     "retry-axios": "^2.6.0",
-    "web3": "^1.6.1"
+    "web3": "^1.7.3"
   },
   "peerDependencies": {
     "@shapeshiftoss/asset-service": "^4.6.0",
-    "@shapeshiftoss/caip": "^5.2.1",
-    "@shapeshiftoss/chain-adapters": "^4.7.0",
-    "@shapeshiftoss/hdwallet-core": "1.20.0",
-    "@shapeshiftoss/types": "^4.4.0",
-    "@shapeshiftoss/errors": "^1.1.0"
+    "@shapeshiftoss/caip": "^5.2.2",
+    "@shapeshiftoss/chain-adapters": "4.8.0",
+    "@shapeshiftoss/errors": "^1.1.1",
+    "@shapeshiftoss/hdwallet-core": "^1.23.0",
+    "@shapeshiftoss/types": "^4.4.0"
   },
   "devDependencies": {
     "@shapeshiftoss/asset-service": "^4.6.0",
-    "@shapeshiftoss/caip": "^5.2.1",
-    "@shapeshiftoss/chain-adapters": "^4.7.0",
-    "@shapeshiftoss/hdwallet-core": "^1.20.0",
+    "@shapeshiftoss/caip": "^5.2.2",
+    "@shapeshiftoss/chain-adapters": "4.8.0",
+    "@shapeshiftoss/errors": "^1.1.1",
+    "@shapeshiftoss/hdwallet-core": "^1.23.0",
     "@shapeshiftoss/types": "^4.4.0",
-    "@shapeshiftoss/errors": "^1.1.0",
     "@types/readline-sync": "^1.4.4",
     "readline-sync": "^1.4.10",
-    "web3-utils": "^1.5.2"
+    "web3-utils": "^1.7.3"
   }
 }