@shapeshiftoss/swapper 7.4.0 → 7.5.0

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/package.json

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