owrks

src/CashuWallet.ts

@@ -26,7 +26,8 @@ import {
 import {
  bytesToNumber,
  getDecodedToken,
- splitAmount
+ splitAmount,
+ deprecatedPreferenceToOutputAmounts
 } from './utils.js';
 import { validateMnemonic } from '@scure/bip39';
 import { wordlist } from '@scure/bip39/wordlists/english';
@@ -132,6 +133,7 @@ class CashuWallet {
  privkey?: string;
  }
  ): Promise<Array<Proof>> {
+ if (options?.preference) options.outputAmounts = deprecatedPreferenceToOutputAmounts(options.preference);
  try {
  if (typeof token === 'string') {
  token = getDecodedToken(token);
@@ -170,6 +172,7 @@ class CashuWallet {
  privkey?: string;
  }
  ): Promise<Array<Proof>> {
+ if (options?.preference) options.outputAmounts = deprecatedPreferenceToOutputAmounts(options.preference);
  const proofs: Array<Proof> = [];
  try {
  const amount = tokenEntry.proofs.reduce((total, curr) => total + curr.amount, 0);
@@ -222,6 +225,7 @@ class CashuWallet {
  keysetId?: string;
  }
  ): Promise<SendResponse> {
+ if (options?.preference) options.outputAmounts = deprecatedPreferenceToOutputAmounts(options.preference);
  const keyset = await this.getKeys(options?.keysetId);
  let amountAvailable = 0;
  const proofsToSend: Array<Proof> = [];
@@ -361,7 +365,6 @@ class CashuWallet {
  * @param amount amount to request
  * @param quote ID of mint quote
  * @param options.keysetId? optionally set keysetId for blank outputs for returned change.
- * @deprecated
  * @param preference? Deprecated. Use `outputAmounts` instead. Optional preference for splitting proofs into specific amounts.
  * @param outputAmounts? optionally specify the output's amounts to keep and to send.
  * @param counter? optionally set counter to derive secret deterministically. CashuWallet class must be initialized with seed phrase to take effect
@@ -379,6 +382,7 @@ class CashuWallet {
  pubkey?: string;
  }
  ): Promise<{ proofs: Array<Proof> }> {
+ if (options?.preference) options.outputAmounts = deprecatedPreferenceToOutputAmounts(options.preference);
  const keyset = await this.getKeys(options?.keysetId);
  const { blindedMessages, secrets, rs } = this.createRandomBlindedMessages(
  amount,

src/utils.ts

@@ -1,5 +1,5 @@
 import { encodeBase64ToJson, encodeBase64toUint8, encodeJsonToBase64 } from './base64.js';
-import { AmountPreference, Keys, Proof, Token, TokenEntry, TokenV2 } from './model/types/index.js';
+import { AmountPreference, Keys, OutputAmounts, Proof, Token, TokenEntry, TokenV2 } from './model/types/index.js';
 import { TOKEN_PREFIX, TOKEN_VERSION } from './utils/Constants.js';
 import { bytesToHex, hexToBytes } from '@noble/curves/abstract/utils';
 import { sha256 } from '@noble/hashes/sha256';
@@ -13,6 +13,9 @@ function splitAmount(
 ): Array<number> {
  const chunks: Array<number> = [];
  if (split) {
+ if (split.reduce((a, b) => a + b, 0) > value) {
+ throw new Error('Split amount is greater than the value');
+ }
  chunks.push(...getPreference(value, keyset, split));
  value =
  value -
@@ -45,23 +48,24 @@ function getPreference(
  split: Array<number>
 ): Array<number> {
  const chunks: Array<number> = [];
- let accumulator = 0;
  split.forEach((splitAmount) => {
  if (!hasCorrespondingKey(splitAmount, keyset)) {
  throw new Error('Provided amount preferences do not match the amounts of the mint keyset.');
  }
- const count = split.filter(value => value === splitAmount).length;
- for (let i = 1; i <= count; i++) {
- accumulator += splitAmount;
- if (accumulator > amount) {
- return;
- }
- chunks.push(splitAmount);
- }
+ chunks.push(splitAmount);
  });
  return chunks;
 }
 
+function deprecatedPreferenceToOutputAmounts(preference?: Array<AmountPreference>): OutputAmounts {
+ const sendAmounts: Array<number> = [];
+ preference?.forEach(({ count, amount }) => {
+ for (let i = 0; i < count; i++) {
+ sendAmounts.push(amount);
+ }
+ });
+ return { sendAmounts };
+}
 function bytesToNumber(bytes: Uint8Array): bigint {
  return hexToNumber(bytesToHex(bytes));
 }
@@ -189,4 +193,5 @@ export {
  getEncodedToken,
  hexToNumber,
  splitAmount,
+ deprecatedPreferenceToOutputAmounts,
 };

test/utils.test.ts

@@ -39,11 +39,19 @@ describe('test split custom amounts ', () => {
  const chunks = utils.splitAmount(10, keys, tenToOneAndTwo);
  expect(chunks).toStrictEqual([1, 1, 2, 2, 2, 2]);
  });
- const fiveTwelve = [512, 512];
+ test('testing amount 12', async () => {
+ const chunks = utils.splitAmount(12, keys, tenToOneAndTwo);
+ expect(chunks).toStrictEqual([1, 1, 2, 2, 2, 2, 2]);
+ });
+ const fiveTwelve = [512];
  test('testing amount 518', async () => {
  const chunks = utils.splitAmount(518, keys, fiveTwelve, 'desc');
  expect(chunks).toStrictEqual([512, 4, 2]);
  });
+ const tooMuch = [512, 512];
+ test('testing amount 512 but split too much', async () => {
+ expect(() => utils.splitAmount(512, keys, tooMuch)).toThrowError();
+ });
  const illegal = [3, 3];
  test('testing non pow2', async () => {
  expect(() => utils.splitAmount(6, keys, illegal)).toThrowError();