@shapeshiftoss/swapper 6.3.0 → 7.2.0

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

@@ -27,16 +27,15 @@ exports.zrxBuildTrade = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const rax = __importStar(require("retry-axios"));
 const __1 = require("../../..");
+const erc20Allowance_abi_1 = require("../../utils/abi/erc20Allowance-abi");
 const bignumber_1 = require("../../utils/bignumber");
 const constants_1 = require("../../utils/constants");
-const constants_2 = require("../../utils/constants");
 const helpers_1 = require("../../utils/helpers/helpers");
-const erc20Allowance_abi_1 = require("../utils/abi/erc20Allowance-abi");
+const helpers_2 = require("../../utils/helpers/helpers");
 const applyAxiosRetry_1 = require("../utils/applyAxiosRetry");
-const constants_3 = require("../utils/constants");
-const helpers_2 = require("../utils/helpers/helpers");
+const constants_2 = require("../utils/constants");
 const zrxService_1 = require("../utils/zrxService");
-async function zrxBuildTrade({ adapterManager, web3 }, input) {
+async function zrxBuildTrade({ adapter, web3 }, input) {
     var _a, _b, _c;
     const { sellAsset, buyAsset, sellAmount, slippage, sellAssetAccountNumber, buyAssetAccountNumber, wallet } = input;
     try {
@@ -50,8 +49,7 @@ async function zrxBuildTrade({ adapterManager, web3 }, input) {
                 details: { chainId: sellAsset.chainId }
             });
         }
-        const adapter = await adapterManager.byChainId(buyAsset.chainId);
-        const bip44Params = adapter.buildBIP44Params({ accountNumber: buyAssetAccountNumber });
+        const bip44Params = adapter.buildBIP44Params({ accountNumber: Number(buyAssetAccountNumber) });
         const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
         const slippagePercentage = slippage ? (0, bignumber_1.bnOrZero)(slippage).div(100).toString() : constants_1.DEFAULT_SLIPPAGE;
         /**
@@ -83,11 +81,11 @@ async function zrxBuildTrade({ adapterManager, web3 }, input) {
             params: {
                 buyToken,
                 sellToken,
-                sellAmount: (0, helpers_1.normalizeAmount)(sellAmount),
+                sellAmount: (0, helpers_2.normalizeAmount)(sellAmount),
                 takerAddress: receiveAddress,
                 slippagePercentage,
                 skipValidation: false,
-                affiliateAddress: constants_3.AFFILIATE_ADDRESS
+                affiliateAddress: constants_2.AFFILIATE_ADDRESS
             }
         });
         const { data } = quoteResponse;
@@ -110,9 +108,9 @@ async function zrxBuildTrade({ adapterManager, web3 }, input) {
             txData: data.data,
             sellAmount: data.sellAmount,
             buyAmount: data.buyAmount,
-            sources: ((_a = data.sources) === null || _a === void 0 ? void 0 : _a.filter((s) => parseFloat(s.proportion) > 0)) || constants_3.DEFAULT_SOURCE
+            sources: ((_a = data.sources) === null || _a === void 0 ? void 0 : _a.filter((s) => parseFloat(s.proportion) > 0)) || constants_2.DEFAULT_SOURCE
         };
-        const allowanceRequired = await (0, helpers_2.getAllowanceRequired)({
+        const allowanceRequired = await (0, helpers_1.getAllowanceRequired)({
             sellAsset,
             allowanceContract: data.allowanceTarget,
             receiveAddress,
@@ -125,7 +123,7 @@ async function zrxBuildTrade({ adapterManager, web3 }, input) {
                 fee: ((_b = trade.feeData) === null || _b === void 0 ? void 0 : _b.fee) || '0',
                 chainSpecific: {
                     ...(_c = trade.feeData) === null || _c === void 0 ? void 0 : _c.chainSpecific,
-                    approvalFee: (0, bignumber_1.bnOrZero)(constants_2.APPROVAL_GAS_LIMIT).multipliedBy((0, bignumber_1.bnOrZero)(data.gasPrice)).toString()
+                    approvalFee: (0, bignumber_1.bnOrZero)(constants_1.APPROVAL_GAS_LIMIT).multipliedBy((0, bignumber_1.bnOrZero)(data.gasPrice)).toString()
                 },
                 tradeFee: '0'
             };

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

@@ -1,3 +1,3 @@
 import { ExecuteTradeInput, TradeResult } from '../../../api';
 import { ZrxSwapperDeps } from '../ZrxSwapper';
-export declare function zrxExecuteTrade({ adapterManager }: ZrxSwapperDeps, { trade, wallet }: ExecuteTradeInput<'eip155:1'>): Promise<TradeResult>;
+export declare function zrxExecuteTrade({ adapter }: ZrxSwapperDeps, { trade, wallet }: ExecuteTradeInput<'eip155:1'>): Promise<TradeResult>;

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

@@ -3,14 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.zrxExecuteTrade = void 0;
 const web3_utils_1 = require("web3-utils");
 const api_1 = require("../../../api");
-async function zrxExecuteTrade({ adapterManager }, { trade, wallet }) {
+async function zrxExecuteTrade({ adapter }, { trade, wallet }) {
     var _a, _b, _c, _d, _e, _f;
     const zrxTrade = trade;
     const { sellAsset } = zrxTrade;
     try {
         // value is 0 for erc20s
         const value = sellAsset.assetId === 'eip155:1/slip44:60' ? trade.sellAmount : '0';
-        const adapter = await adapterManager.byChainId(sellAsset.chainId);
         const bip44Params = adapter.buildBIP44Params({
             accountNumber: trade.sellAssetAccountNumber
         });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "6.3.0",
-  "description": "TODO: description",
+  "version": "7.2.0",
+  "description": "An interface and implementations to trade coins via various protocols",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",
   "main": "./dist/index.js",
@@ -30,20 +30,20 @@
     "web3": "^1.7.3"
   },
   "peerDependencies": {
-    "@shapeshiftoss/asset-service": "^4.6.0",
-    "@shapeshiftoss/caip": "^5.2.2",
-    "@shapeshiftoss/chain-adapters": "^5.0.0",
+    "@shapeshiftoss/asset-service": "^5.0.0",
+    "@shapeshiftoss/caip": "^5.3.0",
+    "@shapeshiftoss/chain-adapters": "^6.0.1",
     "@shapeshiftoss/errors": "^1.1.1",
     "@shapeshiftoss/hdwallet-core": "^1.23.0",
-    "@shapeshiftoss/types": "^4.4.0"
+    "@shapeshiftoss/types": "^5.0.0"
   },
   "devDependencies": {
-    "@shapeshiftoss/asset-service": "^4.6.0",
-    "@shapeshiftoss/caip": "^5.2.2",
-    "@shapeshiftoss/chain-adapters": "^5.0.0",
+    "@shapeshiftoss/asset-service": "^5.0.0",
+    "@shapeshiftoss/caip": "^5.3.0",
+    "@shapeshiftoss/chain-adapters": "^6.0.1",
     "@shapeshiftoss/errors": "^1.1.1",
     "@shapeshiftoss/hdwallet-core": "^1.23.0",
-    "@shapeshiftoss/types": "^4.4.0",
+    "@shapeshiftoss/types": "^5.0.0",
     "@types/readline-sync": "^1.4.4",
     "readline-sync": "^1.4.10",
     "web3-utils": "^1.7.3"

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

@@ -1,32 +0,0 @@
-import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
-import Web3 from 'web3';
-export declare const chainAdapterMockFuncs: {
-    buildBIP44Params: jest.Mock<{
-        purpose: number;
-        coinType: number;
-        accountNumber: number;
-    }, []>;
-    buildSendTransaction: jest.Mock<Promise<{
-        txToSign: {};
-    }>, []>;
-    signTransaction: jest.Mock<Promise<string>, []>;
-    broadcastTransaction: jest.Mock<Promise<string>, []>;
-    getAddress: jest.Mock<Promise<string>, []>;
-    getAccount: jest.Mock<Promise<{
-        chainSpecific: {
-            tokens: {
-                assetId: string;
-                balance: string;
-            }[];
-        };
-    }>, []>;
-    getFeeData: jest.Mock<Promise<{
-        average: {
-            txFee: string;
-        };
-    }>, []>;
-};
-export declare const setupZrxDeps: () => {
-    web3Instance: Web3;
-    adapterManager: ChainAdapterManager;
-};

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

@@ -1,46 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupZrxDeps = exports.chainAdapterMockFuncs = void 0;
-const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
-const types_1 = require("@shapeshiftoss/types");
-const web3_1 = __importDefault(require("web3"));
-jest.mock('@shapeshiftoss/chain-adapters');
-exports.chainAdapterMockFuncs = {
-    buildBIP44Params: jest.fn(() => ({ purpose: 44, coinType: 60, accountNumber: 0 })),
-    buildSendTransaction: jest.fn(() => Promise.resolve({ txToSign: {} })),
-    signTransaction: jest.fn(() => Promise.resolve('signedTx')),
-    broadcastTransaction: jest.fn(() => Promise.resolve('broadcastedTx')),
-    getAddress: jest.fn(() => Promise.resolve('address')),
-    getAccount: jest.fn(() => Promise.resolve({
-        chainSpecific: { tokens: [{ assetId: 'eip155:1/erc20:contractAddress', balance: '1000000' }] }
-    })),
-    getFeeData: jest.fn(() => Promise.resolve({
-        [types_1.chainAdapters.FeeDataKey.Average]: { txFee: '10000' }
-    }))
-};
-// @ts-ignore
-chain_adapters_1.ChainAdapterManager.mockImplementation(() => ({
-    byChain: jest.fn(() => exports.chainAdapterMockFuncs),
-    byChainId: jest.fn(() => exports.chainAdapterMockFuncs)
-}));
-const setupZrxDeps = () => {
-    const unchainedUrls = {
-        [types_1.ChainTypes.Bitcoin]: {
-            httpUrl: 'https://api.bitcoin.shapeshift.com',
-            wsUrl: 'wss://api.bitcoin.shapeshift.com'
-        },
-        [types_1.ChainTypes.Ethereum]: {
-            httpUrl: 'https://api.ethereum.shapeshift.com',
-            wsUrl: 'wss://api.ethereum.shapeshift.com'
-        }
-    };
-    const ethNodeUrl = 'http://localhost:1000';
-    const adapterManager = new chain_adapters_1.ChainAdapterManager(unchainedUrls);
-    const web3Provider = new web3_1.default.providers.HttpProvider(ethNodeUrl);
-    const web3Instance = new web3_1.default(web3Provider);
-    return { web3Instance, adapterManager };
-};
-exports.setupZrxDeps = setupZrxDeps;