import and use @cash/crypto library; remove dhke import; add private …

…function constructProofs;

src/CashuWallet.ts

@@ -1,6 +1,5 @@
 import { bytesToHex, randomBytes } from '@noble/hashes/utils';
 import { CashuMint } from './CashuMint.js';
-import * as dhke from './DHKE.js';
 import { BlindedMessage } from './model/BlindedMessage.js';
 import {
 	type AmountPreference,
@@ -20,7 +19,8 @@ import {
 	type SplitPayload,
 	type Token,
 	type TokenEntry,
-	CheckStateEnum
+	CheckStateEnum,
+	SerializedBlindedSignature
 } from './model/types/index.js';
 import {
 	bytesToNumber,
@@ -32,10 +32,14 @@ import {
 import { deriveBlindingFactor, deriveSecret, deriveSeedFromMnemonic } from './secrets.js';
 import { validateMnemonic } from '@scure/bip39';
 import { wordlist } from '@scure/bip39/wordlists/english';
+import { hashToCurve, pointFromHex } from '@cashu/crypto/modules/common';
+import {
+	blindMessage,
+	constructProofFromPromise,
+	serializeProof
+} from '@cashu/crypto/modules/client';
 import { createP2PKsecret, getSignedProofs } from '@cashu/crypto/modules/client/NUT11';
 import { type Proof as NUT11Proof } from '@cashu/crypto/modules/common/index';
-import { serializeProof } from '@cashu/crypto/modules/client';
-import { pointFromHex } from './DHKE';
 
 /**
  * Class that represents a Cashu wallet.
@@ -189,7 +193,7 @@ class CashuWallet {
 				options?.privkey
 			);
 			const { signatures } = await CashuMint.split(tokenEntry.mint, payload);
-			const newProofs = dhke.constructProofs(
+			const newProofs = this.constructProofs(
 				signatures,
 				blindedMessages.rs,
 				blindedMessages.secrets,
@@ -260,7 +264,7 @@ class CashuWallet {
 				options?.privkey
 			);
 			const { signatures } = await this.mint.split(payload);
-			const proofs = dhke.constructProofs(
+			const proofs = this.constructProofs(
 				signatures,
 				blindedMessages.rs,
 				blindedMessages.secrets,
@@ -316,7 +320,7 @@ class CashuWallet {
 		);
 
 		return {
-			proofs: dhke.constructProofs(promises, validRs, validSecrets, keys)
+			proofs: this.constructProofs(promises, validRs, validSecrets, keys)
 		};
 	}
 
@@ -387,7 +391,7 @@ class CashuWallet {
 		};
 		const { signatures } = await this.mint.mint(mintPayload);
 		return {
-			proofs: dhke.constructProofs(signatures, rs, secrets, keyset)
+			proofs: this.constructProofs(signatures, rs, secrets, keyset)
 		};
 	}
 
@@ -435,7 +439,7 @@ class CashuWallet {
 			isPaid: meltResponse.paid ?? false,
 			preimage: meltResponse.payment_preimage,
 			change: meltResponse?.change
-				? dhke.constructProofs(meltResponse.change, rs, secrets, keys)
+				? this.constructProofs(meltResponse.change, rs, secrets, keys)
 				: []
 		};
 	}
@@ -572,7 +576,7 @@ class CashuWallet {
 	 */
 	async checkProofsSpent<T extends { secret: string }>(proofs: Array<T>): Promise<Array<T>> {
 		const enc = new TextEncoder();
-		const Ys = proofs.map((p) => dhke.hashToCurve(enc.encode(p.secret)).toHex(true));
+		const Ys = proofs.map((p) => hashToCurve(enc.encode(p.secret)).toHex(true));
 		const payload = {
 			// array of Ys of proofs to check
 			Ys: Ys
@@ -652,7 +656,7 @@ class CashuWallet {
 				secretBytes = new TextEncoder().encode(secretHex);
 			}
 			secrets.push(secretBytes);
-			const { B_, r } = dhke.blindMessage(secretBytes, deterministicR);
+			const { B_, r } = blindMessage(secretBytes, deterministicR);
 			rs.push(r);
 			const blindedMessage = new BlindedMessage(amounts[i], B_, keysetId);
 			blindedMessages.push(blindedMessage.getSerializedBlindedMessage());
@@ -682,6 +686,31 @@ class CashuWallet {
 		const { blindedMessages, rs, secrets } = this.createBlindedMessages(amounts, keysetId, counter);
 		return { blindedMessages, secrets, rs };
 	}
+
+	/**
+	 * construct proofs from @params promises, @params rs, @params secrets, and @params keyset
+	 * @param promises array of serialized blinded signatures
+	 * @param rs arrays of binding factors
+	 * @param secrets array of secrets
+	 * @param keyset mint keyset
+	 * @returns array of serialized proofs
+	 */
+	private constructProofs(
+		promises: Array<SerializedBlindedSignature>,
+		rs: Array<bigint>,
+		secrets: Array<Uint8Array>,
+		keyset: MintKeys
+	): Array<Proof> {
+		return promises
+			.map((p: SerializedBlindedSignature, i: number) => {
+				const blindSignature = { id: p.id, amount: p.amount, C_: pointFromHex(p.C_) };
+				const r = rs[i];
+				const secret = secrets[i];
+				const A = pointFromHex(keyset.keys[p.amount]);
+				return constructProofFromPromise(blindSignature, r, secret, A);
+			})
+			.map((p) => serializeProof(p) as Proof);
+	}
 }
 
 export { CashuWallet };

test/secrets.test.ts

@@ -1,7 +1,6 @@
 import { bytesToHex } from '@noble/curves/abstract/utils';
 import { deriveSeedFromMnemonic } from '../src/secrets';
 import { deriveBlindingFactor, deriveSecret } from '../src/secrets';
-import { blindMessage } from '../src/DHKE';
 import { HDKey } from '@scure/bip32';
 
 const mnemonic = 'half depart obvious quality work element tank gorilla view sugar picture humble';