@rango-dev/queue-manager-rango-preset 0.22.1-next.9 → 0.24.0

package/src/shared.ts

@@ -1,32 +1,31 @@
-import type { Network, WalletType } from '@rango-dev/wallets-shared';
-import type {
-  AmountRestrictionType,
-  BestRouteResponse,
-  BlockchainMeta,
+import { Network, WalletType } from '@rango-dev/wallets-shared';
+import {
   CosmosTransaction,
   EvmTransaction,
-  MetaResponse,
   SimulationResult,
   SolanaTransaction,
   StarknetTransaction,
-  SwapResult,
-  Token,
-  Transfer as TransferTransaction,
   TronTransaction,
+  Transfer as TransferTransaction,
+  AmountRestrictionType,
+  BestRouteResponse,
+  MetaResponse,
+  Token,
+  SwapResult,
+  BlockchainMeta,
 } from 'rango-sdk';
-import type { TonTransaction } from 'rango-types';
 
+import { PrettyError } from './shared-errors';
 import BigNumber from 'bignumber.js';
+import { numberToString } from './numbers';
 import {
+  TonTransaction,
   isCosmosBlockchain,
   isEvmBlockchain,
   isStarknetBlockchain,
   isTronBlockchain,
 } from 'rango-types';
 
-import { numberToString } from './numbers';
-import { PrettyError } from './shared-errors';
-
 export interface PendingSwapWithQueueID {
   id: string;
   swap: PendingSwap;
@@ -171,10 +170,8 @@ export type PendingSwapStep = {
   starknetTransaction: StarknetTransaction | null;
   tonTransaction: TonTransaction | null;
 
-  /*
-   * missing fields in older versions
-   * keeping null for backward compatability
-   */
+  // missing fields in older versions
+  // keeping null for backward compatability
   swapperLogo: string | null;
   swapperType: string | null;
   fromBlockchainLogo: string | null;
@@ -243,22 +240,16 @@ export const getCurrentBlockchainOf = (
     step.cosmosTransaction?.blockChain ||
     step.solanaTransaction?.blockChain ||
     step.tonTransaction?.blockChain;
-  if (b1) {
-    return b1;
-  }
+  if (b1) return b1;
 
   const transferAddress = step.transferTransaction?.fromWalletAddress;
-  if (!transferAddress) {
-    throw PrettyError.BlockchainMissing();
-  }
+  if (!transferAddress) throw PrettyError.BlockchainMissing();
 
   const blockchain =
     Object.keys(swap.wallets).find(
       (b) => swap.wallets[b]?.address === transferAddress
     ) || null;
-  if (blockchain == null) {
-    throw PrettyError.BlockchainMissing();
-  }
+  if (blockchain == null) throw PrettyError.BlockchainMissing();
 
   return blockchain;
 };
@@ -266,15 +257,14 @@ export const getCurrentBlockchainOf = (
 const getBlockchainMetaExplorerBaseUrl = (
   blockchainMeta: BlockchainMeta
 ): string | undefined => {
-  if (isCosmosBlockchain(blockchainMeta)) {
+  if (isCosmosBlockchain(blockchainMeta))
     return blockchainMeta.info?.explorerUrlToTx;
-  } else if (
+  else if (
     isEvmBlockchain(blockchainMeta) ||
     isStarknetBlockchain(blockchainMeta) ||
     isTronBlockchain(blockchainMeta)
-  ) {
+  )
     return blockchainMeta.info.transactionUrl;
-  }
   return;
 };
 
@@ -285,12 +275,9 @@ export const getScannerUrl = (
 ): string | undefined => {
   const blockchainMeta = blockchainMetaMap[network];
   const baseUrl = getBlockchainMetaExplorerBaseUrl(blockchainMeta);
-  if (!baseUrl) {
-    return;
-  }
-  if (baseUrl.indexOf('/{txHash}') !== -1) {
+  if (!baseUrl) return;
+  if (baseUrl.indexOf('/{txHash}') !== -1)
     return baseUrl.replace('{txHash}', txHash?.toLowerCase());
-  }
   return `${baseUrl}/${txHash?.toLowerCase()}`;
 };
 
@@ -329,9 +316,7 @@ export const getCurrentAddressOf = (
       ? { address: step.transferTransaction?.fromWalletAddress }
       : null) ||
     null;
-  if (result == null) {
-    throw PrettyError.WalletMissing();
-  }
+  if (result == null) throw PrettyError.WalletMissing();
   return result.address;
 };
 
@@ -348,11 +333,10 @@ export function getRelatedWallet(
   const wallet = walletKV?.v || null;
 
   const walletType = wallet?.walletType;
-  if (wallet === null) {
+  if (wallet === null)
     throw PrettyError.AssertionFailed(
       `Wallet for source ${blockchain} not passed: walletType: ${walletType}`
     );
-  }
   return wallet;
 }
 
@@ -389,9 +373,7 @@ export function getUsdFeeOfStep(
   let totalFeeInUsd = new BigNumber(0);
   for (let i = 0; i < step.fee.length; i++) {
     const fee = step.fee[i];
-    if (fee.expenseType === 'DECREASE_FROM_OUTPUT') {
-      continue;
-    }
+    if (fee.expenseType === 'DECREASE_FROM_OUTPUT') continue;
 
     const unitPrice = getUsdPrice(
       fee.asset.blockchain,
@@ -413,12 +395,10 @@ export function calculatePendingSwap(
   wallets: { [p: string]: WalletTypeAndAddress },
   settings: SwapSavedSettings,
   validateBalanceOrFee: boolean,
-  meta: Pick<MetaResponse, 'blockchains' | 'tokens'> | null
+  meta: MetaResponse | null
 ): PendingSwap {
   const simulationResult = bestRoute.result;
-  if (!simulationResult) {
-    throw Error('Simulation result should not be null');
-  }
+  if (!simulationResult) throw Error('Simulation result should not be null');
 
   return {
     creationTime: new Date().getTime().toString(),
@@ -472,8 +452,7 @@ export function calculatePendingSwap(
           expectedOutputAmountHumanReadable: swap.toAmount,
           outputAmount: '',
           feeInUsd: meta
-            ? // eslint-disable-next-line @typescript-eslint/no-magic-numbers
-              numberToString(getUsdFeeOfStep(swap, meta?.tokens), null, 8)
+            ? numberToString(getUsdFeeOfStep(swap, meta?.tokens), null, 8)
             : null,
           estimatedTimeInSeconds: swap.estimatedTimeInSeconds || null,
 

package/src/types.ts

@@ -1,23 +1,15 @@
-import type { PendingSwap, PendingSwapStep, Wallet } from './shared';
-import type {
-  QueueContext,
-  QueueDef,
-  QueueStorage,
-} from '@rango-dev/queue-manager-core';
-import type { ConnectResult } from '@rango-dev/wallets-core';
-import type {
+import { QueueStorage, QueueDef } from '@rango-dev/queue-manager-core';
+import { QueueContext } from '@rango-dev/queue-manager-core/dist/queue';
+import { ConnectResult, Providers } from '@rango-dev/wallets-react';
+import {
   Meta,
   Network,
-  Providers,
   WalletState,
   WalletType,
 } from '@rango-dev/wallets-shared';
-import type { Transaction } from 'rango-sdk';
-import type {
-  APIErrorCode,
-  EvmBlockchainMeta,
-  SignerFactory,
-} from 'rango-types';
+import { APIErrorCode, EvmBlockchainMeta, SignerFactory } from 'rango-types';
+import { Transaction } from 'rango-sdk';
+import { PendingSwap, PendingSwapStep, Wallet } from './shared';
 
 export type RemoveNameField<T, U extends string> = {
   [Property in keyof T as Exclude<Property, U>]: T[Property];
@@ -69,7 +61,7 @@ export interface SwapQueueContext extends QueueContext {
   switchNetwork: (
     wallet: WalletType,
     network: Network
-  ) => Promise<ConnectResult | undefined> | undefined;
+  ) => Promise<ConnectResult> | undefined;
   canSwitchNetworkTo: (type: WalletType, network: Network) => boolean;
   connect: (
     wallet: WalletType,