@shapeshiftoss/swapper 6.2.0 → 7.0.0

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

@@ -1,46 +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.setupZrxDeps = exports.chainAdapterMockFuncs = void 0;
+exports.setupZrxDeps = void 0;
 const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
-const types_1 = require("@shapeshiftoss/types");
+const unchained = __importStar(require("@shapeshiftoss/unchained-client"));
 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'
+    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'
+            }))
         },
-        [types_1.ChainTypes.Ethereum]: {
-            httpUrl: 'https://api.ethereum.shapeshift.com',
-            wsUrl: 'wss://api.ethereum.shapeshift.com'
-        }
-    };
+        rpcUrl: 'https://mainnet.infura.io/v3/d734c7eebcdf400185d7eb67322a7e57'
+    });
     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 };
+    return { web3: new web3_1.default(web3Provider), adapter: ethChainAdapter };
 };
 exports.setupZrxDeps = setupZrxDeps;

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>;

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

@@ -28,14 +28,16 @@ const caip_1 = require("@shapeshiftoss/caip");
 const rax = __importStar(require("retry-axios"));
 const __1 = require("../../..");
 const bignumber_1 = require("../../utils/bignumber");
+const constants_1 = require("../../utils/constants");
+const helpers_1 = require("../../utils/helpers/helpers");
 const erc20Allowance_abi_1 = require("../utils/abi/erc20Allowance-abi");
 const applyAxiosRetry_1 = require("../utils/applyAxiosRetry");
-const constants_1 = require("../utils/constants");
-const helpers_1 = require("../utils/helpers/helpers");
+const constants_2 = require("../utils/constants");
+const helpers_2 = require("../utils/helpers/helpers");
 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, sellAssetAccountId, buyAssetAccountId, wallet } = input;
+    const { sellAsset, buyAsset, sellAmount, slippage, sellAssetAccountNumber, buyAssetAccountNumber, wallet } = input;
     try {
         const { assetReference: buyAssetErc20Address, assetNamespace: buyAssetNamespace } = (0, caip_1.fromAssetId)(buyAsset.assetId);
         const { assetReference: sellAssetErc20Address, assetNamespace: sellAssetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
@@ -47,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: Number(buyAssetAccountId) });
+        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;
         /**
@@ -84,7 +85,7 @@ async function zrxBuildTrade({ adapterManager, web3 }, input) {
                 takerAddress: receiveAddress,
                 slippagePercentage,
                 skipValidation: false,
-                affiliateAddress: constants_1.AFFILIATE_ADDRESS
+                affiliateAddress: constants_2.AFFILIATE_ADDRESS
             }
         });
         const { data } = quoteResponse;
@@ -92,7 +93,7 @@ async function zrxBuildTrade({ adapterManager, web3 }, input) {
         const trade = {
             sellAsset,
             buyAsset,
-            sellAssetAccountId,
+            sellAssetAccountNumber,
             receiveAddress,
             rate: data.price,
             depositAddress: data.to,
@@ -107,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_1.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_1.getAllowanceRequired)({
+        const allowanceRequired = await (0, helpers_2.getAllowanceRequired)({
             sellAsset,
             allowanceContract: data.allowanceTarget,
             receiveAddress,

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,17 +3,15 @@ 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");
-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: (0, bignumber_1.bnOrZero)(trade.sellAssetAccountId).toNumber()
+            accountNumber: trade.sellAssetAccountNumber
         });
         const buildTxResponse = await adapter.buildSendTransaction({
             value,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "6.2.0",
-  "description": "TODO: description",
+  "version": "7.0.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"