@shapeshiftoss/swapper 3.0.0 → 3.0.3

package/dist/api.d.ts

@@ -32,10 +32,6 @@ export interface Swapper {
      * Get the usd rate from either the assets symbol or tokenId
      */
     getUsdRate(input: Pick<Asset, 'symbol' | 'tokenId'>): Promise<string>;
-    /**
-     * Get the default pair of the swapper
-     */
-    getDefaultPair(): [CAIP19, CAIP19];
     /**
      * Get the minimum and maximum trade value of the sellAsset and buyAsset
      */

package/dist/swappercli.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/swappercli.js

@@ -0,0 +1,111 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const asset_service_1 = require("@shapeshiftoss/asset-service");
+const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
+const hdwallet_native_1 = require("@shapeshiftoss/hdwallet-native");
+const types_1 = require("@shapeshiftoss/types");
+const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const dotenv_1 = __importDefault(require("dotenv"));
+const readline_sync_1 = __importDefault(require("readline-sync"));
+const web3_1 = __importDefault(require("web3"));
+const SwapperManager_1 = require("./manager/SwapperManager");
+const ZrxSwapper_1 = require("./swappers/zrx/ZrxSwapper");
+dotenv_1.default.config();
+const { UNCHAINED_HTTP_API = 'http://localhost:31300', UNCHAINED_WS_API = 'wss://localhost:31300', ETH_NODE_URL = 'http://localhost:3000', DEVICE_ID = 'device123', MNEMONIC = 'salon adapt foil saddle orient make page zero cheese marble test catalog' } = process.env;
+const toBaseUnit = (amount, precision) => {
+    return new bignumber_js_1.default(amount)
+        .multipliedBy(new bignumber_js_1.default(10).exponentiatedBy(new bignumber_js_1.default(precision)))
+        .toString();
+};
+const fromBaseUnit = (amount, precision) => {
+    return new bignumber_js_1.default(amount).times(new bignumber_js_1.default(10).exponentiatedBy(precision * -1)).toString();
+};
+const getWallet = async () => {
+    if (!MNEMONIC) {
+        throw new Error('Cannot init native wallet without mnemonic');
+    }
+    const nativeAdapterArgs = {
+        mnemonic: MNEMONIC,
+        deviceId: DEVICE_ID
+    };
+    const wallet = new hdwallet_native_1.NativeHDWallet(nativeAdapterArgs);
+    await wallet.initialize();
+    return wallet;
+};
+const main = async () => {
+    const [, , ...args] = process.argv;
+    const [sellSymbol, buySymbol, sellAmount] = args;
+    console.info(`sellSymbol: sell ${sellAmount} of ${sellSymbol} to ${buySymbol}`);
+    if (!sellAmount || !sellSymbol || !buySymbol) {
+        console.error(`
+      Usage:
+      swapcli [sellSymbol] [buySymbol] [sellAmount](denominated in sell asset, not wei)
+    `);
+        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 sellAsset = assetMap[sellSymbol];
+    const buyAsset = assetMap[buySymbol];
+    if (!sellAsset) {
+        console.error(`No asset ${sellSymbol} found in asset service`);
+        return;
+    }
+    if (!buyAsset) {
+        console.error(`No asset ${buySymbol} found in asset service`);
+        return;
+    }
+    // Swapper Deps
+    const wallet = await getWallet();
+    const unchainedUrls = {
+        [types_1.ChainTypes.Ethereum]: {
+            httpUrl: UNCHAINED_HTTP_API,
+            wsUrl: UNCHAINED_WS_API
+        }
+    };
+    const adapterManager = new chain_adapters_1.ChainAdapterManager(unchainedUrls);
+    const web3Provider = new web3_1.default.providers.HttpProvider(ETH_NODE_URL);
+    const web3 = new web3_1.default(web3Provider);
+    const zrxSwapperDeps = { wallet, adapterManager, web3 };
+    const manager = new SwapperManager_1.SwapperManager();
+    const zrxSwapper = new ZrxSwapper_1.ZrxSwapper(zrxSwapperDeps);
+    manager.addSwapper(types_1.SwapperType.Zrx, zrxSwapper);
+    const swapper = manager.getSwapper(types_1.SwapperType.Zrx);
+    const sellAmountBase = toBaseUnit(sellAmount, sellAsset.precision);
+    const quote = await swapper.buildQuoteTx({
+        input: {
+            sellAsset,
+            buyAsset,
+            sellAmount: sellAmountBase,
+            sellAssetAccountId: '0',
+            buyAssetAccountId: '0'
+        },
+        wallet
+    });
+    console.info('quote = ', JSON.stringify(quote));
+    if (!quote.success) {
+        console.error('Obtaining the quote failed: ', quote.statusReason);
+        return;
+    }
+    const buyAmount = fromBaseUnit(quote.buyAmount || '0', buyAsset.precision);
+    const answer = readline_sync_1.default.question(`Swap ${sellAmount} ${sellAsset.symbol} for ${buyAmount} ${buyAsset.symbol} on ${swapper.getType()}? (y/n): `);
+    if (answer === 'y') {
+        const txid = await swapper.executeQuote({ quote, wallet });
+        console.info('broadcast tx with id: ', txid);
+    }
+};
+main().then(() => console.info('Done'));

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

@@ -14,7 +14,6 @@ export declare class TestSwapper implements Swapper {
     getUsdRate(input: Pick<Asset, 'symbol' | 'tokenId'>): Promise<string>;
     getMinMax(input: GetQuoteInput): Promise<MinMaxOutput>;
     executeQuote(): Promise<ExecQuoteOutput>;
-    getDefaultPair(): [CAIP19, CAIP19];
     approvalNeeded(): Promise<ApprovalNeededOutput>;
     approveInfinite(): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): CAIP19[];

package/dist/swappers/test/TestSwapper.js

@@ -34,9 +34,6 @@ class TestSwapper {
     async executeQuote() {
         throw new Error('TestSwapper: executeQuote unimplemented');
     }
-    getDefaultPair() {
-        throw new Error('TestSwapper: getDefaultPair unimplemented');
-    }
     async approvalNeeded() {
         throw new Error('TestSwapper: approvalNeeded unimplemented');
     }

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

@@ -8,7 +8,6 @@ export declare class ThorchainSwapper implements Swapper {
     getUsdRate(input: Pick<Asset, 'symbol' | 'tokenId'>): Promise<string>;
     getMinMax(input: GetQuoteInput): Promise<MinMaxOutput>;
     executeQuote(): Promise<ExecQuoteOutput>;
-    getDefaultPair(): [CAIP19, CAIP19];
     approvalNeeded(): Promise<ApprovalNeededOutput>;
     approveInfinite(): Promise<string>;
     filterBuyAssetsBySellAssetId(): CAIP19[];

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -23,9 +23,6 @@ class ThorchainSwapper {
     async executeQuote() {
         throw new Error('ThorchainSwapper: executeQuote unimplemented');
     }
-    getDefaultPair() {
-        throw new Error('ThorchainSwapper: getDefaultPair unimplemented');
-    }
     async approvalNeeded() {
         throw new Error('ThorchainSwapper: approvalNeeded unimplemented');
     }

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

@@ -7,8 +7,8 @@ const api_1 = require("../../../api");
 const erc20Allowance_abi_1 = require("../utils/abi/erc20Allowance-abi");
 const constants_1 = require("../utils/constants");
 const helpers_1 = require("../utils/helpers/helpers");
-const zrxService_1 = require("../utils/zrxService");
 async function ZrxApprovalNeeded({ adapterManager, web3 }, { quote, wallet }) {
+    var _a, _b;
     const { sellAsset } = quote;
     if (sellAsset.symbol === 'ETH') {
         return { approvalNeeded: false };
@@ -20,42 +20,21 @@ async function ZrxApprovalNeeded({ adapterManager, web3 }, { quote, wallet }) {
     const adapter = adapterManager.byChain(sellAsset.chain);
     const bip44Params = adapter.buildBIP44Params({ accountNumber });
     const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
-    /**
-     * /swap/v1/quote
-     * params: {
-     *   sellToken: contract address (or symbol) of token to sell
-     *   buyToken: contractAddress (or symbol) of token to buy
-     *   sellAmount?: integer string value of the smallest increment of the sell token
-     *   buyAmount?: integer string value of the smallest incremtent of the buy token
-     * }
-     */
-    const quoteResponse = await zrxService_1.zrxService.get('/swap/v1/quote', {
-        params: {
-            buyToken: 'ETH',
-            sellToken: quote.sellAsset.tokenId || quote.sellAsset.symbol || quote.sellAsset.chain,
-            buyAmount: constants_1.APPROVAL_BUY_AMOUNT,
-            takerAddress: receiveAddress,
-            slippagePercentage: constants_1.DEFAULT_SLIPPAGE,
-            skipValidation: true,
-            affiliateAddress: constants_1.AFFILIATE_ADDRESS
-        }
-    });
-    const { data } = quoteResponse;
-    if (!quote.sellAsset.tokenId || !data.allowanceTarget) {
+    if (!quote.sellAsset.tokenId || !quote.allowanceContract) {
         throw new api_1.SwapError('ZrxApprovalNeeded - tokenId and allowanceTarget are required');
     }
     const allowanceResult = await (0, helpers_1.getERC20Allowance)({
         web3,
         erc20AllowanceAbi: erc20Allowance_abi_1.erc20AllowanceAbi,
         tokenId: quote.sellAsset.tokenId,
-        spenderAddress: data.allowanceTarget,
+        spenderAddress: quote.allowanceContract,
         ownerAddress: receiveAddress
     });
     const allowanceOnChain = new bignumber_js_1.BigNumber(allowanceResult || '0');
     return {
         approvalNeeded: allowanceOnChain.lt(new bignumber_js_1.BigNumber(quote.sellAmount || 1)),
         gas: constants_1.APPROVAL_GAS_LIMIT,
-        gasPrice: data.gasPrice
+        gasPrice: (_b = (_a = quote === null || quote === void 0 ? void 0 : quote.feeData) === null || _a === void 0 ? void 0 : _a.chainSpecific) === null || _b === void 0 ? void 0 : _b.gasPrice
     };
 }
 exports.ZrxApprovalNeeded = ZrxApprovalNeeded;

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

@@ -2,46 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZrxApproveInfinite = void 0;
 const types_1 = require("@shapeshiftoss/types");
-const api_1 = require("../../../api");
 const erc20_abi_1 = require("../utils/abi/erc20-abi");
-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");
 async function ZrxApproveInfinite({ adapterManager, web3 }, { quote, wallet }) {
     const adapter = adapterManager.byChain(types_1.ChainTypes.Ethereum);
-    const bip44Params = adapter.buildBIP44Params({
-        accountNumber: (0, bignumber_1.bnOrZero)(quote.sellAssetAccountId).toNumber()
-    }); // TODO: Add account number
-    const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
-    /**
-     * /swap/v1/quote
-     * params: {
-     *   sellToken: contract address (or symbol) of token to sell
-     *   buyToken: contractAddress (or symbol) of token to buy
-     *   sellAmount?: integer string value of the smallest increment of the sell token
-     *   buyAmount?: integer string value of the smallest incremtent of the buy token
-     * }
-     */
-    const quoteResponse = await zrxService_1.zrxService.get('/swap/v1/quote', {
-        params: {
-            buyToken: 'ETH',
-            sellToken: quote.sellAsset.tokenId || quote.sellAsset.symbol || quote.sellAsset.network,
-            buyAmount: '100000000000000000',
-            takerAddress: receiveAddress,
-            slippagePercentage: constants_1.DEFAULT_SLIPPAGE,
-            skipValidation: true,
-            affiliateAddress: constants_1.AFFILIATE_ADDRESS
-        }
-    });
-    const { data } = quoteResponse;
-    if (!data.allowanceTarget) {
-        throw new api_1.SwapError('approveInfinite - allowanceTarget is required');
-    }
     const allowanceGrantRequired = await (0, helpers_1.grantAllowance)({
         quote: {
             ...quote,
-            allowanceContract: data.allowanceTarget,
+            allowanceContract: quote.allowanceContract,
             sellAmount: constants_1.MAX_ALLOWANCE
         },
         wallet,

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

@@ -19,7 +19,6 @@ export declare class ZrxSwapper implements Swapper {
     getQuote(input: GetQuoteInput): Promise<Quote<ChainTypes>>;
     getUsdRate(input: Pick<Asset, 'symbol' | 'tokenId'>): Promise<string>;
     getMinMax(input: GetQuoteInput): Promise<MinMaxOutput>;
-    getDefaultPair(): [CAIP19, CAIP19];
     executeQuote(args: ExecQuoteInput<ChainTypes>): Promise<ExecQuoteOutput>;
     approvalNeeded(args: ApprovalNeededInput<ChainTypes>): Promise<ApprovalNeededOutput>;
     approveInfinite(args: ApproveInfiniteInput<ChainTypes>): Promise<string>;

package/dist/swappers/zrx/ZrxSwapper.js

@@ -35,11 +35,6 @@ class ZrxSwapper {
     async getMinMax(input) {
         return (0, getZrxMinMax_1.getZrxMinMax)(input);
     }
-    getDefaultPair() {
-        const ETH = 'eip155:1/slip44:60';
-        const FOX = 'eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d';
-        return [ETH, FOX];
-    }
     async executeQuote(args) {
         return (0, ZrxExecuteQuote_1.ZrxExecuteQuote)(this.deps, args);
     }

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

@@ -8,35 +8,19 @@ const types_1 = require("@shapeshiftoss/types");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("../utils/constants");
 const helpers_1 = require("../utils/helpers/helpers");
-const zrxService_1 = require("../utils/zrxService");
 const ZrxSwapper_1 = require("../ZrxSwapper");
 const getZrxMinMax = async (input) => {
-    var _a;
     const { sellAsset, buyAsset } = input;
     if (sellAsset.chain !== types_1.ChainTypes.Ethereum || buyAsset.chain !== types_1.ChainTypes.Ethereum) {
         throw new ZrxSwapper_1.ZrxError('getZrxMinMax - must be eth assets');
     }
-    const buyToken = buyAsset.tokenId || buyAsset.symbol;
-    const sellToken = sellAsset.tokenId || sellAsset.symbol;
     const usdRate = await (0, helpers_1.getUsdRate)({
         symbol: sellAsset.symbol,
         tokenId: sellAsset.tokenId
     });
-    const minimumWeiAmount = new bignumber_js_1.default(1)
-        .dividedBy(new bignumber_js_1.default(usdRate))
-        .times(new bignumber_js_1.default(10).exponentiatedBy(sellAsset.precision));
     const minimum = new bignumber_js_1.default(1).dividedBy(new bignumber_js_1.default(usdRate)).toString();
-    const minimumPriceResult = await zrxService_1.zrxService.get('/swap/v1/price', {
-        params: {
-            sellToken,
-            buyToken,
-            sellAmount: (0, helpers_1.normalizeAmount)(minimumWeiAmount.toString())
-        }
-    });
-    const minimumPrice = new bignumber_js_1.default((_a = minimumPriceResult === null || minimumPriceResult === void 0 ? void 0 : minimumPriceResult.data) === null || _a === void 0 ? void 0 : _a.price).toString();
     return {
         minimum,
-        minimumPrice,
         maximum: constants_1.MAX_ZRX_TRADE
     };
 };

package/dist/swappers/zrx/getZrxQuote/getZrxQuote.js

@@ -96,7 +96,8 @@ async function getZrxQuote(input) {
             sellAmount: data.sellAmount,
             buyAmount: data.buyAmount,
             guaranteedPrice: data.guaranteedPrice,
-            sources: ((_a = data.sources) === null || _a === void 0 ? void 0 : _a.filter((s) => parseFloat(s.proportion) > 0)) || constants_1.DEFAULT_SOURCE
+            sources: ((_a = data.sources) === null || _a === void 0 ? void 0 : _a.filter((s) => parseFloat(s.proportion) > 0)) || constants_1.DEFAULT_SOURCE,
+            allowanceContract: data.allowanceTarget
         };
     }
     catch (e) {

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

@@ -1,4 +1,3 @@
-/// <reference types="jest" />
 import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
 import Web3 from 'web3';
 export declare const chainAdapterMockFuncs: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "3.0.0",
+  "version": "3.0.3",
   "description": "TODO: description",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",
@@ -13,11 +13,13 @@
     "access": "public"
   },
   "scripts": {
-    "build": "yarn clean && tsc --project tsconfig.build.json",
+    "build": "yarn clean && yarn compile",
     "dev": "tsc --watch",
-    "clean": "rm -rf dist",
+    "clean": "rm -rf dist && rm -rf tsconfig.build.tsbuildinfo",
+    "compile": "tsc -p tsconfig.build.json",
+    "prepare": "yarn build",
     "test": "jest test",
-    "type-check": "tsc --project ./tsconfig.json --noEmit",
+    "type-check": "tsc --project ./tsconfig.build.json --noEmit",
     "swapcli": "yarn build && node ./dist/swappercli.js"
   },
   "dependencies": {
@@ -32,14 +34,14 @@
     "@shapeshiftoss/caip": "^2.0.0",
     "@shapeshiftoss/chain-adapters": "^2.0.0",
     "@shapeshiftoss/hdwallet-core": "1.20.0",
-    "@shapeshiftoss/types": "^2.1.0"
+    "@shapeshiftoss/types": "^3.0.0"
   },
   "devDependencies": {
     "@shapeshiftoss/asset-service": "^2.0.0",
     "@shapeshiftoss/caip": "^2.0.0",
     "@shapeshiftoss/chain-adapters": "^2.0.0",
     "@shapeshiftoss/hdwallet-core": "^1.20.0",
-    "@shapeshiftoss/types": "^2.1.0",
+    "@shapeshiftoss/types": "^3.0.0",
     "@types/readline-sync": "^1.4.4",
     "readline-sync": "^1.4.10",
     "web3-utils": "^1.5.2"