@shapeshiftoss/swapper 7.4.0 → 7.6.0

package/dist/api.d.ts

@@ -1,6 +1,6 @@
 import { AssetId, ChainId } from '@shapeshiftoss/caip';
 import { BTCSignTx, ETHSignTx, HDWallet } from '@shapeshiftoss/hdwallet-core';
-import { Asset, ChainSpecific, KnownChainIds } from '@shapeshiftoss/types';
+import { Asset, BIP44Params, ChainSpecific, KnownChainIds, UtxoAccountType } from '@shapeshiftoss/types';
 export declare const SwapError: {
     new <V extends {
         cause?: unknown;
@@ -58,8 +58,17 @@ export declare type CommonTradeInput = {
     sellAssetAccountNumber: number;
     wallet?: HDWallet;
 };
-export declare type GetTradeQuoteInput = CommonTradeInput;
-export declare type BuildTradeInput = CommonTradeInput & {
+export declare type GetEthTradeQuoteInput = CommonTradeInput & {
+    chainId: 'eip155:1';
+};
+export declare type GetBtcTradeQuoteInput = CommonTradeInput & {
+    chainId: 'bip122:000000000019d6689c085ae165831e93';
+    accountType: UtxoAccountType;
+    bip44Params: BIP44Params;
+    wallet: HDWallet;
+};
+export declare type GetTradeQuoteInput = GetEthTradeQuoteInput | GetBtcTradeQuoteInput;
+export declare type BuildTradeInput = GetTradeQuoteInput & {
     buyAssetAccountNumber: number;
     slippage?: string;
     wallet: HDWallet;
@@ -157,7 +166,7 @@ export declare enum SwapErrorTypes {
     PRICE_RATIO_FAILED = "PRICE_RATIO_FAILED",
     POOL_NOT_FOUND = "POOL_NOT_FOUND"
 }
-export interface Swapper<T extends ChainId, TxType = unknown> {
+export interface Swapper<T extends ChainId> {
     /** perform any necessary async initialization */
     initialize(): Promise<void>;
     /** Returns the swapper type */
@@ -194,6 +203,6 @@ export interface Swapper<T extends ChainId, TxType = unknown> {
      * Get supported sell assetIds
      */
     filterAssetIdsBySellable(assetIds: AssetId[]): AssetId[];
-    getTradeTxs(tradeResult: TradeResult): Promise<TxType>;
+    getTradeTxs(tradeResult: TradeResult): Promise<TradeTxs>;
 }
 export {};

package/dist/swappercli.js

@@ -109,11 +109,11 @@ const main = async () => {
     let quote;
     try {
         quote = await swapper.getTradeQuote({
+            chainId: 'eip155:1',
             sellAsset,
             buyAsset,
             sellAmount: sellAmountBase,
             sellAssetAccountNumber: 0,
-            wallet,
             sendMax: false
         });
     }
@@ -128,6 +128,7 @@ const main = async () => {
     const answer = readline_sync_1.default.question(`Swap ${sellAmount} ${sellAsset.symbol} for ${buyAmount} ${buyAsset.symbol} on ${swapper.getType()}? (y/n): `);
     if (answer === 'y') {
         const trade = await swapper.buildTrade({
+            chainId: 'eip155:1',
             wallet,
             buyAsset,
             sendMax: false,

package/dist/swappers/thorchain/utils/ethereum/makeTradeTx.d.ts

@@ -2,7 +2,7 @@ import { ethereum } from '@shapeshiftoss/chain-adapters';
 import { ETHSignTx, HDWallet } from '@shapeshiftoss/hdwallet-core';
 import { Asset, BIP44Params } from '@shapeshiftoss/types';
 import { ThorchainSwapperDeps } from '../../types';
-export declare const makeTradeTx: ({ wallet, bip44Params, sellAmount, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, slippageTolerance, deps, gasLimit }: {
+export declare const makeTradeTx: ({ wallet, bip44Params, sellAmount, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPrice, slippageTolerance, deps, gasLimit }: {
     wallet: HDWallet;
     bip44Params: BIP44Params;
     sellAmount: string;
@@ -10,11 +10,17 @@ export declare const makeTradeTx: ({ wallet, bip44Params, sellAmount, buyAsset,
     sellAsset: Asset;
     destinationAddress: string;
     adapter: ethereum.ChainAdapter;
-    maxFeePerGas: string;
-    maxPriorityFeePerGas: string;
     slippageTolerance: string;
     deps: ThorchainSwapperDeps;
     gasLimit: string;
-}) => Promise<{
+} & ({
+    gasPrice: string;
+    maxFeePerGas?: undefined;
+    maxPriorityFeePerGas?: undefined;
+} | {
+    gasPrice?: undefined;
+    maxFeePerGas: string;
+    maxPriorityFeePerGas: string;
+})) => Promise<{
     txToSign: ETHSignTx;
 }>;

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

@@ -4,10 +4,10 @@ exports.makeTradeTx = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../../api");
 const getThorTxData_1 = require("../ethereum/utils/getThorTxData");
-const makeTradeTx = async ({ wallet, bip44Params, sellAmount, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, slippageTolerance, deps, gasLimit }) => {
+const makeTradeTx = async ({ wallet, bip44Params, sellAmount, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, gasPrice, slippageTolerance, deps, gasLimit }) => {
     try {
-        const { assetReference } = (0, caip_1.fromAssetId)(sellAsset.assetId);
-        const isErc20Trade = assetReference.startsWith('0x');
+        const { assetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
+        const isErc20Trade = assetNamespace === 'erc20';
         const { data, router } = await (0, getThorTxData_1.getThorTxInfo)({
             deps,
             sellAsset,
@@ -22,8 +22,14 @@ const makeTradeTx = async ({ wallet, bip44Params, sellAmount, buyAsset, sellAsse
             bip44Params,
             to: router,
             gasLimit,
-            maxFeePerGas,
-            maxPriorityFeePerGas,
+            ...(gasPrice !== undefined
+                ? {
+                    gasPrice
+                }
+                : {
+                    maxFeePerGas,
+                    maxPriorityFeePerGas
+                }),
             value: isErc20Trade ? '0' : sellAmount,
             data
         });

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

@@ -1,7 +1,7 @@
 import { Asset } from '@shapeshiftoss/types';
 import { TradeQuote } from '../../../api';
 export declare const setupQuote: () => {
-    quoteInput: import("../../../api").CommonTradeInput;
+    quoteInput: import("../../../api").GetEthTradeQuoteInput;
     tradeQuote: TradeQuote<"eip155:1">;
     buyAsset: Asset;
     sellAsset: Asset;

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

@@ -19,6 +19,7 @@ const setupQuote = () => {
         sources: []
     };
     const quoteInput = {
+        chainId: 'eip155:1',
         sellAmount: '1000000000000000000',
         sellAsset,
         buyAsset,

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

@@ -1,3 +1,4 @@
+import { HDWallet } from '@shapeshiftoss/hdwallet-core';
 import { Asset } from '@shapeshiftoss/types';
 import { ZrxQuoteResponse } from '../../types';
 export declare const setupZrxTradeQuoteResponse: () => {
@@ -6,17 +7,12 @@ export declare const setupZrxTradeQuoteResponse: () => {
     sellAsset: Asset;
 };
 export declare const setupBuildTrade: () => {
-    buildTradeInput: {
-        sellAmount: string;
-        allowanceTarget: string;
-        price: string;
-        to: string;
-        buyAmount: string;
-        buyAsset: Asset;
-        sendMax: boolean;
-        sellAssetAccountNumber: number;
+    buildTradeInput: import("../../../../api").CommonTradeInput & {
+        chainId: "eip155:1";
+    } & {
         buyAssetAccountNumber: number;
-        sellAsset: Asset;
+        slippage?: string | undefined;
+        wallet: HDWallet;
     };
     buyAsset: Asset;
     sellAsset: Asset;

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

@@ -23,16 +23,14 @@ const setupBuildTrade = () => {
     const sellAsset = { ...assets_1.FOX };
     const buyAsset = { ...assets_1.WETH };
     const buildTradeInput = {
+        chainId: 'eip155:1',
         sellAmount: '1000000000000000000',
-        allowanceTarget: 'allowanceTargetAddress',
-        price: '1',
-        to: '0x123',
-        buyAmount: '',
         buyAsset,
         sendMax: false,
         sellAssetAccountNumber: 0,
         buyAssetAccountNumber: 0,
-        sellAsset
+        sellAsset,
+        wallet: {}
     };
     return { buildTradeInput, buyAsset, sellAsset };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "7.4.0",
+  "version": "7.6.0",
   "description": "An interface and implementations to trade coins via various protocols",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",