Merge pull request cashubtc#123 from gudnuf/bug/send_keysetId

Bug/send keyset + make meltQuote optional in payLnInvoice
lollerfirst · May 20, 2024 · 8653951 · 8653951
2 parents 39cbb8f + b60254e
commit 8653951
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/CashuWallet.ts b/src/CashuWallet.ts
@@ -226,6 +226,7 @@ class CashuWallet {
 			counter?: number;
 			pubkey?: string;
 			privkey?: string;
+			keysetId?: string;
 		}
 	): Promise<SendResponse> {
 		if (options?.preference) {
@@ -323,7 +324,7 @@ class CashuWallet {
 	 * Initialize the wallet with the mints public keys
 	 */
 	private async getKeys(keysetId?: string, unit?: string): Promise<MintKeys> {
-		if (!this._keys || this._keys.id !== keysetId) {
+		if (!this._keys || (keysetId !== undefined && this._keys.id !== keysetId)) {
 			const allKeys = await this.mint.getKeys(keysetId);
 			let keys;
 			if (keysetId) {
@@ -452,7 +453,7 @@ class CashuWallet {
 	async payLnInvoice(
 		invoice: string,
 		proofsToSend: Array<Proof>,
-		meltQuote: MeltQuoteResponse,
+		meltQuote?: MeltQuoteResponse,
 		options?: {
 			keysetId?: string;
 			counter?: number;

diff --git a/src/model/types/index.ts b/src/model/types/index.ts
@@ -389,8 +389,8 @@ export type Token = {
 	 */
 	memo?: string;
 	/**
-	  * the unit of the token
-	  */
+	 * the unit of the token
+	 */
 	unit?: string;
 };
 /**