@shapeshiftoss/swapper 1.13.0 → 1.15.1

package/dist/api.d.ts

@@ -1,3 +1,4 @@
+import { CAIP19 } from '@shapeshiftoss/caip';
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
 import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, Asset, BuildQuoteTxInput, ChainTypes, ExecQuoteInput, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, Quote, SendMaxAmountInput, SwapperType } from '@shapeshiftoss/types';
 export declare class SwapError extends Error {
@@ -28,7 +29,7 @@ export interface Swapper {
     /**
      * Get the default pair of the swapper
      */
-    getDefaultPair(): Pick<Asset, 'chain' | 'symbol' | 'name'>[];
+    getDefaultPair(): [CAIP19, CAIP19];
     /**
      * Get the minimum and maximum trade value of the sellAsset and buyAsset
      */

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

@@ -1,3 +1,4 @@
+import { CAIP19 } from '@shapeshiftoss/caip';
 import { ApprovalNeededOutput, Asset, ChainTypes, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, Quote, SwapperType } from '@shapeshiftoss/types';
 import { Swapper } from '../../api';
 export declare class ThorchainSwapper implements Swapper {
@@ -9,7 +10,7 @@ export declare class ThorchainSwapper implements Swapper {
     getAvailableAssets(assets: Asset[]): Asset[];
     canTradePair(sellAsset: Asset, buyAsset: Asset): boolean;
     executeQuote(): Promise<ExecQuoteOutput>;
-    getDefaultPair(): Pick<Asset, 'chain' | 'symbol' | 'name'>[];
+    getDefaultPair(): [CAIP19, CAIP19];
     approvalNeeded(): Promise<ApprovalNeededOutput>;
     approveInfinite(): Promise<string>;
     getSendMaxAmount(): Promise<string>;

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

@@ -18,8 +18,8 @@ async function ZrxApprovalNeeded({ adapterManager, web3 }, { quote, wallet }) {
     }
     const accountNumber = quote.sellAssetAccountId ? Number(quote.sellAssetAccountId) : 0;
     const adapter = adapterManager.byChain(sellAsset.chain);
-    const bip32Params = adapter.buildBIP32Params({ accountNumber });
-    const receiveAddress = await adapter.getAddress({ wallet, bip32Params });
+    const bip44Params = adapter.buildBIP44Params({ accountNumber });
+    const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
     /**
      * /swap/v1/quote
      * params: {

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

@@ -10,10 +10,10 @@ 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 bip32Params = adapter.buildBIP32Params({
+    const bip44Params = adapter.buildBIP44Params({
         accountNumber: (0, bignumber_1.bnOrZero)(quote.sellAssetAccountId).toNumber()
     }); // TODO: Add account number
-    const receiveAddress = await adapter.getAddress({ wallet, bip32Params });
+    const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
     /**
      * /swap/v1/quote
      * params: {

package/dist/swappers/zrx/ZrxBuildQuoteTx/ZrxBuildQuoteTx.js

@@ -53,8 +53,8 @@ async function ZrxBuildQuoteTx({ adapterManager, web3 }, { input, wallet }) {
         throw new __1.SwapError(`ZrxSwapper:ZrxBuildQuoteTx buyAsset must be on chain [${types_1.ChainTypes.Ethereum}]`);
     }
     const adapter = adapterManager.byChain(buyAsset.chain);
-    const bip32Params = adapter.buildBIP32Params({ accountNumber: Number(buyAssetAccountId) });
-    const receiveAddress = await adapter.getAddress({ wallet, bip32Params });
+    const bip44Params = adapter.buildBIP44Params({ accountNumber: Number(buyAssetAccountId) });
+    const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
     if (new bignumber_js_1.default(slippage || 0).gt(constants_1.MAX_SLIPPAGE)) {
         throw new __1.SwapError(`ZrxSwapper:ZrxBuildQuoteTx slippage value of ${slippage} is greater than max slippage value of ${constants_1.MAX_SLIPPAGE}`);
     }

package/dist/swappers/zrx/ZrxExecuteQuote/ZrxExecuteQuote.js

@@ -24,7 +24,7 @@ async function ZrxExecuteQuote({ adapterManager }, { quote, wallet }) {
     // value is 0 for erc20s
     const value = sellAsset.symbol === 'ETH' ? quote.sellAmount : '0';
     const adapter = adapterManager.byChain(sellAsset.chain);
-    const bip32Params = adapter.buildBIP32Params({
+    const bip44Params = adapter.buildBIP44Params({
         accountNumber: Number(quote.sellAssetAccountId)
     });
     let buildTxResponse, signedTx, txid;
@@ -37,7 +37,7 @@ async function ZrxExecuteQuote({ adapterManager }, { quote, wallet }) {
                 gasPrice: (0, web3_utils_1.numberToHex)(((_b = (_a = quote.feeData) === null || _a === void 0 ? void 0 : _a.chainSpecific) === null || _b === void 0 ? void 0 : _b.gasPrice) || 0),
                 gasLimit: (0, web3_utils_1.numberToHex)(((_d = (_c = quote.feeData) === null || _c === void 0 ? void 0 : _c.chainSpecific) === null || _d === void 0 ? void 0 : _d.estimatedGas) || 0)
             },
-            bip32Params
+            bip44Params
         });
     }
     catch (error) {

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

@@ -1,3 +1,4 @@
+import { CAIP19 } from '@shapeshiftoss/caip';
 import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
 import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, Asset, BuildQuoteTxInput, ChainTypes, ExecQuoteInput, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, Quote, SendMaxAmountInput, SwapperType } from '@shapeshiftoss/types';
 import Web3 from 'web3';
@@ -20,7 +21,7 @@ export declare class ZrxSwapper implements Swapper {
     getMinMax(input: GetQuoteInput): Promise<MinMaxOutput>;
     getAvailableAssets(assets: Asset[]): Asset[];
     canTradePair(sellAsset: Asset, buyAsset: Asset): boolean;
-    getDefaultPair(): Pick<Asset, 'chain' | 'symbol' | 'name'>[];
+    getDefaultPair(): [CAIP19, CAIP19];
     executeQuote(args: ExecQuoteInput<ChainTypes, SwapperType>): Promise<ExecQuoteOutput>;
     approvalNeeded(args: ApprovalNeededInput<ChainTypes, SwapperType>): Promise<ApprovalNeededOutput>;
     approveInfinite(args: ApproveInfiniteInput<ChainTypes, SwapperType>): Promise<string>;

package/dist/swappers/zrx/ZrxSwapper.js

@@ -44,8 +44,8 @@ class ZrxSwapper {
         return availableAssets.length === 2;
     }
     getDefaultPair() {
-        const ETH = { name: 'Ethereum', chain: types_1.ChainTypes.Ethereum, symbol: 'ETH' };
-        const FOX = { name: 'Fox', chain: types_1.ChainTypes.Ethereum, symbol: 'FOX' };
+        const ETH = 'eip155:1/slip44:60';
+        const FOX = 'eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d';
         return [ETH, FOX];
     }
     async executeQuote(args) {

package/dist/swappers/zrx/getZrxSendMaxAmount/getZrxSendMaxAmount.js

@@ -13,10 +13,10 @@ const constants_1 = require("../utils/constants");
 async function getZrxSendMaxAmount({ adapterManager }, { wallet, quote, sellAssetAccountId, feeEstimateKey = types_1.chainAdapters.FeeDataKey.Average }) {
     var _a, _b, _c;
     const adapter = adapterManager.byChain(types_1.ChainTypes.Ethereum);
-    const bip32Params = adapter.buildBIP32Params({
+    const bip44Params = adapter.buildBIP44Params({
         accountNumber: (0, bignumber_1.bnOrZero)(sellAssetAccountId).toNumber()
     });
-    const ethAddress = await adapter.getAddress({ wallet, bip32Params });
+    const ethAddress = await adapter.getAddress({ wallet, bip44Params });
     const account = await adapter.getAccount(ethAddress);
     if (!quote.sellAsset) {
         throw new api_1.SwapError('quote.sellAsset is required');

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

@@ -73,7 +73,7 @@ const getUsdRate = async (input) => {
 };
 exports.getUsdRate = getUsdRate;
 const grantAllowance = async ({ quote, wallet, adapter, erc20Abi, web3 }) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     if (!quote.sellAsset.tokenId) {
         throw new Error('sellAsset.tokenId is required');
     }
@@ -81,7 +81,7 @@ const grantAllowance = async ({ quote, wallet, adapter, erc20Abi, web3 }) => {
     const approveTx = erc20Contract.methods
         .approve(quote.allowanceContract, quote.sellAmount)
         .encodeABI();
-    const bip32Params = adapter.buildBIP32Params({
+    const bip44Params = adapter.buildBIP44Params({
         accountNumber: Number(quote.sellAssetAccountId) || 0
     });
     let grantAllowanceTxToSign, signedTx, broadcastedTxId;
@@ -89,7 +89,7 @@ const grantAllowance = async ({ quote, wallet, adapter, erc20Abi, web3 }) => {
         const { txToSign } = await adapter.buildSendTransaction({
             wallet,
             to: quote.sellAsset.tokenId,
-            bip32Params,
+            bip44Params,
             value: '0',
             chainSpecific: {
                 erc20ContractAddress: quote.sellAsset.tokenId,
@@ -105,18 +105,38 @@ const grantAllowance = async ({ quote, wallet, adapter, erc20Abi, web3 }) => {
     catch (error) {
         throw new Error(`grantAllowance - buildSendTransaction: ${error}`);
     }
-    try {
-        signedTx = await adapter.signTransaction({ txToSign: grantAllowanceTxToSign, wallet });
-    }
-    catch (error) {
-        throw new Error(`grantAllowance - signTransaction: ${error}`);
+    if (wallet.supportsOfflineSigning()) {
+        try {
+            signedTx = await adapter.signTransaction({ txToSign: grantAllowanceTxToSign, wallet });
+        }
+        catch (error) {
+            throw new api_1.SwapError(`grantAllowance - signTransaction error: ${error}`);
+        }
+        if (!signedTx) {
+            throw new api_1.SwapError(`grantAllowance - Signed transaction is required: ${signedTx}`);
+        }
+        try {
+            broadcastedTxId = await adapter.broadcastTransaction(signedTx);
+        }
+        catch (error) {
+            throw new api_1.SwapError(`grantAllowance - broadcastTransaction error: ${error}`);
+        }
+        return broadcastedTxId;
     }
-    try {
-        broadcastedTxId = await adapter.broadcastTransaction(signedTx);
+    else if (wallet.supportsBroadcast() && adapter.signAndBroadcastTransaction) {
+        try {
+            broadcastedTxId = await ((_e = adapter.signAndBroadcastTransaction) === null || _e === void 0 ? void 0 : _e.call(adapter, {
+                txToSign: grantAllowanceTxToSign,
+                wallet
+            }));
+        }
+        catch (error) {
+            throw new api_1.SwapError(`grantAllowance - signAndBroadcastTransaction error: ${error}`);
+        }
+        return broadcastedTxId;
     }
-    catch (error) {
-        throw new Error(`grantAllowance - broadcastTransaction: ${error}`);
+    else {
+        throw new api_1.SwapError('grantAllowance - invalid HDWallet config');
     }
-    return broadcastedTxId;
 };
 exports.grantAllowance = grantAllowance;

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

@@ -4,6 +4,7 @@ exports.FOX = exports.WETH = exports.BTC = void 0;
 const types_1 = require("@shapeshiftoss/types");
 exports.BTC = {
     caip19: 'bip122:000000000019d6689c085ae165831e93/slip44:0',
+    caip2: 'bip122:000000000019d6689c085ae165831e93',
     name: 'bitcoin',
     chain: types_1.ChainTypes.Bitcoin,
     dataSource: types_1.AssetDataSource.CoinGecko,
@@ -23,6 +24,7 @@ exports.BTC = {
 };
 exports.WETH = {
     caip19: 'eip155:1/erc20:0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+    caip2: 'eip155:1',
     name: 'WETH',
     chain: types_1.ChainTypes.Ethereum,
     dataSource: types_1.AssetDataSource.CoinGecko,
@@ -43,6 +45,7 @@ exports.WETH = {
 };
 exports.FOX = {
     caip19: 'eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d',
+    caip2: 'eip155:1',
     name: 'FOX',
     chain: types_1.ChainTypes.Ethereum,
     dataSource: types_1.AssetDataSource.CoinGecko,

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

@@ -2,7 +2,7 @@
 import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
 import Web3 from 'web3';
 export declare const chainAdapterMockFuncs: {
-    buildBIP32Params: jest.Mock<{
+    buildBIP44Params: jest.Mock<{
         purpose: number;
         coinType: number;
         accountNumber: number;

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

@@ -9,7 +9,7 @@ const types_1 = require("@shapeshiftoss/types");
 const web3_1 = __importDefault(require("web3"));
 jest.mock('@shapeshiftoss/chain-adapters');
 exports.chainAdapterMockFuncs = {
-    buildBIP32Params: jest.fn(() => ({ purpose: 44, coinType: 60, accountNumber: 0 })),
+    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')),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "1.13.0",
+  "version": "1.15.1",
   "description": "TODO: description",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",