fixup! feat(input-selection): add large first input selection strategy

Author: AngelCastilloB

packages/input-selection/src/GreedySelection/GreedyInputSelector.ts

@@ -2,8 +2,15 @@
 import { Cardano, coalesceValueQuantities } from '@cardano-sdk/core';
 import { InputSelectionError, InputSelectionFailure } from '../InputSelectionError';
 import { InputSelectionParameters, InputSelector, SelectionResult } from '../types';
-import { addTokenMaps, getCoinQuantity, hasNegativeAssetValue, subtractTokenMaps, toValues } from '../util';
-import { sortUtxoByTxIn, splitChangeAndComputeFee } from './util';
+import {
+  addTokenMaps,
+  getCoinQuantity,
+  hasNegativeAssetValue,
+  sortUtxoByTxIn,
+  subtractTokenMaps,
+  toValues
+} from '../util';
+import { splitChangeAndComputeFee } from './util';
 
 /** Greedy selection initialization properties. */
 export interface GreedySelectorProps {

packages/input-selection/src/GreedySelection/util.ts

@@ -226,27 +226,6 @@ export const splitChange = async (
   return distributeAssets(sortedOutputs, computeMinimumCoinQuantity, tokenBundleSizeExceedsLimit, fee);
 };
 
-/**
- * Sorts the given TxIn set first by txId and then by index.
- *
- * @param lhs The left-hand side of the comparison operation.
- * @param rhs The left-hand side of the comparison operation.
- */
-export const sortTxIn = (lhs: Cardano.TxIn, rhs: Cardano.TxIn) => {
-  const txIdComparison = lhs.txId.localeCompare(rhs.txId);
-  if (txIdComparison !== 0) return txIdComparison;
-
-  return lhs.index - rhs.index;
-};
-
-/**
- * Sorts the given Utxo set first by TxIn.
- *
- * @param lhs The left-hand side of the comparison operation.
- * @param rhs The left-hand side of the comparison operation.
- */
-export const sortUtxoByTxIn = (lhs: Cardano.Utxo, rhs: Cardano.Utxo) => sortTxIn(lhs[0], rhs[0]);
-
 /**
  * Given a set of input and outputs, compute the fee. Then extract the fee from the change output
  * with the highest value.

packages/input-selection/src/LargeFirstSelection/LargeFirstInputSelector.ts

@@ -3,12 +3,14 @@ import { Cardano, coalesceValueQuantities } from '@cardano-sdk/core';
 import { ChangeAddressResolver } from '../ChangeAddress';
 import {
   ImplicitTokens,
+  MAX_U64,
   addTokenMaps,
   getCoinQuantity,
   hasNegativeAssetValue,
   mintToImplicitTokens,
   sortByAssetQuantity,
   sortByCoins,
+  sortUtxoByTxIn,
   stubMaxSizeAddress,
   subtractTokenMaps,
   toValues
@@ -21,9 +23,9 @@ import {
   SelectionResult
 } from '../types';
 import { InputSelectionError, InputSelectionFailure } from '../InputSelectionError';
-import { MAX_U64 } from '../RoundRobinRandomImprove';
-import { computeChangeAndAdjustForFee } from '../RoundRobinRandomImprove/change';
-import { sortUtxoByTxIn } from '../GreedySelection';
+
+import { computeChangeAndAdjustForFee } from '../change';
+
 import uniq from 'lodash/uniq.js';
 
 const DETERMINISTIC_RANDOM: typeof Math.random = () => 0;

packages/input-selection/src/RoundRobinRandomImprove/index.ts

@@ -2,12 +2,16 @@ import { Cardano } from '@cardano-sdk/core';
 import { ChangeAddressResolver } from '../ChangeAddress';
 import { InputSelectionError, InputSelectionFailure } from '../InputSelectionError';
 import { InputSelectionParameters, InputSelector, SelectionResult } from '../types';
-import { assertIsBalanceSufficient, preProcessArgs, stubMaxSizeAddress, toValues } from '../util';
-import { computeChangeAndAdjustForFee } from './change';
+import {
+  MAX_U64,
+  assertIsBalanceSufficient,
+  preProcessArgs,
+  sortUtxoByTxIn,
+  stubMaxSizeAddress,
+  toValues
+} from '../util';
+import { computeChangeAndAdjustForFee } from '../change';
 import { roundRobinSelection } from './roundRobin';
-import { sortUtxoByTxIn } from '../GreedySelection';
-
-export const MAX_U64 = 18_446_744_073_709_551_615n;
 
 interface RoundRobinRandomImproveOptions {
   changeAddressResolver: ChangeAddressResolver;

packages/input-selection/src/RoundRobinRandomImprove/change.ts renamed to packages/input-selection/src/change.ts

@@ -1,14 +1,14 @@
 import { Cardano, coalesceValueQuantities } from '@cardano-sdk/core';
-import { ComputeMinimumCoinQuantity, TokenBundleSizeExceedsLimit, TxCosts } from '../types';
-import { InputSelectionError, InputSelectionFailure } from '../InputSelectionError';
+import { ComputeMinimumCoinQuantity, TokenBundleSizeExceedsLimit, TxCosts } from './types';
+import { InputSelectionError, InputSelectionFailure } from './InputSelectionError';
 import {
   RequiredImplicitValue,
   UtxoSelection,
   assetQuantitySelector,
   getCoinQuantity,
   stubMaxSizeAddress,
   toValues
-} from '../util';
+} from './util';
 import minBy from 'lodash/minBy.js';
 import orderBy from 'lodash/orderBy.js';
 import pick from 'lodash/pick.js';

packages/input-selection/src/util.ts

@@ -6,10 +6,33 @@ import { ComputeMinimumCoinQuantity, ImplicitValue, TokenBundleSizeExceedsLimit
 import { InputSelectionError, InputSelectionFailure } from './InputSelectionError';
 import uniq from 'lodash/uniq.js';
 
+export const MAX_U64 = 18_446_744_073_709_551_615n;
+
 export const stubMaxSizeAddress = Cardano.PaymentAddress(
   'addr_test1qqydn46r6mhge0kfpqmt36m6q43knzsd9ga32n96m89px3nuzcjqw982pcftgx53fu5527z2cj2tkx2h8ux2vxsg475qypp3m9'
 );
 
+/**
+ * Sorts the given TxIn set first by txId and then by index.
+ *
+ * @param lhs The left-hand side of the comparison operation.
+ * @param rhs The left-hand side of the comparison operation.
+ */
+export const sortTxIn = (lhs: Cardano.TxIn, rhs: Cardano.TxIn) => {
+  const txIdComparison = lhs.txId.localeCompare(rhs.txId);
+  if (txIdComparison !== 0) return txIdComparison;
+
+  return lhs.index - rhs.index;
+};
+
+/**
+ * Sorts the given Utxo set first by TxIn.
+ *
+ * @param lhs The left-hand side of the comparison operation.
+ * @param rhs The left-hand side of the comparison operation.
+ */
+export const sortUtxoByTxIn = (lhs: Cardano.Utxo, rhs: Cardano.Utxo) => sortTxIn(lhs[0], rhs[0]);
+
 export interface ImplicitTokens {
   spend(assetId: Cardano.AssetId): bigint;
   input(assetId: Cardano.AssetId): bigint;

packages/input-selection/test/change.test.ts

@@ -1,5 +1,5 @@
 import { Cardano } from '@cardano-sdk/core';
-import { coalesceChangeBundlesForMinCoinRequirement } from '../src/RoundRobinRandomImprove/change';
+import { coalesceChangeBundlesForMinCoinRequirement } from '../src/change';
 
 const TOKEN1_ASSET_ID = Cardano.AssetId('5c677ba4dd295d9286e0e22786fea9ed735a6ae9c07e7a45ae4d95c84249530000');
 const TOKEN2_ASSET_ID = Cardano.AssetId('5c677ba4dd295d9286e0e22786fea9ed735a6ae9c07e7a45ae4d95c84249530001');