@shapeshiftoss/swapper 7.3.1 → 7.5.1

package/dist/api.d.ts

@@ -157,7 +157,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 +194,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/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/thorchain/utils/txFeeHelpers/btcTxFees/getBtcTxFees.d.ts

@@ -0,0 +1,13 @@
+import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
+import { Asset } from '@shapeshiftoss/types';
+import { QuoteFeeData } from '../../../../../api';
+import { ThorchainSwapperDeps } from '../../../types';
+export declare const getBtcTxFees: ({ deps, opReturnData, vault, buyAsset, sellAmount, adapterManager, pubkey }: {
+    deps: ThorchainSwapperDeps;
+    opReturnData: string;
+    vault: string;
+    buyAsset: Asset;
+    sellAmount: string;
+    adapterManager: ChainAdapterManager;
+    pubkey: string;
+}) => Promise<QuoteFeeData<'bip122:000000000019d6689c085ae165831e93'>>;

package/dist/swappers/thorchain/utils/txFeeHelpers/btcTxFees/getBtcTxFees.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBtcTxFees = void 0;
+const api_1 = require("../../../../../api");
+const bignumber_1 = require("../../../../utils/bignumber");
+const estimateTradeFee_1 = require("../../estimateTradeFee/estimateTradeFee");
+const getBtcTxFees = async ({ deps, opReturnData, vault, buyAsset, sellAmount, adapterManager, pubkey }) => {
+    try {
+        const adapter = adapterManager.get('bip122:000000000019d6689c085ae165831e93');
+        if (!adapter)
+            throw new api_1.SwapError(`[getBtcTxFees] - No chain adapter found for ${'bip122:000000000019d6689c085ae165831e93'}.`, {
+                code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,
+                details: { chainId: 'bip122:000000000019d6689c085ae165831e93' }
+            });
+        const feeDataOptions = await adapter.getFeeData({
+            to: vault,
+            value: sellAmount,
+            chainSpecific: { pubkey, opReturnData }
+        });
+        const feeData = feeDataOptions['fast'];
+        const tradeFee = await (0, estimateTradeFee_1.estimateTradeFee)(deps, buyAsset.assetId);
+        return {
+            fee: feeData.txFee,
+            tradeFee,
+            chainSpecific: {
+                satsPerByte: feeData.chainSpecific.satoshiPerByte,
+                byteCount: (0, bignumber_1.bn)(feeData.txFee)
+                    .dividedBy(feeData.chainSpecific.satoshiPerByte)
+                    .dp(0)
+                    .toString()
+            }
+        };
+    }
+    catch (e) {
+        if (e instanceof api_1.SwapError)
+            throw e;
+        throw new api_1.SwapError('[getBtcTxFeess]', { cause: e, code: api_1.SwapErrorTypes.TRADE_QUOTE_FAILED });
+    }
+};
+exports.getBtcTxFees = getBtcTxFees;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "7.3.1",
+  "version": "7.5.1",
   "description": "An interface and implementations to trade coins via various protocols",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",
@@ -32,7 +32,7 @@
   "peerDependencies": {
     "@shapeshiftoss/asset-service": "^5.0.0",
     "@shapeshiftoss/caip": "^6.0.1",
-    "@shapeshiftoss/chain-adapters": "^6.0.1",
+    "@shapeshiftoss/chain-adapters": "^7.0.3",
     "@shapeshiftoss/errors": "^1.1.1",
     "@shapeshiftoss/hdwallet-core": "^1.23.0",
     "@shapeshiftoss/types": "^5.0.0"
@@ -40,7 +40,7 @@
   "devDependencies": {
     "@shapeshiftoss/asset-service": "^5.0.0",
     "@shapeshiftoss/caip": "^6.0.1",
-    "@shapeshiftoss/chain-adapters": "^6.0.1",
+    "@shapeshiftoss/chain-adapters": "^7.0.3",
     "@shapeshiftoss/errors": "^1.1.1",
     "@shapeshiftoss/hdwallet-core": "^1.23.0",
     "@shapeshiftoss/types": "^5.0.0",