chore: rest of ts fixes and applies

thorswap · Feb 11, 2025 · 4e7fe3f · 4e7fe3f
1 parent d1250e1
commit 4e7fe3f
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 46 deletions.
diff --git a/packages/swapkit/helpers/src/types/index.ts b/packages/swapkit/helpers/src/types/index.ts
@@ -1,7 +1,6 @@
 export * from "./chains";
 export * from "./commonTypes";
 export * from "./derivationPath";
-export * from "./network";
 export * from "./tokens";
 export * from "./wallet";
 export * from "./sdk";

diff --git a/packages/swapkit/helpers/src/types/sdk.ts b/packages/swapkit/helpers/src/types/sdk.ts
@@ -1,28 +1,4 @@
-import type { CovalentApiType, EthplorerApiType } from "@swapkit/toolbox-evm";
-import type { BlockchairApiType } from "@swapkit/toolbox-utxo";
-
 import type { AssetValue } from "../modules/assetValue";
-import type { Chain, CosmosChain, UTXOChain } from "./chains";
-
-type CovalentChains =
-  | Chain.Base
-  | Chain.BinanceSmartChain
-  | Chain.Polygon
-  | Chain.Avalanche
-  | Chain.Arbitrum
-  | Chain.Optimism;
-
-export type ChainApis = { [key in CovalentChains]?: CovalentApiType } & {
-  [key in Chain.Ethereum]?: EthplorerApiType;
-} & {
-  [key in UTXOChain]?: BlockchairApiType;
-} & {
-  [key in CosmosChain | Chain.Solana | Chain.Radix | Chain.Polkadot | Chain.Chainflip]?: string;
-} & {
-  [key in Chain.Fiat]?: undefined;
-};
-
-export type ChainApi = EthplorerApiType | CovalentApiType | BlockchairApiType | string;
 
 export type GenericSwapParams<T = unknown> = {
   buyAsset?: AssetValue;

diff --git a/packages/toolboxes/utxo/src/helpers/api.ts b/packages/toolboxes/utxo/src/helpers/api.ts
@@ -273,14 +273,12 @@ export function getUtxoApi(chain: UTXOChain) {
 
   if (customUtxoApi) {
     warnOnce(true, "Using custom UTXO API. Be sure to implement all methods to avoid issues.");
-    return customUtxoApi as UTXOApiType;
+    return customUtxoApi as ReturnType<typeof utxoApi>;
   }
 
   return utxoApi(chain);
 }
 
-export type UTXOApiType = ReturnType<typeof utxoApi>;
-
 interface BlockchairMultipleBalancesResponse {
   [key: string]: number;
 }

diff --git a/packages/toolboxes/utxo/src/helpers/coinselect.ts b/packages/toolboxes/utxo/src/helpers/coinselect.ts
@@ -1,14 +1,14 @@
 import { Chain, type UTXOChain } from "@swapkit/helpers";
 
-import type { TargetOutput, UTXOCalculateTxSizeParams, UTXOType } from "../types/index";
 import {
   TX_OVERHEAD,
   UTXOScriptType,
   calculateTxSize,
   getInputSize,
   getOutputSize,
   getScriptTypeForAddress,
-} from "../utils/index";
+} from "../helpers";
+import type { TargetOutput, UTXOCalculateTxSizeParams, UTXOType } from "../types";
 
 export const getDustThreshold = (chain: UTXOChain) => {
   switch (chain) {

diff --git a/packages/toolboxes/utxo/src/helpers/txSize.ts b/packages/toolboxes/utxo/src/helpers/txSize.ts
@@ -5,7 +5,7 @@ import type {
   UTXOCalculateTxSizeParams,
   UTXOInputWithScriptType,
   UTXOType,
-} from "../types/index";
+} from "../types";
 
 /**
  * Minimum transaction fee

diff --git a/packages/toolboxes/utxo/src/index.ts b/packages/toolboxes/utxo/src/index.ts
@@ -6,4 +6,4 @@ export { type Network, networks, Psbt, Transaction } from "bitcoinjs-lib";
 export * from "./toolbox/index";
 export * from "./toolbox/utxo";
 export * from "./helpers/index";
-export * from "./types/index";
+export * from "./types";
diff --git a/packages/toolboxes/utxo/src/toolbox/utxo.ts b/packages/toolboxes/utxo/src/toolbox/utxo.ts
@@ -23,12 +23,7 @@ import {
   getUtxoApi,
   standardFeeRates,
 } from "../helpers";
-import type {
-  TargetOutput,
-  UTXOBuildTxParams,
-  UTXOType,
-  UTXOWalletTransferParams,
-} from "../types/common";
+import type { TargetOutput, UTXOBuildTxParams, UTXOType, UTXOWalletTransferParams } from "../types";
 import { validateAddress as validateBCHAddress } from "./bitcoinCash";
 import type { BCHToolbox, BTCToolbox, DASHToolbox, DOGEToolbox, LTCToolbox } from "./index";
 

diff --git a/packages/toolboxes/utxo/src/types/common.ts → packages/toolboxes/utxo/src/types.ts b/packages/toolboxes/utxo/src/types/common.ts → packages/toolboxes/utxo/src/types.ts
@@ -1,7 +1,7 @@
 import type { AssetValue, FeeOption, UTXOChain, Witness } from "@swapkit/helpers";
 
-import type { UTXOScriptType } from "../helpers";
-import type { BCHToolbox, BTCToolbox, DOGEToolbox, LTCToolbox } from "../index";
+import type { UTXOScriptType } from "./helpers";
+import type { BCHToolbox, BTCToolbox, DOGEToolbox, LTCToolbox } from "./index";
 
 export type TransactionType = {
   toHex(): string;

diff --git a/packages/toolboxes/utxo/src/types/index.ts b/packages/toolboxes/utxo/src/types/index.ts
diff --git a/packages/wallets/keepkey/src/chains/utxo.ts b/packages/wallets/keepkey/src/chains/utxo.ts
@@ -124,11 +124,10 @@ export const utxoWalletMethods = async ({
     const { psbt, inputs: rawInputs } = await toolbox.buildTx({
       ...rest,
       memo,
-      feeOptionKey,
       recipient,
       feeRate: feeRate || (await toolbox.getFeeRates())[feeOptionKey || FeeOption.Fast],
       sender: from,
-      fetchTxHex: chain,
+      fetchTxHex: chain === Chain.BitcoinCash,
     });
 
     const inputs = rawInputs.map(({ value, index, hash, txHex }) => ({

diff --git a/packages/wallets/ledger/src/ledger.ts b/packages/wallets/ledger/src/ledger.ts
@@ -8,7 +8,6 @@ import {
   StagenetChain,
   WalletOption,
   filterSupportedChains,
-  getRPCUrl,
 } from "@swapkit/helpers";
 import type { DepositParam, TransferParams } from "@swapkit/toolbox-cosmos";
 import type { UTXOBuildTxParams } from "@swapkit/toolbox-utxo";
@@ -127,7 +126,7 @@ const getWalletMethods = async ({
         };
 
         const signingClient = await createSigningStargateClient(
-          getRPCUrl(Chain.Cosmos),
+          SKConfig.get("rpcUrls")[chain],
           signer,
           "0.007uatom",
         );