Merge branch 'staging' into development

.github/workflows/node.js.yml

@@ -3,15 +3,15 @@
 
 name: Node.js CI
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   tests:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [20.x, 16.x, 18.x]
+        node-version: [18.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

.github/workflows/nutshell-integration.yml

@@ -8,7 +8,7 @@ jobs:
     steps:
       - name: Pull and start mint
         run: |
-          docker run -d -p 3338:3338 --name nutshell -e MINT_LIGHTNING_BACKEND=FakeWallet -e MINT_LISTEN_HOST=0.0.0.0 -e MINT_LISTEN_PORT=3338 -e MINT_PRIVATE_KEY=TEST_PRIVATE_KEY cashubtc/nutshell:0.15.1 poetry run mint
+          docker run -d -p 3338:3338 --name nutshell -e MINT_LIGHTNING_BACKEND=FakeWallet -e MINT_LISTEN_HOST=0.0.0.0 -e MINT_LISTEN_PORT=3338 -e MINT_PRIVATE_KEY=TEST_PRIVATE_KEY cashubtc/nutshell:0.15.2 poetry run mint
 
       - name: Check running containers
         run: docker ps

README.md

@@ -44,34 +44,23 @@ Supported token formats:
 
 ## Usage
 
-Go to the [docs](https://cashubtc.github.io/cashu-ts/docs) for detailed usage.
+Go to the [docs](https://cashubtc.github.io/cashu-ts/docs) for detailed usage, or have a look at the [integration tests](./test/integration.test.ts) for examples on how to implement a wallet.
 
 ### Install
 
 ```shell
 npm i @cashu/cashu-ts
 ```
 
-### Import
+### Example
 
 ```typescript
 import { CashuMint, CashuWallet, getEncodedToken } from '@cashu/cashu-ts';
 
-const wallet = new CashuWallet(new CashuMint('{MINT_URL}'));
-
-const { pr, hash } = await wallet.requestMint(200);
-
-//pay this LN invoice
-console.log({ pr }, { hash });
-
-async function invoiceHasBeenPaid() {
-	const { proofs } = await wallet.requestTokens(200, hash);
-	//Encoded proofs can be spent at the mint
-	const encoded = getEncodedToken({
-		token: [{ mint: '{MINT_URL}', proofs }]
-	});
-	console.log(encoded);
-}
+const mint = new CashuMint(mintUrl);
+const wallet = new CashuWallet(mint);
+const request = await wallet.getMintQuote(64);
+const tokens = await wallet.mintTokens(64, request.quote);
 ```
 
 ## Contribute

migration-1.0.0.md

@@ -0,0 +1,106 @@
+# Version 1.0.0 Migration guide
+
+⚠️ Upgrading to version 1.0.0 will come with breaking changes! Please follow the migration guide for a smooth transition to the new version.
+
+## Context
+
+In Version 1.0.0 the api version of mints has been upgraded to `v1`. Please read the `v1` [v1 cleanup PR](https://github.com/cashubtc/nuts/pull/55) to understand more about how the API has changed.
+
+## Breaking changes
+
+### ⚠️ Important! When upgrading to this version, the `hash2curve` function and the `default secret format` have changed. This means deterministic secret derivation will produce NOT THE SAME SECRETS as before. When upgrading to this version, wallets that have been using deterministic secrets (seed phrase) must reset counters and then `self spend`/`refresh` all proofs, so that the backups continue working.
+
+---
+
+### Decoding LN invoices
+
+**Removed LN invoice decode:**
+Decoding LN invoices is no longer used inside the lib.
+
+**How to fix:** If you need to decode LN invoices, you can use
+
+> npm i [@gandlaf21/bolt11-decode](https://www.npmjs.com/package/@gandlaf21/bolt11-decode)
+
+---
+
+### `CashuWallet` interface changes
+
+**optional function AND constructor parameters are now in an onpional `options?` Object**
+
+Utility functions now have an `options` object for optional parameters, instead of passing them directly
+
+**`requestMint(amount: number)` --> `getMintQuote(amount: number)`**
+Now returns the following:
+
+```typescript
+type MintQuoteResponse = {
+	request: string;
+	quote: string;
+};
+```
+
+where `request` is the invoice to be paid, and `quote` is the identifier used to pass to `mintTokens()`.
+
+**`requestTokens()` --> `mintTokens()`**
+
+---
+
+**`getMeltQuote(invoice: string)`** is now used to get fee estimation and conversion quotes instead of `getFee()` and returns:
+
+```typescript
+type MeltQuoteResponse = {
+	quote: string;
+	amount: number;
+	fee_reserve: number;
+};
+```
+
+where `quote` is the identifier to pass to `meltTokens()`
+
+---
+
+### Model changes
+
+**`MintKeys`--> `Keys`**:
+`MintKeys` now include the `keys`, `id` and `unit`
+
+```typescript
+type MintKeys = {
+	id: string;
+	unit: string;
+	keys: Keys;
+};
+
+type Keys = { [amount: number]: string };
+```
+
+---
+
+**`MintKeyset`**:
+Used to be a string array, but now contains the additional fields `active` and `unit`
+
+```typescript
+type MintKeyset = {
+	id: string;
+	unit: string;
+	active: boolean;
+};
+```
+
+---
+
+**`BlindedMessages`:** now include the field `id`, corresponding with the mints `keysetId`
+
+```typescript
+type BlindedMessage {
+	amount: number;
+	B_: ProjPointType<bigint>;
+	id: string;
+}
+```
+
+---
+
+### Pattern changes
+
+**removed `newKeys` from returns**: Functions no longer return `newKeys`. Wallets now specify the keyset they use in the BlindedMessage via the `id` field.

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cashu/cashu-ts",
-	"version": "0.9.0",
+	"version": "1.0.0-rc.4",
 	"description": "cashu library for communicating with a cashu mint",
 	"main": "dist/lib/es5/index.js",
 	"module": "dist/lib/es6/index.js",
@@ -46,7 +46,7 @@
 		"typescript": "^5.0.4"
 	},
 	"dependencies": {
-		"@gandlaf21/bolt11-decode": "^3.0.6",
+		"@cashu/crypto": "^0.2.6",
 		"@noble/curves": "^1.3.0",
 		"@noble/hashes": "^1.3.3",
 		"@scure/bip32": "^1.3.3",