From 48a00c97f9e3ecb8c20efd4ae645e825ed26857f Mon Sep 17 00:00:00 2001
From: Egge21M <Egge21M@users.noreply.github.com>
Date: Thu, 31 Oct 2024 08:04:25 +0000
Subject: [PATCH] deploy: 4b6458b0a376c080d8d8db703f7ed3bc512eb8dd

---
 coverage/staging/index.html                   |   58 +-
 coverage/staging/src/CashuMint.ts.html        |  106 +-
 coverage/staging/src/CashuWallet.ts.html      | 1719 ++++++++++++-----
 coverage/staging/src/base64.ts.html           |    8 +-
 coverage/staging/src/cbor.ts.html             |    2 +-
 coverage/staging/src/index.html               |   82 +-
 coverage/staging/src/index.ts.html            |   21 +-
 coverage/staging/src/legacy/cashu-ts.ts.html  |  154 --
 coverage/staging/src/legacy/index.html        |   51 +-
 coverage/staging/src/legacy/nut-04.ts.html    |    2 +-
 coverage/staging/src/legacy/nut-05.ts.html    |   30 +-
 coverage/staging/src/legacy/nut-06.ts.html    |   10 +-
 .../staging/src/model/BlindedMessage.ts.html  |   10 +-
 coverage/staging/src/model/Errors.ts.html     |    2 +-
 .../staging/src/model/PaymentRequest.ts.html  |    2 +-
 coverage/staging/src/model/index.html         |    2 +-
 coverage/staging/src/model/types/index.html   |    2 +-
 .../staging/src/model/types/index.ts.html     |   20 +-
 .../staging/src/model/types/mint/index.html   |    2 +-
 .../src/model/types/mint/index.ts.html        |    2 +-
 .../src/model/types/mint/responses.ts.html    |    6 +-
 .../staging/src/model/types/wallet/index.html |    2 +-
 .../src/model/types/wallet/index.ts.html      |   19 +-
 .../types/wallet/paymentRequests.ts.html      |    2 +-
 coverage/staging/src/request.ts.html          |   24 +-
 coverage/staging/src/utils.ts.html            |  618 ++++--
 coverage/staging/src/utils/Constants.ts.html  |    2 +-
 coverage/staging/src/utils/index.html         |    2 +-
 coverage/staging/test/consts.ts.html          |    2 +-
 coverage/staging/test/index.html              |    2 +-
 30 files changed, 1870 insertions(+), 1094 deletions(-)
 delete mode 100644 coverage/staging/src/legacy/cashu-ts.ts.html

diff --git a/coverage/staging/index.html b/coverage/staging/index.html
index 101959f6..9ae9f665 100644
--- a/coverage/staging/index.html
+++ b/coverage/staging/index.html
@@ -23,30 +23,30 @@ <h1>All files</h1>
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">78.72% </span>
+                <span class="strong">76.69% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>692/879</span>
+                <span class='fraction'>790/1030</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">64.12% </span>
+                <span class="strong">62.23% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>336/524</span>
+                <span class='fraction'>384/617</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">68.36% </span>
+                <span class="strong">72.11% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>121/177</span>
+                <span class='fraction'>150/208</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">78.77% </span>
+                <span class="strong">76.81% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>616/782</span>
+                <span class='fraction'>699/910</span>
             </div>
         
             
@@ -80,32 +80,32 @@ <h1>All files</h1>
 </thead>
 <tbody><tr>
 	<td class="file medium" data-value="src"><a href="src/index.html">src</a></td>
-	<td data-value="77.14" class="pic medium">
-	<div class="chart"><div class="cover-fill" style="width: 77%"></div><div class="cover-empty" style="width: 23%"></div></div>
+	<td data-value="75.19" class="pic medium">
+	<div class="chart"><div class="cover-fill" style="width: 75%"></div><div class="cover-empty" style="width: 25%"></div></div>
 	</td>
-	<td data-value="77.14" class="pct medium">77.14%</td>
-	<td data-value="757" class="abs medium">584/757</td>
-	<td data-value="64.27" class="pct medium">64.27%</td>
-	<td data-value="473" class="abs medium">304/473</td>
-	<td data-value="67.1" class="pct medium">67.1%</td>
-	<td data-value="152" class="abs medium">102/152</td>
-	<td data-value="77.04" class="pct medium">77.04%</td>
-	<td data-value="671" class="abs medium">517/671</td>
+	<td data-value="75.19" class="pct medium">75.19%</td>
+	<td data-value="919" class="abs medium">691/919</td>
+	<td data-value="61.67" class="pct medium">61.67%</td>
+	<td data-value="574" class="abs medium">354/574</td>
+	<td data-value="70.58" class="pct medium">70.58%</td>
+	<td data-value="187" class="abs medium">132/187</td>
+	<td data-value="75.18" class="pct medium">75.18%</td>
+	<td data-value="806" class="abs medium">606/806</td>
 	</tr>
 
 <tr>
 	<td class="file medium" data-value="src/legacy"><a href="src/legacy/index.html">src/legacy</a></td>
-	<td data-value="69.69" class="pic medium">
-	<div class="chart"><div class="cover-fill" style="width: 69%"></div><div class="cover-empty" style="width: 31%"></div></div>
+	<td data-value="63.63" class="pic medium">
+	<div class="chart"><div class="cover-fill" style="width: 63%"></div><div class="cover-empty" style="width: 37%"></div></div>
 	</td>
-	<td data-value="69.69" class="pct medium">69.69%</td>
-	<td data-value="33" class="abs medium">23/33</td>
-	<td data-value="50" class="pct medium">50%</td>
-	<td data-value="32" class="abs medium">16/32</td>
-	<td data-value="50" class="pct medium">50%</td>
-	<td data-value="8" class="abs medium">4/8</td>
-	<td data-value="68.96" class="pct medium">68.96%</td>
-	<td data-value="29" class="abs medium">20/29</td>
+	<td data-value="63.63" class="pct medium">63.63%</td>
+	<td data-value="22" class="abs medium">14/22</td>
+	<td data-value="58.33" class="pct medium">58.33%</td>
+	<td data-value="24" class="abs medium">14/24</td>
+	<td data-value="75" class="pct medium">75%</td>
+	<td data-value="4" class="abs medium">3/4</td>
+	<td data-value="63.63" class="pct medium">63.63%</td>
+	<td data-value="22" class="abs medium">14/22</td>
 	</tr>
 
 <tr>
@@ -206,7 +206,7 @@ <h1>All files</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/CashuMint.ts.html b/coverage/staging/src/CashuMint.ts.html
index d8e951a1..446023ea 100644
--- a/coverage/staging/src/CashuMint.ts.html
+++ b/coverage/staging/src/CashuMint.ts.html
@@ -23,16 +23,16 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuMi
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">71.54% </span>
+                <span class="strong">68.29% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>88/123</span>
+                <span class='fraction'>84/123</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">55.08% </span>
+                <span class="strong">50% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>65/118</span>
+                <span class='fraction'>59/118</span>
             </div>
         
             
@@ -44,9 +44,9 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuMi
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">71.81% </span>
+                <span class="strong">69.09% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>79/110</span>
+                <span class='fraction'>76/110</span>
             </div>
         
             
@@ -608,7 +608,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuMi
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -755,15 +755,15 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuMi
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -774,7 +774,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuMi
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -782,7 +782,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuMi
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -797,24 +797,24 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuMi
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -822,7 +822,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuMi
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -863,20 +863,20 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuMi
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
+<span class="cline-any cline-yes">13x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">13x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
-<span class="cline-any cline-yes">18x</span>
+<span class="cline-any cline-yes">13x</span>
+<span class="cline-any cline-yes">13x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
+<span class="cline-any cline-yes">13x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
+<span class="cline-any cline-yes">13x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -884,12 +884,12 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuMi
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">18x</span>
+<span class="cline-any cline-yes">13x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
+<span class="cline-any cline-yes">13x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -901,8 +901,8 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuMi
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">13x</span>
+<span class="cline-any cline-yes">13x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -910,7 +910,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuMi
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">13x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1027,7 +1027,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuMi
 	 * @param customRequest
 	 * @returns signed outputs
 	 */
-	public static async split(
+	public static async swap(
 		mintUrl: string,
 		swapPayload: SwapPayload,
 		customRequest?: typeof request
@@ -1050,8 +1050,8 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuMi
 	 * @param swapPayload payload containing inputs and outputs
 	 * @returns signed outputs
 	 */
-	async split(swapPayload: SwapPayload): Promise&lt;SwapResponse&gt; {
-		return CashuMint.split(this._mintUrl, swapPayload, this._customRequest);
+	async swap(swapPayload: SwapPayload): Promise&lt;SwapResponse&gt; {
+		return CashuMint.swap(this._mintUrl, swapPayload, this._customRequest);
 	}
 &nbsp;
 	/**
@@ -1235,37 +1235,37 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuMi
 	 * @param customRequest
 	 * @returns
 	 */
-	public static async melt(
+<span class="fstat-no" title="function not covered" >	public static async m</span>elt(
 		mintUrl: string,
 		meltPayload: MeltPayload,
 		customRequest?: typeof request
 	): Promise&lt;MeltQuoteResponse&gt; {
-		const requestInstance = customRequest || request;
-		const response = await requestInstance&lt;MeltQuoteResponse &amp; MeltQuoteResponsePaidDeprecated&gt;({
+		const <span class="cstat-no" title="statement not covered" >requestInstance = customRequest || request;</span>
+		const <span class="cstat-no" title="statement not covered" >response = <span class="cstat-no" title="statement not covered" >await requestInstance&lt;MeltQuoteResponse &amp; MeltQuoteResponsePaidDeprecated&gt;({</span></span>
 			endpoint: joinUrls(mintUrl, '/v1/melt/bolt11'),
 			method: 'POST',
 			requestBody: meltPayload
 		});
 &nbsp;
-		const data = handleMeltQuoteResponseDeprecated(response);
+		const <span class="cstat-no" title="statement not covered" >data = handleMeltQuoteResponseDeprecated(response);</span>
 &nbsp;
-		if (
+<span class="cstat-no" title="statement not covered" >		<span class="missing-if-branch" title="if path not taken" >I</span>if (</span>
 			!isObj(data) ||
-			typeof data<span class="branch-0 cbranch-no" title="branch not covered" >?.s</span>tate !== 'string' ||
+			typeof data?.state !== 'string' ||
 			!Object.values(MeltQuoteState).includes(data.state)
 		) {
-			throw new Error('bad response');
+<span class="cstat-no" title="statement not covered" >			throw new Error('bad response');</span>
 		}
 &nbsp;
-		return data;
+<span class="cstat-no" title="statement not covered" >		return data;</span>
 	}
 	/**
 	 * Ask mint to perform a melt operation. This pays a lightning invoice and destroys tokens matching its amount + fees
 	 * @param meltPayload
 	 * @returns
 	 */
-	async melt(meltPayload: MeltPayload): Promise&lt;MeltQuoteResponse&gt; {
-		return CashuMint.melt(this._mintUrl, meltPayload, this._customRequest);
+<span class="fstat-no" title="function not covered" >	async m</span>elt(meltPayload: MeltPayload): Promise&lt;MeltQuoteResponse&gt; {
+<span class="cstat-no" title="statement not covered" >		return CashuMint.melt(this._mintUrl, meltPayload, this._customRequest);</span>
 	}
 	/**
 	 * Checks if specific proofs have already been redeemed
@@ -1306,13 +1306,13 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuMi
 		customRequest?: typeof request
 	): Promise&lt;MintActiveKeys&gt; {
 		// backwards compatibility for base64 encoded keyset ids
-		<span class="missing-if-branch" title="if path not taken" >I</span>if (keysetId) {
+		if (keysetId) {
 			// make the keysetId url safe
-<span class="cstat-no" title="statement not covered" >			keysetId = keysetId.replace(/\//g, '_').replace(/\+/g, '-');</span>
+			keysetId = keysetId.replace(/\//g, '_').replace(/\+/g, '-');
 		}
 		const requestInstance = customRequest || request;
 		const data = await requestInstance&lt;MintActiveKeys&gt;({
-			endpoint: keysetId ? <span class="branch-0 cbranch-no" title="branch not covered" >joinUrls(mintUrl, '/v1/keys', keysetId) </span>: joinUrls(mintUrl, '/v1/keys')
+			endpoint: keysetId ? joinUrls(mintUrl, '/v1/keys', keysetId) : <span class="branch-1 cbranch-no" title="branch not covered" >joinUrls(mintUrl, '/v1/keys')</span>
 		});
 &nbsp;
 		<span class="missing-if-branch" title="if path not taken" >I</span>if (!isObj(data) || !Array.isArray(data.keysets)) {
@@ -1340,20 +1340,20 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuMi
 	 * @param customRequest
 	 * @returns all the mints past and current keysets.
 	 */
-<span class="fstat-no" title="function not covered" >	public static async g</span>etKeySets(
+	public static async getKeySets(
 		mintUrl: string,
 		customRequest?: typeof request
 	): Promise&lt;MintAllKeysets&gt; {
-		const <span class="cstat-no" title="statement not covered" >requestInstance = customRequest || request;</span>
-<span class="cstat-no" title="statement not covered" >		return requestInstance&lt;MintAllKeysets&gt;({ endpoint: joinUrls(mintUrl, '/v1/keysets') });</span>
+		const requestInstance = customRequest || request;
+		return requestInstance&lt;MintAllKeysets&gt;({ endpoint: joinUrls(mintUrl, '/v1/keysets') });
 	}
 &nbsp;
 	/**
 	 * Get the mints keysets in no specific order
 	 * @returns all the mints past and current keysets.
 	 */
-<span class="fstat-no" title="function not covered" >	async g</span>etKeySets(): Promise&lt;MintAllKeysets&gt; {
-<span class="cstat-no" title="statement not covered" >		return CashuMint.getKeySets(this._mintUrl, this._customRequest);</span>
+	async getKeySets(): Promise&lt;MintAllKeysets&gt; {
+		return CashuMint.getKeySets(this._mintUrl, this._customRequest);
 	}
 &nbsp;
 	/**
@@ -1399,7 +1399,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuMi
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/CashuWallet.ts.html b/coverage/staging/src/CashuWallet.ts.html
index 7f098705..1a3e8e32 100644
--- a/coverage/staging/src/CashuWallet.ts.html
+++ b/coverage/staging/src/CashuWallet.ts.html
@@ -23,30 +23,30 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">75.48% </span>
+                <span class="strong">70% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>194/257</span>
+                <span class='fraction'>259/370</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">71.42% </span>
+                <span class="strong">65.47% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>165/231</span>
+                <span class='fraction'>201/307</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">60.41% </span>
+                <span class="strong">59.42% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>29/48</span>
+                <span class='fraction'>41/69</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">75.78% </span>
+                <span class="strong">70.34% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>169/223</span>
+                <span class='fraction'>223/317</span>
             </div>
         
             
@@ -818,9 +818,235 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <a name='L753'></a><a href='#L753'>753</a>
 <a name='L754'></a><a href='#L754'>754</a>
 <a name='L755'></a><a href='#L755'>755</a>
-<a name='L756'></a><a href='#L756'>756</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">3x</span>
+<a name='L756'></a><a href='#L756'>756</a>
+<a name='L757'></a><a href='#L757'>757</a>
+<a name='L758'></a><a href='#L758'>758</a>
+<a name='L759'></a><a href='#L759'>759</a>
+<a name='L760'></a><a href='#L760'>760</a>
+<a name='L761'></a><a href='#L761'>761</a>
+<a name='L762'></a><a href='#L762'>762</a>
+<a name='L763'></a><a href='#L763'>763</a>
+<a name='L764'></a><a href='#L764'>764</a>
+<a name='L765'></a><a href='#L765'>765</a>
+<a name='L766'></a><a href='#L766'>766</a>
+<a name='L767'></a><a href='#L767'>767</a>
+<a name='L768'></a><a href='#L768'>768</a>
+<a name='L769'></a><a href='#L769'>769</a>
+<a name='L770'></a><a href='#L770'>770</a>
+<a name='L771'></a><a href='#L771'>771</a>
+<a name='L772'></a><a href='#L772'>772</a>
+<a name='L773'></a><a href='#L773'>773</a>
+<a name='L774'></a><a href='#L774'>774</a>
+<a name='L775'></a><a href='#L775'>775</a>
+<a name='L776'></a><a href='#L776'>776</a>
+<a name='L777'></a><a href='#L777'>777</a>
+<a name='L778'></a><a href='#L778'>778</a>
+<a name='L779'></a><a href='#L779'>779</a>
+<a name='L780'></a><a href='#L780'>780</a>
+<a name='L781'></a><a href='#L781'>781</a>
+<a name='L782'></a><a href='#L782'>782</a>
+<a name='L783'></a><a href='#L783'>783</a>
+<a name='L784'></a><a href='#L784'>784</a>
+<a name='L785'></a><a href='#L785'>785</a>
+<a name='L786'></a><a href='#L786'>786</a>
+<a name='L787'></a><a href='#L787'>787</a>
+<a name='L788'></a><a href='#L788'>788</a>
+<a name='L789'></a><a href='#L789'>789</a>
+<a name='L790'></a><a href='#L790'>790</a>
+<a name='L791'></a><a href='#L791'>791</a>
+<a name='L792'></a><a href='#L792'>792</a>
+<a name='L793'></a><a href='#L793'>793</a>
+<a name='L794'></a><a href='#L794'>794</a>
+<a name='L795'></a><a href='#L795'>795</a>
+<a name='L796'></a><a href='#L796'>796</a>
+<a name='L797'></a><a href='#L797'>797</a>
+<a name='L798'></a><a href='#L798'>798</a>
+<a name='L799'></a><a href='#L799'>799</a>
+<a name='L800'></a><a href='#L800'>800</a>
+<a name='L801'></a><a href='#L801'>801</a>
+<a name='L802'></a><a href='#L802'>802</a>
+<a name='L803'></a><a href='#L803'>803</a>
+<a name='L804'></a><a href='#L804'>804</a>
+<a name='L805'></a><a href='#L805'>805</a>
+<a name='L806'></a><a href='#L806'>806</a>
+<a name='L807'></a><a href='#L807'>807</a>
+<a name='L808'></a><a href='#L808'>808</a>
+<a name='L809'></a><a href='#L809'>809</a>
+<a name='L810'></a><a href='#L810'>810</a>
+<a name='L811'></a><a href='#L811'>811</a>
+<a name='L812'></a><a href='#L812'>812</a>
+<a name='L813'></a><a href='#L813'>813</a>
+<a name='L814'></a><a href='#L814'>814</a>
+<a name='L815'></a><a href='#L815'>815</a>
+<a name='L816'></a><a href='#L816'>816</a>
+<a name='L817'></a><a href='#L817'>817</a>
+<a name='L818'></a><a href='#L818'>818</a>
+<a name='L819'></a><a href='#L819'>819</a>
+<a name='L820'></a><a href='#L820'>820</a>
+<a name='L821'></a><a href='#L821'>821</a>
+<a name='L822'></a><a href='#L822'>822</a>
+<a name='L823'></a><a href='#L823'>823</a>
+<a name='L824'></a><a href='#L824'>824</a>
+<a name='L825'></a><a href='#L825'>825</a>
+<a name='L826'></a><a href='#L826'>826</a>
+<a name='L827'></a><a href='#L827'>827</a>
+<a name='L828'></a><a href='#L828'>828</a>
+<a name='L829'></a><a href='#L829'>829</a>
+<a name='L830'></a><a href='#L830'>830</a>
+<a name='L831'></a><a href='#L831'>831</a>
+<a name='L832'></a><a href='#L832'>832</a>
+<a name='L833'></a><a href='#L833'>833</a>
+<a name='L834'></a><a href='#L834'>834</a>
+<a name='L835'></a><a href='#L835'>835</a>
+<a name='L836'></a><a href='#L836'>836</a>
+<a name='L837'></a><a href='#L837'>837</a>
+<a name='L838'></a><a href='#L838'>838</a>
+<a name='L839'></a><a href='#L839'>839</a>
+<a name='L840'></a><a href='#L840'>840</a>
+<a name='L841'></a><a href='#L841'>841</a>
+<a name='L842'></a><a href='#L842'>842</a>
+<a name='L843'></a><a href='#L843'>843</a>
+<a name='L844'></a><a href='#L844'>844</a>
+<a name='L845'></a><a href='#L845'>845</a>
+<a name='L846'></a><a href='#L846'>846</a>
+<a name='L847'></a><a href='#L847'>847</a>
+<a name='L848'></a><a href='#L848'>848</a>
+<a name='L849'></a><a href='#L849'>849</a>
+<a name='L850'></a><a href='#L850'>850</a>
+<a name='L851'></a><a href='#L851'>851</a>
+<a name='L852'></a><a href='#L852'>852</a>
+<a name='L853'></a><a href='#L853'>853</a>
+<a name='L854'></a><a href='#L854'>854</a>
+<a name='L855'></a><a href='#L855'>855</a>
+<a name='L856'></a><a href='#L856'>856</a>
+<a name='L857'></a><a href='#L857'>857</a>
+<a name='L858'></a><a href='#L858'>858</a>
+<a name='L859'></a><a href='#L859'>859</a>
+<a name='L860'></a><a href='#L860'>860</a>
+<a name='L861'></a><a href='#L861'>861</a>
+<a name='L862'></a><a href='#L862'>862</a>
+<a name='L863'></a><a href='#L863'>863</a>
+<a name='L864'></a><a href='#L864'>864</a>
+<a name='L865'></a><a href='#L865'>865</a>
+<a name='L866'></a><a href='#L866'>866</a>
+<a name='L867'></a><a href='#L867'>867</a>
+<a name='L868'></a><a href='#L868'>868</a>
+<a name='L869'></a><a href='#L869'>869</a>
+<a name='L870'></a><a href='#L870'>870</a>
+<a name='L871'></a><a href='#L871'>871</a>
+<a name='L872'></a><a href='#L872'>872</a>
+<a name='L873'></a><a href='#L873'>873</a>
+<a name='L874'></a><a href='#L874'>874</a>
+<a name='L875'></a><a href='#L875'>875</a>
+<a name='L876'></a><a href='#L876'>876</a>
+<a name='L877'></a><a href='#L877'>877</a>
+<a name='L878'></a><a href='#L878'>878</a>
+<a name='L879'></a><a href='#L879'>879</a>
+<a name='L880'></a><a href='#L880'>880</a>
+<a name='L881'></a><a href='#L881'>881</a>
+<a name='L882'></a><a href='#L882'>882</a>
+<a name='L883'></a><a href='#L883'>883</a>
+<a name='L884'></a><a href='#L884'>884</a>
+<a name='L885'></a><a href='#L885'>885</a>
+<a name='L886'></a><a href='#L886'>886</a>
+<a name='L887'></a><a href='#L887'>887</a>
+<a name='L888'></a><a href='#L888'>888</a>
+<a name='L889'></a><a href='#L889'>889</a>
+<a name='L890'></a><a href='#L890'>890</a>
+<a name='L891'></a><a href='#L891'>891</a>
+<a name='L892'></a><a href='#L892'>892</a>
+<a name='L893'></a><a href='#L893'>893</a>
+<a name='L894'></a><a href='#L894'>894</a>
+<a name='L895'></a><a href='#L895'>895</a>
+<a name='L896'></a><a href='#L896'>896</a>
+<a name='L897'></a><a href='#L897'>897</a>
+<a name='L898'></a><a href='#L898'>898</a>
+<a name='L899'></a><a href='#L899'>899</a>
+<a name='L900'></a><a href='#L900'>900</a>
+<a name='L901'></a><a href='#L901'>901</a>
+<a name='L902'></a><a href='#L902'>902</a>
+<a name='L903'></a><a href='#L903'>903</a>
+<a name='L904'></a><a href='#L904'>904</a>
+<a name='L905'></a><a href='#L905'>905</a>
+<a name='L906'></a><a href='#L906'>906</a>
+<a name='L907'></a><a href='#L907'>907</a>
+<a name='L908'></a><a href='#L908'>908</a>
+<a name='L909'></a><a href='#L909'>909</a>
+<a name='L910'></a><a href='#L910'>910</a>
+<a name='L911'></a><a href='#L911'>911</a>
+<a name='L912'></a><a href='#L912'>912</a>
+<a name='L913'></a><a href='#L913'>913</a>
+<a name='L914'></a><a href='#L914'>914</a>
+<a name='L915'></a><a href='#L915'>915</a>
+<a name='L916'></a><a href='#L916'>916</a>
+<a name='L917'></a><a href='#L917'>917</a>
+<a name='L918'></a><a href='#L918'>918</a>
+<a name='L919'></a><a href='#L919'>919</a>
+<a name='L920'></a><a href='#L920'>920</a>
+<a name='L921'></a><a href='#L921'>921</a>
+<a name='L922'></a><a href='#L922'>922</a>
+<a name='L923'></a><a href='#L923'>923</a>
+<a name='L924'></a><a href='#L924'>924</a>
+<a name='L925'></a><a href='#L925'>925</a>
+<a name='L926'></a><a href='#L926'>926</a>
+<a name='L927'></a><a href='#L927'>927</a>
+<a name='L928'></a><a href='#L928'>928</a>
+<a name='L929'></a><a href='#L929'>929</a>
+<a name='L930'></a><a href='#L930'>930</a>
+<a name='L931'></a><a href='#L931'>931</a>
+<a name='L932'></a><a href='#L932'>932</a>
+<a name='L933'></a><a href='#L933'>933</a>
+<a name='L934'></a><a href='#L934'>934</a>
+<a name='L935'></a><a href='#L935'>935</a>
+<a name='L936'></a><a href='#L936'>936</a>
+<a name='L937'></a><a href='#L937'>937</a>
+<a name='L938'></a><a href='#L938'>938</a>
+<a name='L939'></a><a href='#L939'>939</a>
+<a name='L940'></a><a href='#L940'>940</a>
+<a name='L941'></a><a href='#L941'>941</a>
+<a name='L942'></a><a href='#L942'>942</a>
+<a name='L943'></a><a href='#L943'>943</a>
+<a name='L944'></a><a href='#L944'>944</a>
+<a name='L945'></a><a href='#L945'>945</a>
+<a name='L946'></a><a href='#L946'>946</a>
+<a name='L947'></a><a href='#L947'>947</a>
+<a name='L948'></a><a href='#L948'>948</a>
+<a name='L949'></a><a href='#L949'>949</a>
+<a name='L950'></a><a href='#L950'>950</a>
+<a name='L951'></a><a href='#L951'>951</a>
+<a name='L952'></a><a href='#L952'>952</a>
+<a name='L953'></a><a href='#L953'>953</a>
+<a name='L954'></a><a href='#L954'>954</a>
+<a name='L955'></a><a href='#L955'>955</a>
+<a name='L956'></a><a href='#L956'>956</a>
+<a name='L957'></a><a href='#L957'>957</a>
+<a name='L958'></a><a href='#L958'>958</a>
+<a name='L959'></a><a href='#L959'>959</a>
+<a name='L960'></a><a href='#L960'>960</a>
+<a name='L961'></a><a href='#L961'>961</a>
+<a name='L962'></a><a href='#L962'>962</a>
+<a name='L963'></a><a href='#L963'>963</a>
+<a name='L964'></a><a href='#L964'>964</a>
+<a name='L965'></a><a href='#L965'>965</a>
+<a name='L966'></a><a href='#L966'>966</a>
+<a name='L967'></a><a href='#L967'>967</a>
+<a name='L968'></a><a href='#L968'>968</a>
+<a name='L969'></a><a href='#L969'>969</a>
+<a name='L970'></a><a href='#L970'>970</a>
+<a name='L971'></a><a href='#L971'>971</a>
+<a name='L972'></a><a href='#L972'>972</a>
+<a name='L973'></a><a href='#L973'>973</a>
+<a name='L974'></a><a href='#L974'>974</a>
+<a name='L975'></a><a href='#L975'>975</a>
+<a name='L976'></a><a href='#L976'>976</a>
+<a name='L977'></a><a href='#L977'>977</a>
+<a name='L978'></a><a href='#L978'>978</a>
+<a name='L979'></a><a href='#L979'>979</a>
+<a name='L980'></a><a href='#L980'>980</a>
+<a name='L981'></a><a href='#L981'>981</a>
+<a name='L982'></a><a href='#L982'>982</a>
+<a name='L983'></a><a href='#L983'>983</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -842,19 +1068,21 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -864,17 +1092,21 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">21x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">21x</span>
+<span class="cline-any cline-yes">21x</span>
+<span class="cline-any cline-yes">21x</span>
+<span class="cline-any cline-yes">21x</span>
+<span class="cline-any cline-yes">21x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">24x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -882,6 +1114,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">21x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -892,28 +1125,34 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">24x</span>
-<span class="cline-any cline-yes">24x</span>
-<span class="cline-any cline-yes">24x</span>
+<span class="cline-any cline-yes">21x</span>
+<span class="cline-any cline-yes">21x</span>
+<span class="cline-any cline-yes">21x</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">21x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">21x</span>
+<span class="cline-any cline-yes">21x</span>
+<span class="cline-any cline-yes">21x</span>
+<span class="cline-any cline-yes">21x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">24x</span>
-<span class="cline-any cline-yes">24x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">21x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -922,7 +1161,15 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">16x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -932,18 +1179,16 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -953,23 +1198,31 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">16x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">16x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">16x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">16x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">16x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">13x</span>
+<span class="cline-any cline-yes">13x</span>
+<span class="cline-any cline-yes">13x</span>
+<span class="cline-any cline-yes">13x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -977,6 +1230,10 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -986,33 +1243,35 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-yes">6x</span>
-<span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">19x</span>
+<span class="cline-any cline-yes">26x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">16x</span>
+<span class="cline-any cline-yes">16x</span>
+<span class="cline-any cline-yes">16x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">32x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">19x</span>
+<span class="cline-any cline-yes">13x</span>
+<span class="cline-any cline-yes">13x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">16x</span>
+<span class="cline-any cline-yes">16x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1037,101 +1296,70 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-yes">10x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">10x</span>
-<span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-yes">6x</span>
-<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">12x</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">9x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">8x</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1139,50 +1367,70 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">18x</span>
-<span class="cline-any cline-yes">18x</span>
-<span class="cline-any cline-yes">18x</span>
-<span class="cline-any cline-yes">18x</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
-<span class="cline-any cline-yes">18x</span>
+<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">18x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">21x</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">21x</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">7x</span>
+<span class="cline-any cline-yes">7x</span>
+<span class="cline-any cline-yes">7x</span>
+<span class="cline-any cline-yes">7x</span>
+<span class="cline-any cline-yes">7x</span>
+<span class="cline-any cline-yes">7x</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">7x</span>
+<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">7x</span>
+<span class="cline-any cline-yes">11x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1190,46 +1438,50 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">56x</span>
+<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">44x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">56x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">44x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1237,9 +1489,6 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1250,9 +1499,9 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1261,69 +1510,96 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">6x</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">12x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">9x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1343,29 +1619,32 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1373,34 +1652,28 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">14x</span>
-<span class="cline-any cline-yes">11x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">10x</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">10x</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1408,11 +1681,124 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1422,7 +1808,55 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">14x</span>
+<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1433,27 +1867,47 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">6x</span>
-<span class="cline-any cline-yes">6x</span>
-<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1491,36 +1945,36 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">26x</span>
+<span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">25x</span>
-<span class="cline-any cline-yes">25x</span>
-<span class="cline-any cline-yes">25x</span>
-<span class="cline-any cline-yes">25x</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">34x</span>
+<span class="cline-any cline-yes">22x</span>
+<span class="cline-any cline-yes">22x</span>
+<span class="cline-any cline-yes">22x</span>
+<span class="cline-any cline-yes">22x</span>
+<span class="cline-any cline-yes">23x</span>
+<span class="cline-any cline-yes">23x</span>
+<span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
+<span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
+<span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">34x</span>
+<span class="cline-any cline-yes">23x</span>
+<span class="cline-any cline-yes">23x</span>
+<span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">34x</span>
+<span class="cline-any cline-yes">23x</span>
+<span class="cline-any cline-yes">23x</span>
+<span class="cline-any cline-yes">23x</span>
+<span class="cline-any cline-yes">23x</span>
+<span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">25x</span>
+<span class="cline-any cline-yes">22x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1532,19 +1986,19 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1560,15 +2014,15 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">9x</span>
+<span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">19x</span>
-<span class="cline-any cline-yes">19x</span>
-<span class="cline-any cline-yes">19x</span>
-<span class="cline-any cline-yes">19x</span>
-<span class="cline-any cline-yes">19x</span>
+<span class="cline-any cline-yes">18x</span>
+<span class="cline-any cline-yes">18x</span>
+<span class="cline-any cline-yes">18x</span>
+<span class="cline-any cline-yes">18x</span>
+<span class="cline-any cline-yes">18x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">19x</span>
+<span class="cline-any cline-yes">18x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1577,13 +2031,11 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 import { CashuMint } from './CashuMint.js';
 import { BlindedMessage } from './model/BlindedMessage.js';
 import {
-	type AmountPreference,
-	type BlindedMessageData,
-	type BlindedTransaction,
 	type MeltPayload,
 	type MeltQuoteResponse,
 	type MintKeys,
-	type MeltTokensResponse,
+	type MintKeyset,
+	type MeltProofsResponse,
 	type MintPayload,
 	type Proof,
 	type MintQuotePayload,
@@ -1592,117 +2044,235 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 	type SerializedBlindedMessage,
 	type SwapPayload,
 	type Token,
-	type TokenEntry,
-	CheckStateEnum,
 	SerializedBlindedSignature,
-	MeltQuoteState,
-	CheckStateEntry,
-	Preferences
+	GetInfoResponse,
+	OutputAmounts,
+	ProofState,
+	BlindingData
 } from './model/types/index.js';
-import {
-	bytesToNumber,
-	getDecodedToken,
-	getDefaultAmountPreference,
-	splitAmount
-} from './utils.js';
-import { isAmountPreferenceArray, deprecatedAmountPreferences } from './legacy/cashu-ts';
-import { validateMnemonic } from '@scure/bip39';
-import { wordlist } from '@scure/bip39/wordlists/english';
+import { bytesToNumber, getDecodedToken, splitAmount, sumProofs, getKeepAmounts } from './utils.js';
 import { hashToCurve, pointFromHex } from '@cashu/crypto/modules/common';
 import {
 	blindMessage,
 	constructProofFromPromise,
 	serializeProof
 } from '@cashu/crypto/modules/client';
-import {
-	deriveBlindingFactor,
-	deriveSecret,
-	deriveSeedFromMnemonic
-} from '@cashu/crypto/modules/client/NUT09';
+import { deriveBlindingFactor, deriveSecret } from '@cashu/crypto/modules/client/NUT09';
 import { createP2PKsecret, getSignedProofs } from '@cashu/crypto/modules/client/NUT11';
 import { type Proof as NUT11Proof } from '@cashu/crypto/modules/common/index';
 &nbsp;
+/**
+ * The default number of proofs per denomination to keep in a wallet.
+ */
+const DEFAULT_DENOMINATION_TARGET = 3;
+&nbsp;
+/**
+ * The default unit for the wallet, if not specified in constructor.
+ */
+const DEFAULT_UNIT = 'sat';
+&nbsp;
 /**
  * Class that represents a Cashu wallet.
  * This class should act as the entry point for this library
  */
 class CashuWallet {
-	private _keys: MintKeys | undefined;
-	private _seed: Uint8Array | undefined;
-	private _unit = 'sat';
+	private _keys: Map&lt;string, MintKeys&gt; = new Map();
+	private _keysetId: string | undefined;
+	private _keysets: Array&lt;MintKeyset&gt; = [];
+	private _seed: Uint8Array | undefined = undefined;
+	private _unit = DEFAULT_UNIT;
+	private _mintInfo: GetInfoResponse | undefined = undefined;
+	private _denominationTarget = DEFAULT_DENOMINATION_TARGET;
+&nbsp;
 	mint: CashuMint;
 &nbsp;
 	/**
-	 * @param unit optionally set unit
-	 * @param keys public keys from the mint. If set, it will override the unit with the keysets unit
 	 * @param mint Cashu mint instance is used to make api calls
-	 * @param mnemonicOrSeed mnemonic phrase or Seed to initial derivation key for this wallets deterministic secrets. When the mnemonic is provided, the seed will be derived from it.
+	 * @param options.unit optionally set unit (default is 'sat')
+	 * @param options.keys public keys from the mint (will be fetched from mint if not provided)
+	 * @param options.keysets keysets from the mint (will be fetched from mint if not provided)
+	 * @param options.mintInfo mint info from the mint (will be fetched from mint if not provided)
+	 * @param options.denominationTarget target number proofs per denomination (default: see @constant DEFAULT_DENOMINATION_TARGET)
+	 * @param options.bip39seed BIP39 seed for deterministic secrets.
 	 * This can lead to poor performance, in which case the seed should be directly provided
 	 */
 	constructor(
 		mint: CashuMint,
 		options?: {
 			unit?: string;
-			keys?: MintKeys;
-			mnemonicOrSeed?: string | Uint8Array;
+			keys?: Array&lt;MintKeys&gt; | MintKeys;
+			keysets?: Array&lt;MintKeyset&gt;;
+			mintInfo?: GetInfoResponse;
+			bip39seed?: Uint8Array;
+			denominationTarget?: number;
 		}
 	) {
 		this.mint = mint;
-		if (options?.unit) this._unit = options<span class="branch-0 cbranch-no" title="branch not covered" >?.u</span>nit;
-		<span class="missing-if-branch" title="if path not taken" >I</span>if (options?.keys) {
-<span class="cstat-no" title="statement not covered" >			this._keys = options.keys;</span>
-<span class="cstat-no" title="statement not covered" >			this._unit = options.keys.unit;</span>
-		}
-		if (!options?.mnemonicOrSeed) {
-			return;
+		let keys: Array&lt;MintKeys&gt; = [];
+		<span class="missing-if-branch" title="if path not taken" >I</span>if (options?.keys &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >!Array.isArray(options.keys))</span> {
+<span class="cstat-no" title="statement not covered" >			keys = [options.keys];</span>
+		} else <span class="missing-if-branch" title="if path not taken" >I</span>if (options?.keys &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >Array.isArray(options?.keys))</span> {
+<span class="cstat-no" title="statement not covered" >			keys = options?.keys;</span>
 		}
-<span class="cstat-no" title="statement not covered" >		<span class="missing-if-branch" title="if path not taken" >I</span>if (options?.mnemonicOrSeed instanceof Uint8Array) {</span>
-<span class="cstat-no" title="statement not covered" >			this._seed = options.mnemonicOrSeed;</span>
-<span class="cstat-no" title="statement not covered" >			return;</span>
+		if (keys) keys.forEach(<span class="fstat-no" title="function not covered" >(k</span>ey: MintKeys) =&gt; <span class="cstat-no" title="statement not covered" >this._keys.set(key.id, key));</span>
+		if (options?.unit) this._unit = options<span class="branch-0 cbranch-no" title="branch not covered" >?.u</span>nit;
+		<span class="missing-if-branch" title="if path not taken" >I</span>if (options?.keysets) <span class="cstat-no" title="statement not covered" >this._keysets = options.keysets;</span>
+		<span class="missing-if-branch" title="if path not taken" >I</span>if (options?.denominationTarget) {
+<span class="cstat-no" title="statement not covered" >			this._denominationTarget = options.denominationTarget;</span>
 		}
-<span class="cstat-no" title="statement not covered" >		<span class="missing-if-branch" title="if path not taken" >I</span>if (!validateMnemonic(options.mnemonicOrSeed, wordlist)) {</span>
-<span class="cstat-no" title="statement not covered" >			throw new Error('Tried to instantiate with mnemonic, but mnemonic was invalid');</span>
+&nbsp;
+		<span class="missing-if-branch" title="if path not taken" >I</span>if (options?.bip39seed) {
+<span class="cstat-no" title="statement not covered" >			<span class="missing-if-branch" title="if path not taken" >I</span>if (options.bip39seed instanceof Uint8Array) {</span>
+<span class="cstat-no" title="statement not covered" >				this._seed = options.bip39seed;</span>
+<span class="cstat-no" title="statement not covered" >				return;</span>
+			}
+<span class="cstat-no" title="statement not covered" >			throw new Error('bip39seed must be a valid UInt8Array');</span>
 		}
-<span class="cstat-no" title="statement not covered" >		this._seed = deriveSeedFromMnemonic(options.mnemonicOrSeed);</span>
 	}
 &nbsp;
 <span class="fstat-no" title="function not covered" >	get u</span>nit(): string {
 <span class="cstat-no" title="statement not covered" >		return this._unit;</span>
 	}
-&nbsp;
-<span class="fstat-no" title="function not covered" >	get k</span>eys(): MintKeys {
-<span class="cstat-no" title="statement not covered" >		<span class="missing-if-branch" title="if path not taken" >I</span>if (!this._keys) {</span>
-<span class="cstat-no" title="statement not covered" >			throw new Error('Keys are not set');</span>
-		}
+<span class="fstat-no" title="function not covered" >	get k</span>eys(): Map&lt;string, MintKeys&gt; {
 <span class="cstat-no" title="statement not covered" >		return this._keys;</span>
 	}
-<span class="fstat-no" title="function not covered" >	set keys(k</span>eys: MintKeys) {
-<span class="cstat-no" title="statement not covered" >		this._keys = keys;</span>
-<span class="cstat-no" title="statement not covered" >		this._unit = keys.unit;</span>
+<span class="fstat-no" title="function not covered" >	get k</span>eysetId(): string {
+<span class="cstat-no" title="statement not covered" >		<span class="missing-if-branch" title="if path not taken" >I</span>if (!this._keysetId) {</span>
+<span class="cstat-no" title="statement not covered" >			throw new Error('No keysetId set');</span>
+		}
+<span class="cstat-no" title="statement not covered" >		return this._keysetId;</span>
+	}
+	set keysetId(keysetId: string) {
+		this._keysetId = keysetId;
+	}
+<span class="fstat-no" title="function not covered" >	get k</span>eysets(): Array&lt;MintKeyset&gt; {
+<span class="cstat-no" title="statement not covered" >		return this._keysets;</span>
+	}
+<span class="fstat-no" title="function not covered" >	get m</span>intInfo(): GetInfoResponse {
+<span class="cstat-no" title="statement not covered" >		<span class="missing-if-branch" title="if path not taken" >I</span>if (!this._mintInfo) {</span>
+<span class="cstat-no" title="statement not covered" >			throw new Error('Mint info not loaded');</span>
+		}
+<span class="cstat-no" title="statement not covered" >		return this._mintInfo;</span>
 	}
 &nbsp;
 	/**
 	 * Get information about the mint
 	 * @returns mint info
 	 */
-	async getMintInfo() {
-		return this.mint.getInfo();
+	async getMintInfo(): Promise&lt;GetInfoResponse&gt; {
+		this._mintInfo = await this.mint.getInfo();
+		return this._mintInfo;
+	}
+&nbsp;
+	/**
+	 * Load mint information, keysets and keys. This function can be called if no keysets are passed in the constructor
+	 */
+<span class="fstat-no" title="function not covered" >	async l</span>oadMint() {
+<span class="cstat-no" title="statement not covered" ><span class="branch-0 cbranch-no" title="branch not covered" >		await this.getMintInfo();</span></span>
+<span class="cstat-no" title="statement not covered" >		await this.getKeySets();</span>
+<span class="cstat-no" title="statement not covered" >		await this.getKeys();</span>
+	}
+&nbsp;
+	/**
+	 * Choose a keyset to activate based on the lowest input fee
+	 *
+	 * Note: this function will filter out deprecated base64 keysets
+	 *
+	 * @param keysets keysets to choose from
+	 * @returns active keyset
+	 */
+	getActiveKeyset(keysets: Array&lt;MintKeyset&gt;): MintKeyset {
+		let activeKeysets = keysets.filter((k: MintKeyset) =&gt; k.active);
+&nbsp;
+		// we only consider keyset IDs that start with "00"
+		activeKeysets = activeKeysets.filter((k: MintKeyset) =&gt; k.id.startsWith('00'));
+&nbsp;
+		const activeKeyset = activeKeysets.sort(
+<span class="fstat-no" title="function not covered" >			(a</span>: MintKeyset, b: MintKeyset) =&gt; <span class="cstat-no" title="statement not covered" >(a.input_fee_ppk ?? 0) - (b.input_fee_ppk ?? 0)</span>
+		)[0];
+		<span class="missing-if-branch" title="if path not taken" >I</span>if (!activeKeyset) {
+<span class="cstat-no" title="statement not covered" >			throw new Error('No active keyset found');</span>
+		}
+		return activeKeyset;
+	}
+&nbsp;
+	/**
+	 * Get keysets from the mint with the unit of the wallet
+	 * @returns keysets with wallet's unit
+	 */
+	async getKeySets(): Promise&lt;Array&lt;MintKeyset&gt;&gt; {
+		const allKeysets = await this.mint.getKeySets();
+		const unitKeysets = allKeysets.keysets.filter((k: MintKeyset) =&gt; k.unit === this._unit);
+		this._keysets = unitKeysets;
+		return this._keysets;
+	}
+&nbsp;
+	/**
+	 * Get all active keys from the mint and set the keyset with the lowest fees as the active wallet keyset.
+	 * @returns keyset
+	 */
+<span class="fstat-no" title="function not covered" >	async g</span>etAllKeys(): Promise&lt;Array&lt;MintKeys&gt;&gt; {
+		const <span class="cstat-no" title="statement not covered" >keysets = <span class="cstat-no" title="statement not covered" ><span class="branch-0 cbranch-no" title="branch not covered" >await this.mint.getKeys();</span></span></span>
+<span class="cstat-no" title="statement not covered" >		this._keys = new Map(keysets.keysets.map(<span class="fstat-no" title="function not covered" >(k</span>: MintKeys) =&gt; <span class="cstat-no" title="statement not covered" >[k.id, k]))</span>;</span>
+<span class="cstat-no" title="statement not covered" >		this.keysetId = this.getActiveKeyset(this._keysets).id;</span>
+<span class="cstat-no" title="statement not covered" >		return keysets.keysets;</span>
+	}
+&nbsp;
+	/**
+	 * Get public keys from the mint. If keys were already fetched, it will return those.
+	 *
+	 * If `keysetId` is set, it will fetch and return that specific keyset.
+	 * Otherwise, we select an active keyset with the unit of the wallet.
+	 *
+	 * @param keysetId optional keysetId to get keys for
+	 * @param forceRefresh? if set to true, it will force refresh the keyset from the mint
+	 * @returns keyset
+	 */
+	async getKeys(keysetId?: string, forceRefresh?: boolean): Promise&lt;MintKeys&gt; {
+		if (!(this._keysets.length &gt; 0) || forceRefresh) {
+			await this.getKeySets();
+		}
+		// no keyset id is chosen, let's choose one
+		if (!keysetId) {
+			const localKeyset = this.getActiveKeyset(this._keysets);
+			keysetId = localKeyset.id;
+		}
+		// make sure we have keyset for this id
+		if (!this._keysets.find((k: MintKeyset) =&gt; k.id === keysetId)) {
+<span class="cstat-no" title="statement not covered" >			await this.getKeySets();</span>
+<span class="cstat-no" title="statement not covered" >			<span class="missing-if-branch" title="if path not taken" >I</span>if (!this._keysets.find(<span class="fstat-no" title="function not covered" >(k</span>: MintKeyset) =&gt; <span class="cstat-no" title="statement not covered" >k.id === keysetId))</span> {</span>
+<span class="cstat-no" title="statement not covered" >				throw new Error(`could not initialize keys. No keyset with id '${keysetId}' found`);</span>
+			}
+		}
+&nbsp;
+		// make sure we have keys for this id
+		if (!this._keys.get(keysetId)) {
+			const keys = await this.mint.getKeys(keysetId);
+			this._keys.set(keysetId, keys.keysets[0]);
+		}
+&nbsp;
+		// set and return
+		this.keysetId = keysetId;
+		return this._keys.get(keysetId) as MintKeys;
 	}
 &nbsp;
 	/**
 	 * Receive an encoded or raw Cashu token (only supports single tokens. It will only process the first token in the token array)
-	 * @param {(string|Token)} token - Cashu token
-	 * @param preference optional preference for splitting proofs into specific amounts
-	 * @param counter? optionally set counter to derive secret deterministically. CashuWallet class must be initialized with seed phrase to take effect
-	 * @param pubkey? optionally locks ecash to pubkey. Will not be deterministic, even if counter is set!
-	 * @param privkey? will create a signature on the @param token secrets if set
+	 * @param {(string|Token)} token - Cashu token, either as string or decoded
+	 * @param options.keysetId? override the keysetId derived from the current mintKeys with a custom one. This should be a keyset that was fetched from the `/keysets` endpoint
+	 * @param options.outputAmounts? optionally specify the output's amounts to keep and to send.
+	 * @param options.proofsWeHave? optionally provide all currently stored proofs of this mint. Cashu-ts will use them to derive the optimal output amounts
+	 * @param options.counter? optionally set counter to derive secret deterministically. CashuWallet class must be initialized with seed phrase to take effect
+	 * @param options.pubkey? optionally locks ecash to pubkey. Will not be deterministic, even if counter is set!
+	 * @param options.privkey? will create a signature on the @param token secrets if set
 	 * @returns New token with newly created proofs, token entries that had errors
 	 */
 	async receive(
 		token: string | Token,
 		options?: {
 			keysetId?: string;
-			preference?: Array&lt;AmountPreference&gt;;
+			outputAmounts?: OutputAmounts;
+			proofsWeHave?: Array&lt;Proof&gt;;
 			counter?: number;
 			pubkey?: string;
 			privkey?: string;
@@ -1711,62 +2281,189 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 		if (typeof token === 'string') {
 			token = getDecodedToken(token);
 		}
-		const tokenEntries: Array&lt;TokenEntry&gt; = token.token;
-		const proofs = await this.receiveTokenEntry(tokenEntries[0], {
-			keysetId: options?.keysetId,
-			preference: options?.preference,
-			counter: options?.counter,
-			pubkey: options?.pubkey,
-			privkey: options?.privkey
-		});
-		return proofs;
+		const keys = await this.getKeys(options?.keysetId);
+		const amount = sumProofs(token.proofs) - this.getFeesForProofs(token.proofs);
+		const { payload, blindingData } = this.createSwapPayload(
+			amount,
+			token.proofs,
+			keys,
+			options?.outputAmounts,
+			options?.counter,
+			options?.pubkey,
+			options?.privkey
+		);
+		const { signatures } = await this.mint.swap(payload);
+		const freshProofs = this.constructProofs(
+			signatures,
+			blindingData.blindingFactors,
+			blindingData.secrets,
+			keys
+		);
+		return freshProofs;
 	}
 &nbsp;
 	/**
-	 * Receive a single cashu token entry
-	 * @param tokenEntry a single entry of a cashu token
-	 * @param preference optional preference for splitting proofs into specific amounts.
-	 * @param counter? optionally set counter to derive secret deterministically. CashuWallet class must be initialized with seed phrase to take effect
-	 * @param pubkey? optionally locks ecash to pubkey. Will not be deterministic, even if counter is set!
-	 * @param privkey? will create a signature on the @param tokenEntry secrets if set
-	 * @returns New token entry with newly created proofs, proofs that had errors
+	 * Send proofs of a given amount, by providing at least the required amount of proofs
+	 * @param amount amount to send
+	 * @param proofs array of proofs (accumulated amount of proofs must be &gt;= than amount)
+	 * @param options.outputAmounts? optionally specify the output's amounts to keep and send.
+	 * @param options.counter? optionally set counter to derive secret deterministically. CashuWallet class must be initialized with seed phrase to take effect
+	 * @param options.proofsWeHave? optionally provide all currently stored proofs of this mint. Cashu-ts will use them to derive the optimal output amounts
+	 * @param options.pubkey? optionally locks ecash to pubkey. Will not be deterministic, even if counter is set!
+	 * @param options.privkey? will create a signature on the output secrets if set
+	 * @param options.keysetId? override the keysetId derived from the current mintKeys with a custom one. This should be a keyset that was fetched from the `/keysets` endpoint
+	 * @param options.offline? optionally send proofs offline.
+	 * @param options.includeFees? optionally include fees in the response.
+	 * @returns {SendResponse}
 	 */
-	async receiveTokenEntry(
-		tokenEntry: TokenEntry,
+	async send(
+		amount: number,
+		proofs: Array&lt;Proof&gt;,
 		options?: {
-			keysetId?: string;
-			preference?: Array&lt;AmountPreference&gt;;
+			outputAmounts?: OutputAmounts;
+			proofsWeHave?: Array&lt;Proof&gt;;
 			counter?: number;
 			pubkey?: string;
 			privkey?: string;
+			keysetId?: string;
+			offline?: boolean;
+			includeFees?: boolean;
 		}
-	): Promise&lt;Array&lt;Proof&gt;&gt; {
-		const proofs: Array&lt;Proof&gt; = [];
-		const amount = tokenEntry.proofs.reduce((total: number, curr: Proof) =&gt; total + curr.amount, 0);
-		let preference = options<span class="branch-0 cbranch-no" title="branch not covered" >?.p</span>reference;
-		const keys = await this.getKeys(options<span class="branch-0 cbranch-no" title="branch not covered" >?.k</span>eysetId);
-		if (!preference) {
-			preference = getDefaultAmountPreference(amount, keys);
+	): Promise&lt;SendResponse&gt; {
+		if (sumProofs(proofs) &lt; amount) {
+			throw new Error('Not enough funds available to send');
 		}
-		const pref: Preferences = { sendPreference: preference };
-		const { payload, blindedMessages } = this.createSwapPayload(
+		const { keep: keepProofsOffline, send: sendProofOffline } = this.selectProofsToSend(
+			proofs,
 			amount,
-			tokenEntry.proofs,
-			keys,
-			pref,
-			options<span class="branch-0 cbranch-no" title="branch not covered" >?.c</span>ounter,
-			options<span class="branch-0 cbranch-no" title="branch not covered" >?.p</span>ubkey,
-			options<span class="branch-0 cbranch-no" title="branch not covered" >?.p</span>rivkey
+			options?.includeFees
 		);
-		const { signatures } = await CashuMint.split(tokenEntry.mint, payload);
-		const newProofs = this.constructProofs(
-			signatures,
-			blindedMessages.rs,
-			blindedMessages.secrets,
-			keys
+		const expectedFee = options?.includeFees ? <span class="branch-0 cbranch-no" title="branch not covered" >this.getFeesForProofs(sendProofOffline) </span>: 0;
+		if (
+			!options?.offline &amp;&amp;
+			(sumProofs(sendProofOffline) != amount + expectedFee || // if the exact amount cannot be selected
+				options?.outputAmounts ||
+<span class="branch-1 cbranch-no" title="branch not covered" >				options?.pubkey </span>||
+<span class="branch-1 cbranch-no" title="branch not covered" >				options?.privkey </span>||
+<span class="branch-1 cbranch-no" title="branch not covered" >				options?.keysetId)</span> // these options require a swap
+		) {
+			// we need to swap
+			// input selection, needs fees because of the swap
+			const { keep: keepProofsSelect, send: sendProofs } = this.selectProofsToSend(
+				proofs,
+				amount,
+				true
+			);
+			options?.proofsWeHave<span class="branch-1 cbranch-no" title="branch not covered" >?.push(...keepProofsSelect);</span>
+&nbsp;
+			const { keep, send } = await this.swap(amount, sendProofs, options);
+			const keepProofs = keepProofsSelect.concat(keep);
+			return { keep: keepProofs, send };
+		}
+&nbsp;
+		<span class="missing-if-branch" title="if path not taken" >I</span>if (sumProofs(sendProofOffline) &lt; amount + expectedFee) {
+<span class="cstat-no" title="statement not covered" >			throw new Error('Not enough funds available to send');</span>
+		}
+&nbsp;
+		return { keep: keepProofsOffline, send: sendProofOffline };
+	}
+&nbsp;
+	selectProofsToSend(
+		proofs: Array&lt;Proof&gt;,
+		amountToSend: number,
+		includeFees?: boolean
+	): SendResponse {
+		const sortedProofs = proofs.sort((a: Proof, b: Proof) =&gt; a.amount - b.amount);
+		const smallerProofs = sortedProofs
+			.filter((p: Proof) =&gt; p.amount &lt;= amountToSend)
+			.sort((a: Proof, b: Proof) =&gt; b.amount - a.amount);
+		const biggerProofs = sortedProofs
+			.filter((p: Proof) =&gt; p.amount &gt; amountToSend)
+			.sort(<span class="fstat-no" title="function not covered" >(a</span>: Proof, b: Proof) =&gt; <span class="cstat-no" title="statement not covered" >a.amount - b.amount);</span>
+		const nextBigger = biggerProofs[0];
+		if (!smallerProofs.length &amp;&amp; nextBigger) {
+			return {
+				keep: proofs.filter((p: Proof) =&gt; p.secret !== nextBigger.secret),
+				send: [nextBigger]
+			};
+		}
+&nbsp;
+		<span class="missing-if-branch" title="if path not taken" >I</span>if (!smallerProofs.length &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >!nextBigger)</span> {
+<span class="cstat-no" title="statement not covered" >			return { keep: proofs, send: [] };</span>
+		}
+&nbsp;
+		let remainder = amountToSend;
+		let selectedProofs = [smallerProofs[0]];
+		const returnedProofs = [];
+		const feePPK = includeFees ? this.getFeesForProofs(selectedProofs) : 0;
+		remainder -= selectedProofs[0].amount - feePPK / 1000;
+		if (remainder &gt; 0) {
+			const { keep, send } = this.selectProofsToSend(
+				smallerProofs.slice(1),
+				remainder,
+				includeFees
+			);
+			selectedProofs.push(...send);
+			returnedProofs.push(...keep);
+		}
+&nbsp;
+		const selectedFeePPK = includeFees ? this.getFeesForProofs(selectedProofs) : 0;
+		<span class="missing-if-branch" title="if path not taken" >I</span>if (sumProofs(selectedProofs) &lt; amountToSend + selectedFeePPK &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >nextBigger)</span> {
+<span class="cstat-no" title="statement not covered" >			selectedProofs = [nextBigger];</span>
+		}
+		return {
+			keep: proofs.filter((p: Proof) =&gt; !selectedProofs.includes(p)),
+			send: selectedProofs
+		};
+	}
+&nbsp;
+	/**
+	 * calculates the fees based on inputs (proofs)
+	 * @param proofs input proofs to calculate fees for
+	 * @returns fee amount
+	 */
+	getFeesForProofs(proofs: Array&lt;Proof&gt;): number {
+		<span class="missing-if-branch" title="if path not taken" >I</span>if (!this._keysets.length) {
+<span class="cstat-no" title="statement not covered" >			throw new Error('Could not calculate fees. No keysets found');</span>
+		}
+		const keysetIds = new Set(proofs.map((p: Proof) =&gt; p.id));
+		keysetIds.forEach((id: string) =&gt; {
+			<span class="missing-if-branch" title="if path not taken" >I</span>if (!this._keysets.find((k: MintKeyset) =&gt; k.id === id)) {
+<span class="cstat-no" title="statement not covered" >				throw new Error(`Could not calculate fees. No keyset found with id: ${id}`);</span>
+			}
+		});
+&nbsp;
+		const fees = Math.floor(
+			Math.max(
+				(proofs.reduce(
+					(total: number, curr: Proof) =&gt;
+						total + (this._keysets.find((k: MintKeyset) =&gt; k.id === curr.id)<span class="branch-0 cbranch-no" title="branch not covered" >?.i</span>nput_fee_ppk || 0),
+					0
+				) +
+					999) /
+					1000,
+				0
+			)
 		);
-		proofs.push(...newProofs);
-		return proofs;
+		return fees;
+	}
+&nbsp;
+	/**
+	 * calculates the fees based on inputs for a given keyset
+	 * @param nInputs number of inputs
+	 * @param keysetId keysetId used to lookup `input_fee_ppk`
+	 * @returns fee amount
+	 */
+<span class="fstat-no" title="function not covered" >	getFeesForKeyset(</span>nInputs: number, keysetId: string): number {
+		const fees = <span class="cstat-no" title="statement not covered" >Math.floor(</span>
+			Math.max(
+				(nInputs * (this._keysets.find(<span class="fstat-no" title="function not covered" >(k</span>: MintKeyset) =&gt; <span class="cstat-no" title="statement not covered" >k.id === keysetId)?</span>.input_fee_ppk || 0) +
+					999) /
+					1000,
+				0
+			)
+		);
+<span class="cstat-no" title="statement not covered" >		return fees;</span>
 	}
 &nbsp;
 	/**
@@ -1775,90 +2472,126 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 	 * if both amount and preference are set, but the preference cannot fulfill the amount, then we use the default split
 	 * @param amount amount to send while performing the optimal split (least proofs possible). can be set to undefined if preference is set
 	 * @param proofs proofs matching that amount
-	 * @param preference optional preference for splitting proofs into specific amounts. overrides amount param
-	 * @param counter? optionally set counter to derive secret deterministically. CashuWallet class must be initialized with seed phrase to take effect
-	 * @param pubkey? optionally locks ecash to pubkey. Will not be deterministic, even if counter is set!
-	 * @param privkey? will create a signature on the @param proofs secrets if set
+	 * @param options.outputAmounts? optionally specify the output's amounts to keep and to send.
+	 * @param options.counter? optionally set counter to derive secret deterministically. CashuWallet class must be initialized with seed phrase to take effect
+	 * @param options.keysetId? override the keysetId derived from the current mintKeys with a custom one. This should be a keyset that was fetched from the `/keysets` endpoint
+	 * @param options.includeFees? include estimated fees for the receiver to receive the proofs
+	 * @param options.proofsWeHave? optionally provide all currently stored proofs of this mint. Cashu-ts will use them to derive the optimal output amounts
+	 * @param options.pubkey? optionally locks ecash to pubkey. Will not be deterministic, even if counter is set!
+	 * @param options.privkey? will create a signature on the @param proofs secrets if set
 	 * @returns promise of the change- and send-proofs
 	 */
-	async send(
+	async swap(
 		amount: number,
 		proofs: Array&lt;Proof&gt;,
 		options?: {
-			preference?: Preferences | Array&lt;AmountPreference&gt;;
+			outputAmounts?: OutputAmounts;
+			proofsWeHave?: Array&lt;Proof&gt;;
 			counter?: number;
 			pubkey?: string;
 			privkey?: string;
 			keysetId?: string;
+			includeFees?: boolean;
 		}
 	): Promise&lt;SendResponse&gt; {
-		if (options?.preference) {
-			<span class="missing-if-branch" title="if path not taken" >I</span>if (isAmountPreferenceArray(options.preference)) {
-<span class="cstat-no" title="statement not covered" >				options.preference = deprecatedAmountPreferences(options.preference);</span>
+		if (!options) options = {};
+		const keyset = await this.getKeys(options.keysetId);
+		const proofsToSend = proofs;
+		let amountToSend = amount;
+		const amountAvailable = sumProofs(proofs);
+		let amountToKeep = amountAvailable - amountToSend - this.getFeesForProofs(proofsToSend);
+		// send output selection
+		let sendAmounts = options<span class="branch-0 cbranch-no" title="branch not covered" >?.o</span>utputAmounts?.sendAmounts || splitAmount(amountToSend, keyset.keys);
+&nbsp;
+		// include the fees to spend the the outputs of the swap
+		<span class="missing-if-branch" title="if path not taken" >I</span>if (options<span class="branch-0 cbranch-no" title="branch not covered" >?.i</span>ncludeFees) {
+			let <span class="cstat-no" title="statement not covered" >outputFee = this.getFeesForKeyset(sendAmounts.length, keyset.id);</span>
+			let <span class="cstat-no" title="statement not covered" >sendAmountsFee = splitAmount(outputFee, keyset.keys);</span>
+<span class="cstat-no" title="statement not covered" >			while (</span>
+				this.getFeesForKeyset(sendAmounts.concat(sendAmountsFee).length, keyset.id) &gt; outputFee
+			) {
+<span class="cstat-no" title="statement not covered" >				outputFee++;</span>
+<span class="cstat-no" title="statement not covered" >				sendAmountsFee = splitAmount(outputFee, keyset.keys);</span>
 			}
-			amount = options<span class="branch-0 cbranch-no" title="branch not covered" >?.p</span>reference<span class="branch-0 cbranch-no" title="branch not covered" >?.s</span>endPreference.reduce(
-				(acc: number, curr: AmountPreference) =&gt; acc + curr.amount * curr.count,
-				0
-			);
+<span class="cstat-no" title="statement not covered" >			sendAmounts = sendAmounts.concat(sendAmountsFee);</span>
+<span class="cstat-no" title="statement not covered" >			amountToSend += outputFee;</span>
+<span class="cstat-no" title="statement not covered" >			amountToKeep -= outputFee;</span>
 		}
-		const keyset = await this.getKeys(options?.keysetId);
-		let amountAvailable = 0;
-		const proofsToSend: Array&lt;Proof&gt; = [];
-		const proofsToKeep: Array&lt;Proof&gt; = [];
-		proofs.forEach((proof: Proof) =&gt; {
-			<span class="missing-if-branch" title="if path not taken" >I</span>if (amountAvailable &gt;= amount) {
-<span class="cstat-no" title="statement not covered" >				proofsToKeep.push(proof);</span>
-<span class="cstat-no" title="statement not covered" >				return;</span>
-			}
-			amountAvailable = amountAvailable + proof.amount;
-			proofsToSend.push(proof);
-		});
 &nbsp;
-		if (amount &gt; amountAvailable) {
-			throw new Error('Not enough funds available');
-		}
-		if (amount &lt; amountAvailable || options?.preference || <span class="branch-1 cbranch-no" title="branch not covered" >options?.pubkey)</span> {
-			const { amountKeep, amountSend } = this.splitReceive(amount, amountAvailable);
-			const { payload, blindedMessages } = this.createSwapPayload(
-				amountSend,
-				proofsToSend,
-				keyset,
-				options?.preference,
-				options?.counter,
-				options?.pubkey,
-				options?.privkey
+		// keep output selection
+		let keepAmounts;
+		<span class="missing-if-branch" title="if path not taken" >I</span>if (options &amp;&amp; !options.outputAmounts?.keepAmounts &amp;&amp; options.proofsWeHave) {
+<span class="cstat-no" title="statement not covered" >			keepAmounts = getKeepAmounts(</span>
+				options.proofsWeHave,
+				amountToKeep,
+				keyset.keys,
+				this._denominationTarget
 			);
-			const { signatures } = await this.mint.split(payload);
-			const proofs = this.constructProofs(
-				signatures,
-				blindedMessages.rs,
-				blindedMessages.secrets,
-				keyset
+		} else if (options.outputAmounts) {
+			<span class="missing-if-branch" title="if path not taken" >I</span>if (
+				options.outputAmounts.keepAmounts<span class="branch-0 cbranch-no" title="branch not covered" >?.r</span>educe((a: number, b: number) =&gt; a + b, 0) !=
+				amountToKeep
+			) {
+<span class="cstat-no" title="statement not covered" >				throw new Error('Keep amounts do not match amount to keep');</span>
+			}
+			keepAmounts = options.outputAmounts.keepAmounts;
+		}
+&nbsp;
+		<span class="missing-if-branch" title="if path not taken" >I</span>if (amountToSend + this.getFeesForProofs(proofsToSend) &gt; amountAvailable) {
+<span class="cstat-no" title="statement not covered" >			console.error(</span>
+				`Not enough funds available (${amountAvailable}) for swap amountToSend: ${amountToSend} + fee: ${this.getFeesForProofs(
+					proofsToSend
+				)} | length: ${proofsToSend.length}`
 			);
-			// sum up proofs until amount2 is reached
-			const splitProofsToKeep: Array&lt;Proof&gt; = [];
-			const splitProofsToSend: Array&lt;Proof&gt; = [];
-			let amountKeepCounter = 0;
-			proofs.forEach((proof: Proof) =&gt; {
-				if (amountKeepCounter &lt; amountKeep) {
-					amountKeepCounter += proof.amount;
-					splitProofsToKeep.push(proof);
-					return;
-				}
-				splitProofsToSend.push(proof);
-			});
-			return {
-				returnChange: [...splitProofsToKeep, ...proofsToKeep],
-				send: splitProofsToSend
-			};
+<span class="cstat-no" title="statement not covered" >			throw new Error(`Not enough funds available for swap`);</span>
+		}
+&nbsp;
+		<span class="missing-if-branch" title="if path not taken" >I</span>if (amountToSend + this.getFeesForProofs(proofsToSend) + amountToKeep != amountAvailable) {
+<span class="cstat-no" title="statement not covered" >			throw new Error('Amounts do not match for swap');</span>
 		}
-		return { returnChange: proofsToKeep, send: proofsToSend };
+&nbsp;
+		options.outputAmounts = {
+			keepAmounts: keepAmounts,
+			sendAmounts: sendAmounts
+		};
+		const { payload, blindingData } = this.createSwapPayload(
+			amountToSend,
+			proofsToSend,
+			keyset,
+			options<span class="branch-0 cbranch-no" title="branch not covered" >?.o</span>utputAmounts,
+			options<span class="branch-0 cbranch-no" title="branch not covered" >?.c</span>ounter,
+			options<span class="branch-0 cbranch-no" title="branch not covered" >?.p</span>ubkey,
+			options<span class="branch-0 cbranch-no" title="branch not covered" >?.p</span>rivkey
+		);
+		const { signatures } = await this.mint.swap(payload);
+		const swapProofs = this.constructProofs(
+			signatures,
+			blindingData.blindingFactors,
+			blindingData.secrets,
+			keyset
+		);
+		const splitProofsToKeep: Array&lt;Proof&gt; = [];
+		const splitProofsToSend: Array&lt;Proof&gt; = [];
+		let amountToKeepCounter = 0;
+		swapProofs.forEach((proof: Proof) =&gt; {
+			if (amountToKeepCounter &lt; amountToKeep) {
+				amountToKeepCounter += proof.amount;
+				splitProofsToKeep.push(proof);
+				return;
+			}
+			splitProofsToSend.push(proof);
+		});
+		return {
+			keep: splitProofsToKeep,
+			send: splitProofsToSend
+		};
 	}
 &nbsp;
 	/**
 	 * Regenerates
 	 * @param start set starting point for count (first cycle for each keyset should usually be 0)
 	 * @param count set number of blinded messages that should be generated
+	 * @param options.keysetId set a custom keysetId to restore from. keysetIds can be loaded with `CashuMint.getKeySets()`
 	 * @returns proofs
 	 */
 <span class="fstat-no" title="function not covered" >	async r</span>estore(
@@ -1870,16 +2603,20 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 	): Promise&lt;{ proofs: Array&lt;Proof&gt; }&gt; {
 		const <span class="cstat-no" title="statement not covered" >keys = <span class="cstat-no" title="statement not covered" ><span class="branch-0 cbranch-no" title="branch not covered" >await this.getKeys(options?.keysetId);</span></span></span>
 <span class="cstat-no" title="statement not covered" >		<span class="missing-if-branch" title="if path not taken" >I</span>if (!this._seed) {</span>
-<span class="cstat-no" title="statement not covered" >			throw new Error('CashuWallet must be initialized with mnemonic to use restore');</span>
+<span class="cstat-no" title="statement not covered" >			throw new Error('CashuWallet must be initialized with a seed to use restore');</span>
 		}
 		// create blank amounts for unknown restore amounts
 		const <span class="cstat-no" title="statement not covered" >amounts = Array(count).fill(0);</span>
-		const <span class="cstat-no" title="statement not covered" >{ blindedMessages, rs, secrets } = t</span>his.createBlindedMessages(amounts, keys.id, start);
+		const <span class="cstat-no" title="statement not covered" >{ blindedMessages, blindingFactors, secrets } = t</span>his.createBlindedMessages(
+			amounts,
+			keys.id,
+			start
+		);
 &nbsp;
 		const <span class="cstat-no" title="statement not covered" >{ outputs, promises } = <span class="cstat-no" title="statement not covered" >a</span>wait this.mint.restore({ outputs: blindedMessages });</span>
 &nbsp;
 		// Collect and map the secrets and blinding factors with the blinded messages that were returned from the mint
-		const <span class="cstat-no" title="statement not covered" >validRs = rs.filter(<span class="fstat-no" title="function not covered" >(_</span>: bigint, i: number) =&gt;</span>
+		const <span class="cstat-no" title="statement not covered" >validBlindingFactors = blindingFactors.filter(<span class="fstat-no" title="function not covered" >(_</span>: bigint, i: number) =&gt;</span>
 <span class="cstat-no" title="statement not covered" >			outputs.map(<span class="fstat-no" title="function not covered" >(o</span>: SerializedBlindedMessage) =&gt; <span class="cstat-no" title="statement not covered" >o.B_).</span>includes(blindedMessages[i].B_)</span>
 		);
 		const <span class="cstat-no" title="statement not covered" >validSecrets = secrets.filter(<span class="fstat-no" title="function not covered" >(_</span>: Uint8Array, i: number) =&gt;</span>
@@ -1887,33 +2624,9 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 		);
 &nbsp;
 <span class="cstat-no" title="statement not covered" >		return {</span>
-			proofs: this.constructProofs(promises, validRs, validSecrets, keys)
+			proofs: this.constructProofs(promises, validBlindingFactors, validSecrets, keys)
 		};
 	}
-&nbsp;
-	/**
-	 * Initialize the wallet with the mints public keys
-	 */
-	private async getKeys(keysetId?: string, unit?: string): Promise&lt;MintKeys&gt; {
-		if (<span class="missing-if-branch" title="if path not taken" >I</span>!this._keys || (<span class="branch-1 cbranch-no" title="branch not covered" >keysetId !== undefined </span>&amp;&amp; <span class="branch-2 cbranch-no" title="branch not covered" >this._keys.id !== keysetId)</span>) {
-			const allKeys = await this.mint.getKeys(keysetId);
-			let keys;
-			<span class="missing-if-branch" title="if path not taken" >I</span>if (keysetId) {
-<span class="cstat-no" title="statement not covered" >				keys = allKeys.keysets.find(<span class="fstat-no" title="function not covered" >(k</span>: MintKeys) =&gt; <span class="cstat-no" title="statement not covered" >k.id === keysetId);</span></span>
-			} else {
-				keys = allKeys.keysets.find((k: MintKeys) =&gt; (unit ? <span class="branch-0 cbranch-no" title="branch not covered" >k.unit === unit </span>: k.unit === 'sat'));
-			}
-			<span class="missing-if-branch" title="if path not taken" >I</span>if (!keys) {
-<span class="cstat-no" title="statement not covered" >				throw new Error(</span>
-					`could not initialize keys. No keyset with unit '${unit ? unit : 'sat'}' found`
-				);
-			}
-			if (!this._keys) {
-				this._keys = keys;
-			}
-		}
-		return this._keys;
-	}
 &nbsp;
 	/**
 	 * Requests a mint quote form the mint. Response returns a Lightning payment request for the requested given amount and unit.
@@ -1940,26 +2653,44 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 	}
 &nbsp;
 	/**
-	 * Mint tokens for a given mint quote
+	 * Mint proofs for a given mint quote
 	 * @param amount amount to request
 	 * @param quote ID of mint quote
+	 * @param options.keysetId? optionally set keysetId for blank outputs for returned change.
+	 * @param options.preference? Deprecated. Use `outputAmounts` instead. Optional preference for splitting proofs into specific amounts.
+	 * @param options.outputAmounts? optionally specify the output's amounts to keep and to send.
+	 * @param options.counter? optionally set counter to derive secret deterministically. CashuWallet class must be initialized with seed phrase to take effect
+	 * @param options.pubkey? optionally locks ecash to pubkey. Will not be deterministic, even if counter is set!
 	 * @returns proofs
 	 */
-	async mintTokens(
+	async mintProofs(
 		amount: number,
 		quote: string,
 		options?: {
 			keysetId?: string;
-			preference?: Array&lt;AmountPreference&gt;;
+			outputAmounts?: OutputAmounts;
+			proofsWeHave?: Array&lt;Proof&gt;;
 			counter?: number;
 			pubkey?: string;
 		}
 	): Promise&lt;{ proofs: Array&lt;Proof&gt; }&gt; {
 		const keyset = await this.getKeys(<span class="branch-1 cbranch-no" title="branch not covered" >options?.keysetId)</span>;
-		const { blindedMessages, secrets, rs } = this.createRandomBlindedMessages(
+		<span class="missing-if-branch" title="if path not taken" >I</span>if (!<span class="branch-1 cbranch-no" title="branch not covered" >options?.outputAmounts </span>&amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >options?.proofsWeHave)</span> {
+<span class="cstat-no" title="statement not covered" >			options.outputAmounts = {</span>
+				keepAmounts: getKeepAmounts(
+					options.proofsWeHave,
+					amount,
+					keyset.keys,
+					this._denominationTarget
+				),
+				sendAmounts: []
+			};
+		}
+&nbsp;
+		const { blindedMessages, secrets, blindingFactors } = this.createRandomBlindedMessages(
 			amount,
 			keyset,
-<span class="branch-1 cbranch-no" title="branch not covered" >			options?.preference,</span>
+<span class="branch-1 cbranch-no" title="branch not covered" >			options?.outputAmounts<span class="branch-1 cbranch-no" title="branch not covered" >?</span>.keepAmounts,</span>
 <span class="branch-1 cbranch-no" title="branch not covered" >			options?.counter,</span>
 <span class="branch-1 cbranch-no" title="branch not covered" >			options?.pubkey</span>
 		);
@@ -1969,7 +2700,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 		};
 		const { signatures } = await this.mint.mint(mintPayload);
 		return {
-			proofs: this.constructProofs(signatures, rs, secrets, keyset)
+			proofs: this.constructProofs(signatures, blindingFactors, secrets, keyset)
 		};
 	}
 &nbsp;
@@ -1998,8 +2729,8 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 	}
 &nbsp;
 	/**
-	 * Melt tokens for a melt quote. proofsToSend must be at least amount+fee_reserve form the melt quote.
-	 * Returns payment proof and change proofs
+	 * Melt proofs for a melt quote. proofsToSend must be at least amount+fee_reserve form the melt quote. This function does not perform coin selection!.
+	 * Returns melt quote and change proofs
 	 * @param meltQuote ID of the melt quote
 	 * @param proofsToSend proofs to melt
 	 * @param options.keysetId? optionally set keysetId for blank outputs for returned change.
@@ -2007,7 +2738,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 	 * @param options.privkey? optionally set a private key to unlock P2PK locked secrets
 	 * @returns
 	 */
-	async meltTokens(
+<span class="fstat-no" title="function not covered" >	async m</span>eltProofs(
 		meltQuote: MeltQuoteResponse,
 		proofsToSend: Array&lt;Proof&gt;,
 		options?: {
@@ -2015,15 +2746,14 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 			counter?: number;
 			privkey?: string;
 		}
-	): Promise&lt;MeltTokensResponse&gt; {
-		const keys = await this.getKeys(options<span class="branch-0 cbranch-no" title="branch not covered" >?.k</span>eysetId);
-&nbsp;
-		const { blindedMessages, secrets, rs } = this.createBlankOutputs(
-			meltQuote.fee_reserve,
+	): Promise&lt;MeltProofsResponse&gt; {
+		const <span class="cstat-no" title="statement not covered" >keys = <span class="cstat-no" title="statement not covered" ><span class="branch-0 cbranch-no" title="branch not covered" >await this.getKeys(options?.keysetId);</span></span></span>
+		const <span class="cstat-no" title="statement not covered" >{ blindedMessages, secrets, blindingFactors } = t</span>his.createBlankOutputs(
+			sumProofs(proofsToSend) - meltQuote.amount,
 			keys.id,
-			options<span class="branch-0 cbranch-no" title="branch not covered" >?.c</span>ounter
+			options?.counter
 		);
-		<span class="missing-if-branch" title="if path not taken" >I</span>if (options<span class="branch-0 cbranch-no" title="branch not covered" >?.p</span>rivkey != undefined) {
+<span class="cstat-no" title="statement not covered" >		<span class="missing-if-branch" title="if path not taken" >I</span>if (options?.privkey != undefined) {</span>
 <span class="cstat-no" title="statement not covered" >			proofsToSend = getSignedProofs(</span>
 				proofsToSend.map(<span class="fstat-no" title="function not covered" >(p</span>: Proof) =&gt; {
 <span class="cstat-no" title="statement not covered" >					return {</span>
@@ -2036,85 +2766,27 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 				options.privkey
 			).map(<span class="fstat-no" title="function not covered" >(p</span>: NUT11Proof) =&gt; <span class="cstat-no" title="statement not covered" >serializeProof(p));</span>
 		}
-		const meltPayload: MeltPayload = {
+		const <span class="cstat-no" title="statement not covered" >meltPayload: MeltPayload = {</span>
 			quote: meltQuote.quote,
 			inputs: proofsToSend,
 			outputs: [...blindedMessages]
 		};
-		const meltResponse = await this.mint.melt(meltPayload);
-&nbsp;
-		return {
-			isPaid: meltResponse.state === MeltQuoteState.PAID,
-			preimage: meltResponse.payment_preimage,
-			change: meltResponse<span class="branch-0 cbranch-no" title="branch not covered" >?.c</span>hange
-				? this.constructProofs(meltResponse.change, rs, secrets, keys)
-				: []
-		};
-	}
-&nbsp;
-	/**
-	 * Helper function that pays a Lightning invoice directly without having to create a melt quote before
-	 * The combined amount of Proofs must match the payment amount including fees.
-	 * @param invoice
-	 * @param proofsToSend the exact amount to send including fees
-	 * @param meltQuote melt quote for the invoice
-	 * @param options.keysetId? optionally set keysetId for blank outputs for returned change.
-	 * @param options.counter? optionally set counter to derive secret deterministically. CashuWallet class must be initialized with seed phrase to take effect
-	 * @param options.privkey? optionally set a private key to unlock P2PK locked secrets
-	 * @returns
-	 */
-	async payLnInvoice(
-		invoice: string,
-		proofsToSend: Array&lt;Proof&gt;,
-		meltQuote?: MeltQuoteResponse,
-		options?: {
-			keysetId?: string;
-			counter?: number;
-			privkey?: string;
-		}
-	): Promise&lt;MeltTokensResponse&gt; {
-		if (!meltQuote) {
-<span class="cstat-no" title="statement not covered" >			meltQuote = <span class="cstat-no" title="statement not covered" >await this.mint.createMeltQuote({ unit: this._unit, request: invoice });</span></span>
-		}
-		return await this.meltTokens(meltQuote, proofsToSend, {
-			keysetId: <span class="branch-1 cbranch-no" title="branch not covered" >options?.keysetId,</span>
-			counter: <span class="branch-1 cbranch-no" title="branch not covered" >options?.counter,</span>
-			privkey: <span class="branch-1 cbranch-no" title="branch not covered" >options?.privkey</span>
-		});
-	}
-&nbsp;
-	/**
-	 * Helper function to ingest a Cashu token and pay a Lightning invoice with it.
-	 * @param invoice Lightning invoice
-	 * @param token cashu token
-	 * @param meltQuote melt quote for the invoice
-	 * @param options.keysetId? optionally set keysetId for blank outputs for returned change.
-	 * @param options.counter? optionally set counter to derive secret deterministically. CashuWallet class must be initialized with seed phrase to take effect
-	 */
-<span class="fstat-no" title="function not covered" >	async p</span>ayLnInvoiceWithToken(
-		invoice: string,
-		token: string,
-		meltQuote: MeltQuoteResponse,
-		options?: {
-			keysetId?: string;
-			counter?: number;
+		const <span class="cstat-no" title="statement not covered" >meltResponse = <span class="cstat-no" title="statement not covered" >await this.mint.melt(meltPayload);</span></span>
+		let <span class="cstat-no" title="statement not covered" >change: Array&lt;Proof&gt; = [];</span>
+<span class="cstat-no" title="statement not covered" >		<span class="missing-if-branch" title="if path not taken" >I</span>if (meltResponse.change) {</span>
+<span class="cstat-no" title="statement not covered" >			change = this.constructProofs(meltResponse.change, blindingFactors, secrets, keys);</span>
 		}
-	): Promise&lt;MeltTokensResponse&gt; {
-		const <span class="cstat-no" title="statement not covered" >decodedToken = getDecodedToken(token);</span>
-		const <span class="cstat-no" title="statement not covered" >proofs = decodedToken.token</span>
-			.filter(<span class="fstat-no" title="function not covered" >(x</span>: TokenEntry) =&gt; <span class="cstat-no" title="statement not covered" >x.mint === this.mint.mintUrl)</span>
-			.flatMap(<span class="fstat-no" title="function not covered" >(t</span>: TokenEntry) =&gt; <span class="cstat-no" title="statement not covered" >t.proofs);</span>
-<span class="cstat-no" title="statement not covered" >		return this.payLnInvoice(invoice, proofs, meltQuote, {</span>
-			keysetId: options?.keysetId,
-			counter: options?.counter
-		});
+<span class="cstat-no" title="statement not covered" >		return {</span>
+			quote: meltResponse,
+			change: change
+		};
 	}
 &nbsp;
 	/**
 	 * Creates a split payload
 	 * @param amount amount to send
 	 * @param proofsToSend proofs to split*
-	 * @param preference optional preference for splitting proofs into specific amounts. overrides amount param
+	 * @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
 	 * @param pubkey? optionally locks ecash to pubkey. Will not be deterministic, even if counter is set!
 	 * @param privkey? will create a signature on the @param proofsToSend secrets if set
@@ -2124,22 +2796,25 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 		amount: number,
 		proofsToSend: Array&lt;Proof&gt;,
 		keyset: MintKeys,
-		preference?: Preferences | Array&lt;AmountPreference&gt;,
+		outputAmounts?: OutputAmounts,
 		counter?: number,
 		pubkey?: string,
 		privkey?: string
 	): {
 		payload: SwapPayload;
-		blindedMessages: BlindedTransaction;
+		blindingData: BlindingData;
 	} {
-		<span class="missing-if-branch" title="if path not taken" >I</span>if (isAmountPreferenceArray(preference)) {
-<span class="cstat-no" title="statement not covered" >			preference = deprecatedAmountPreferences(preference);</span>
-		}
 		const totalAmount = proofsToSend.reduce((total: number, curr: Proof) =&gt; total + curr.amount, 0);
+		if (outputAmounts &amp;&amp; outputAmounts.sendAmounts &amp;&amp; !outputAmounts.keepAmounts) {
+			outputAmounts.keepAmounts = splitAmount(
+				totalAmount - amount - this.getFeesForProofs(proofsToSend),
+				keyset.keys
+			);
+		}
 		const keepBlindedMessages = this.createRandomBlindedMessages(
-			totalAmount - amount,
+			totalAmount - amount - this.getFeesForProofs(proofsToSend),
 			keyset,
-			preference?.keepPreference,
+			outputAmounts?.keepAmounts,
 			counter
 		);
 		<span class="missing-if-branch" title="if path not taken" >I</span>if (this._seed &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >counter)</span> {
@@ -2148,7 +2823,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 		const sendBlindedMessages = this.createRandomBlindedMessages(
 			amount,
 			keyset,
-			preference?.sendPreference,
+			outputAmounts?.sendAmounts,
 			counter,
 			pubkey
 		);
@@ -2167,54 +2842,60 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 		}
 &nbsp;
 		// join keepBlindedMessages and sendBlindedMessages
-		const blindedMessages: BlindedTransaction = {
+		const blindingData: BlindingData = {
 			blindedMessages: [
 				...keepBlindedMessages.blindedMessages,
 				...sendBlindedMessages.blindedMessages
 			],
 			secrets: [...keepBlindedMessages.secrets, ...sendBlindedMessages.secrets],
-			rs: [...keepBlindedMessages.rs, ...sendBlindedMessages.rs],
-			amounts: [...keepBlindedMessages.amounts, ...sendBlindedMessages.amounts]
+			blindingFactors: [
+				...keepBlindedMessages.blindingFactors,
+				...sendBlindedMessages.blindingFactors
+			]
 		};
 &nbsp;
 		const payload = {
 			inputs: proofsToSend,
-			outputs: [...blindedMessages.blindedMessages]
+			outputs: [...blindingData.blindedMessages]
 		};
-		return { payload, blindedMessages };
+		return { payload, blindingData };
 	}
+&nbsp;
 	/**
-	 * returns proofs that are already spent (use for keeping wallet state clean)
-	 * @param proofs (only the 'Y' field is required)
+	 * Get an array of the states of proofs from the mint (as an array of CheckStateEnum's)
+	 * @param proofs (only the `secret` field is required)
 	 * @returns
 	 */
-	async checkProofsSpent&lt;T extends { secret: string }&gt;(proofs: Array&lt;T&gt;): Promise&lt;Array&lt;T&gt;&gt; {
+	async checkProofsStates(proofs: Array&lt;Proof&gt;): Promise&lt;Array&lt;ProofState&gt;&gt; {
 		const enc = new TextEncoder();
-		const Ys = proofs.map((p: T) =&gt; hashToCurve(enc.encode(p.secret)).toHex(true));
-		const payload = {
-			// array of Ys of proofs to check
-			Ys: Ys
-		};
-		const { states } = await this.mint.check(payload);
-&nbsp;
-		return proofs.filter((_: T, i: number) =&gt; {
-			const state = states.find((state: CheckStateEntry) =&gt; state.Y === Ys[i]);
-			return state &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >state.state === CheckStateEnum.SPENT;</span>
-		});
-	}
-	private splitReceive(
-		amount: number,
-		amountAvailable: number
-	): { amountKeep: number; amountSend: number } {
-		const amountKeep: number = amountAvailable - amount;
-		const amountSend: number = amount;
-		return { amountKeep, amountSend };
+		const Ys = proofs.map((p: Proof) =&gt; hashToCurve(enc.encode(p.secret)).toHex(true));
+		// TODO: Replace this with a value from the info endpoint of the mint eventually
+		const BATCH_SIZE = 100;
+		const states: Array&lt;ProofState&gt; = [];
+		for (let i = 0; i &lt; Ys.length; i += BATCH_SIZE) {
+			const YsSlice = Ys.slice(i, i + BATCH_SIZE);
+			const { states: batchStates } = await this.mint.check({
+				Ys: YsSlice
+			});
+			const stateMap: { [y: string]: ProofState } = {};
+			batchStates.forEach((s) =&gt; {
+				stateMap[s.Y] = s;
+			});
+			for (let j = 0; j &lt; YsSlice.length; j++) {
+				const state = stateMap[YsSlice[j]];
+				<span class="missing-if-branch" title="if path not taken" >I</span>if (!state) {
+<span class="cstat-no" title="statement not covered" >					throw new Error('Could not find state for proof with Y: ' + YsSlice[j]);</span>
+				}
+				states.push(state);
+			}
+		}
+		return states;
 	}
 &nbsp;
 	/**
 	 * Creates blinded messages for a given amount
 	 * @param amount amount to create blinded messages for
-	 * @param amountPreference optional preference for splitting proofs into specific amounts. overrides amount param
+	 * @param split optional preference for splitting proofs into specific amounts. overrides amount param
 	 * @param keyksetId? override the keysetId derived from the current mintKeys with a custom one. This should be a keyset that was fetched from the `/keysets` endpoint
 	 * @param counter? optionally set counter to derive secret deterministically. CashuWallet class must be initialized with seed phrase to take effect
 	 * @param pubkey? optionally locks ecash to pubkey. Will not be deterministic, even if counter is set!
@@ -2223,11 +2904,11 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 	private createRandomBlindedMessages(
 		amount: number,
 		keyset: MintKeys,
-		amountPreference?: Array&lt;AmountPreference&gt;,
+		split?: Array&lt;number&gt;,
 		counter?: number,
 		pubkey?: string
-	): BlindedMessageData &amp; { amounts: Array&lt;number&gt; } {
-		const amounts = splitAmount(amount, keyset.keys, amountPreference);
+	): BlindingData &amp; { amounts: Array&lt;number&gt; } {
+		const amounts = splitAmount(amount, keyset.keys, split);
 		return this.createBlindedMessages(amounts, keyset.id, counter, pubkey);
 	}
 &nbsp;
@@ -2244,16 +2925,16 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 		keysetId: string,
 		counter?: number,
 		pubkey?: string
-	): BlindedMessageData &amp; { amounts: Array&lt;number&gt; } {
+	): BlindingData &amp; { amounts: Array&lt;number&gt; } {
 		// if we atempt to create deterministic messages without a _seed, abort.
 		if (counter != undefined &amp;&amp; !this._seed) {
 			throw new Error(
-				'Cannot create deterministic messages without seed. Instantiate CashuWallet with a mnemonic, or omit counter param.'
+				'Cannot create deterministic messages without seed. Instantiate CashuWallet with a bip39seed, or omit counter param.'
 			);
 		}
 		const blindedMessages: Array&lt;SerializedBlindedMessage&gt; = [];
 		const secrets: Array&lt;Uint8Array&gt; = [];
-		const rs: Array&lt;bigint&gt; = [];
+		const blindingFactors: Array&lt;bigint&gt; = [];
 		for (let i = 0; i &lt; amounts.length; i++) {
 			let deterministicR = undefined;
 			let secretBytes = undefined;
@@ -2271,34 +2952,34 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
 			}
 			secrets.push(secretBytes);
 			const { B_, r } = blindMessage(secretBytes, deterministicR);
-			rs.push(r);
+			blindingFactors.push(r);
 			const blindedMessage = new BlindedMessage(amounts[i], B_, keysetId);
 			blindedMessages.push(blindedMessage.getSerializedBlindedMessage());
 		}
-		return { blindedMessages, secrets, rs, amounts };
+		return { blindedMessages, secrets, blindingFactors, amounts };
 	}
 &nbsp;
 	/**
 	 * Creates NUT-08 blank outputs (fee returns) for a given fee reserve
 	 * See: https://github.com/cashubtc/nuts/blob/main/08.md
-	 * @param feeReserve amount to cover with blank outputs
+	 * @param amount amount to cover with blank outputs
 	 * @param keysetId mint keysetId
 	 * @param counter? optionally set counter to derive secret deterministically. CashuWallet class must be initialized with seed phrase to take effect
 	 * @returns blinded messages, secrets, and rs
 	 */
-	private createBlankOutputs(
-		feeReserve: number,
-		keysetId: string,
-		counter?: number
-	): BlindedMessageData {
-		let count = Math.ceil(Math.log2(feeReserve)) || 1;
+<span class="fstat-no" title="function not covered" >	private c</span>reateBlankOutputs(amount: number, keysetId: string, counter?: number): BlindingData {
+		let count = <span class="cstat-no" title="statement not covered" >Math.ceil(Math.log2(amount)) || 1;</span>
 		//Prevent count from being -Infinity
-		<span class="missing-if-branch" title="if path not taken" >I</span>if (count &lt; 0) {
+<span class="cstat-no" title="statement not covered" >		<span class="missing-if-branch" title="if path not taken" >I</span>if (count &lt; 0) {</span>
 <span class="cstat-no" title="statement not covered" >			count = 0;</span>
 		}
-		const amounts = count ? Array(count).fill(1) : <span class="branch-1 cbranch-no" title="branch not covered" >[];</span>
-		const { blindedMessages, rs, secrets } = this.createBlindedMessages(amounts, keysetId, counter);
-		return { blindedMessages, secrets, rs };
+		const amounts = <span class="cstat-no" title="statement not covered" >count ? Array(count).fill(1) : [];</span>
+		const { blindedMessages<span class="cstat-no" title="statement not covered" >, b</span>lindingFactors<span class="cstat-no" title="statement not covered" >, s</span>ecrets<span class="cstat-no" title="statement not covered" > } = <span class="cstat-no" title="statement not covered" >t</span>his.createBlindedMessages(</span>
+			amounts,
+			keysetId,
+			counter
+		);
+<span class="cstat-no" title="statement not covered" >		return { blindedMessages, secrets, blindingFactors };</span>
 	}
 &nbsp;
 	/**
@@ -2335,7 +3016,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> CashuWa
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/base64.ts.html b/coverage/staging/src/base64.ts.html
index 3f44c40f..9df46ffc 100644
--- a/coverage/staging/src/base64.ts.html
+++ b/coverage/staging/src/base64.ts.html
@@ -128,8 +128,8 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> base64.
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -144,7 +144,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> base64.
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -208,7 +208,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> base64.
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/cbor.ts.html b/coverage/staging/src/cbor.ts.html
index 639ce183..caf27e70 100644
--- a/coverage/staging/src/cbor.ts.html
+++ b/coverage/staging/src/cbor.ts.html
@@ -1078,7 +1078,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> cbor.ts
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/index.html b/coverage/staging/src/index.html
index 4fdbf7f2..8b3e2b46 100644
--- a/coverage/staging/src/index.html
+++ b/coverage/staging/src/index.html
@@ -23,30 +23,30 @@ <h1><a href="../index.html">All files</a> src</h1>
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">77.14% </span>
+                <span class="strong">75.19% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>584/757</span>
+                <span class='fraction'>691/919</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">64.27% </span>
+                <span class="strong">61.67% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>304/473</span>
+                <span class='fraction'>354/574</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">67.1% </span>
+                <span class="strong">70.58% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>102/152</span>
+                <span class='fraction'>132/187</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">77.04% </span>
+                <span class="strong">75.18% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>517/671</span>
+                <span class='fraction'>606/806</span>
             </div>
         
             
@@ -80,32 +80,32 @@ <h1><a href="../index.html">All files</a> src</h1>
 </thead>
 <tbody><tr>
 	<td class="file medium" data-value="CashuMint.ts"><a href="CashuMint.ts.html">CashuMint.ts</a></td>
-	<td data-value="71.54" class="pic medium">
-	<div class="chart"><div class="cover-fill" style="width: 71%"></div><div class="cover-empty" style="width: 29%"></div></div>
+	<td data-value="68.29" class="pic medium">
+	<div class="chart"><div class="cover-fill" style="width: 68%"></div><div class="cover-empty" style="width: 32%"></div></div>
 	</td>
-	<td data-value="71.54" class="pct medium">71.54%</td>
-	<td data-value="123" class="abs medium">88/123</td>
-	<td data-value="55.08" class="pct medium">55.08%</td>
-	<td data-value="118" class="abs medium">65/118</td>
+	<td data-value="68.29" class="pct medium">68.29%</td>
+	<td data-value="123" class="abs medium">84/123</td>
+	<td data-value="50" class="pct medium">50%</td>
+	<td data-value="118" class="abs medium">59/118</td>
 	<td data-value="59.25" class="pct medium">59.25%</td>
 	<td data-value="27" class="abs medium">16/27</td>
-	<td data-value="71.81" class="pct medium">71.81%</td>
-	<td data-value="110" class="abs medium">79/110</td>
+	<td data-value="69.09" class="pct medium">69.09%</td>
+	<td data-value="110" class="abs medium">76/110</td>
 	</tr>
 
 <tr>
 	<td class="file medium" data-value="CashuWallet.ts"><a href="CashuWallet.ts.html">CashuWallet.ts</a></td>
-	<td data-value="75.48" class="pic medium">
-	<div class="chart"><div class="cover-fill" style="width: 75%"></div><div class="cover-empty" style="width: 25%"></div></div>
+	<td data-value="70" class="pic medium">
+	<div class="chart"><div class="cover-fill" style="width: 70%"></div><div class="cover-empty" style="width: 30%"></div></div>
 	</td>
-	<td data-value="75.48" class="pct medium">75.48%</td>
-	<td data-value="257" class="abs medium">194/257</td>
-	<td data-value="71.42" class="pct medium">71.42%</td>
-	<td data-value="231" class="abs medium">165/231</td>
-	<td data-value="60.41" class="pct medium">60.41%</td>
-	<td data-value="48" class="abs medium">29/48</td>
-	<td data-value="75.78" class="pct medium">75.78%</td>
-	<td data-value="223" class="abs medium">169/223</td>
+	<td data-value="70" class="pct medium">70%</td>
+	<td data-value="370" class="abs medium">259/370</td>
+	<td data-value="65.47" class="pct medium">65.47%</td>
+	<td data-value="307" class="abs medium">201/307</td>
+	<td data-value="59.42" class="pct medium">59.42%</td>
+	<td data-value="69" class="abs medium">41/69</td>
+	<td data-value="70.34" class="pct medium">70.34%</td>
+	<td data-value="317" class="abs medium">223/317</td>
 	</tr>
 
 <tr>
@@ -144,13 +144,13 @@ <h1><a href="../index.html">All files</a> src</h1>
 	<div class="chart"><div class="cover-fill cover-full" style="width: 100%"></div><div class="cover-empty" style="width: 0%"></div></div>
 	</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="18" class="abs high">18/18</td>
+	<td data-value="15" class="abs high">15/15</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="0" class="abs high">0/0</td>
-	<td data-value="18.18" class="pct low">18.18%</td>
-	<td data-value="11" class="abs low">2/11</td>
+	<td data-value="22.22" class="pct low">22.22%</td>
+	<td data-value="9" class="abs low">2/9</td>
 	<td data-value="100" class="pct high">100%</td>
-	<td data-value="18" class="abs high">18/18</td>
+	<td data-value="15" class="abs high">15/15</td>
 	</tr>
 
 <tr>
@@ -170,17 +170,17 @@ <h1><a href="../index.html">All files</a> src</h1>
 
 <tr>
 	<td class="file high" data-value="utils.ts"><a href="utils.ts.html">utils.ts</a></td>
-	<td data-value="88.09" class="pic high">
-	<div class="chart"><div class="cover-fill" style="width: 88%"></div><div class="cover-empty" style="width: 12%"></div></div>
+	<td data-value="89.88" class="pic high">
+	<div class="chart"><div class="cover-fill" style="width: 89%"></div><div class="cover-empty" style="width: 11%"></div></div>
 	</td>
-	<td data-value="88.09" class="pct high">88.09%</td>
-	<td data-value="126" class="abs high">111/126</td>
-	<td data-value="56.66" class="pct medium">56.66%</td>
-	<td data-value="30" class="abs medium">17/30</td>
-	<td data-value="77.77" class="pct medium">77.77%</td>
-	<td data-value="36" class="abs medium">28/36</td>
-	<td data-value="88.69" class="pct high">88.69%</td>
-	<td data-value="115" class="abs high">102/115</td>
+	<td data-value="89.88" class="pct high">89.88%</td>
+	<td data-value="178" class="abs high">160/178</td>
+	<td data-value="67.27" class="pct medium">67.27%</td>
+	<td data-value="55" class="abs medium">37/55</td>
+	<td data-value="88.46" class="pct high">88.46%</td>
+	<td data-value="52" class="abs high">46/52</td>
+	<td data-value="89.93" class="pct high">89.93%</td>
+	<td data-value="159" class="abs high">143/159</td>
 	</tr>
 
 </tbody>
@@ -191,7 +191,7 @@ <h1><a href="../index.html">All files</a> src</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/index.ts.html b/coverage/staging/src/index.ts.html
index 067562b1..ea05a188 100644
--- a/coverage/staging/src/index.ts.html
+++ b/coverage/staging/src/index.ts.html
@@ -25,7 +25,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> index.t
             <div class='fl pad1y space-right2'>
                 <span class="strong">100% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>18/18</span>
+                <span class='fraction'>15/15</span>
             </div>
         
             
@@ -37,16 +37,16 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> index.t
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">18.18% </span>
+                <span class="strong">22.22% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>2/11</span>
+                <span class='fraction'>2/9</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
                 <span class="strong">100% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>18/18</span>
+                <span class='fraction'>15/15</span>
             </div>
         
             
@@ -88,11 +88,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> index.t
 <a name='L23'></a><a href='#L23'>23</a>
 <a name='L24'></a><a href='#L24'>24</a>
 <a name='L25'></a><a href='#L25'>25</a>
-<a name='L26'></a><a href='#L26'>26</a>
-<a name='L27'></a><a href='#L27'>27</a>
-<a name='L28'></a><a href='#L28'>28</a>
-<a name='L29'></a><a href='#L29'>29</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
+<a name='L26'></a><a href='#L26'>26</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
@@ -116,14 +112,11 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> index.t
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { CashuMint } from './CashuMint.js';
 import { CashuWallet } from './CashuWallet.js';
 import { PaymentRequest } from './model/PaymentRequest.js';
 import { setGlobalRequestOptions } from './request.js';
-import { generateNewMnemonic, deriveSeedFromMnemonic } from '@cashu/crypto/modules/client/NUT09';
 import {
 	getEncodedToken,
 	getEncodedTokenV4,
@@ -143,8 +136,6 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> index.t
 <span class="fstat-no" title="function not covered" >	getEncodedTokenV4,</span>
 	decodePaymentRequest,
 <span class="fstat-no" title="function not covered" >	deriveKeysetId,</span>
-<span class="fstat-no" title="function not covered" >	generateNewMnemonic,</span>
-<span class="fstat-no" title="function not covered" >	deriveSeedFromMnemonic,</span>
 <span class="fstat-no" title="function not covered" >	setGlobalRequestOptions</span>
 };
 &nbsp;</pre></td></tr></table></pre>
@@ -154,7 +145,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> index.t
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/legacy/cashu-ts.ts.html b/coverage/staging/src/legacy/cashu-ts.ts.html
deleted file mode 100644
index f98003a7..00000000
--- a/coverage/staging/src/legacy/cashu-ts.ts.html
+++ /dev/null
@@ -1,154 +0,0 @@
-
-<!doctype html>
-<html lang="en">
-
-<head>
-    <title>Code coverage report for src/legacy/cashu-ts.ts</title>
-    <meta charset="utf-8" />
-    <link rel="stylesheet" href="../../prettify.css" />
-    <link rel="stylesheet" href="../../base.css" />
-    <link rel="shortcut icon" type="image/x-icon" href="../../favicon.png" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <style type='text/css'>
-        .coverage-summary .sorter {
-            background-image: url(../../sort-arrow-sprite.png);
-        }
-    </style>
-</head>
-    
-<body>
-<div class='wrapper'>
-    <div class='pad1'>
-        <h1><a href="../../index.html">All files</a> / <a href="index.html">src/legacy</a> cashu-ts.ts</h1>
-        <div class='clearfix'>
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">63.63% </span>
-                <span class="quiet">Statements</span>
-                <span class='fraction'>7/11</span>
-            </div>
-        
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">12.5% </span>
-                <span class="quiet">Branches</span>
-                <span class='fraction'>1/8</span>
-            </div>
-        
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">25% </span>
-                <span class="quiet">Functions</span>
-                <span class='fraction'>1/4</span>
-            </div>
-        
-            
-            <div class='fl pad1y space-right2'>
-                <span class="strong">57.14% </span>
-                <span class="quiet">Lines</span>
-                <span class='fraction'>4/7</span>
-            </div>
-        
-            
-        </div>
-        <p class="quiet">
-            Press <em>n</em> or <em>j</em> to go to the next uncovered block, <em>b</em>, <em>p</em> or <em>k</em> for the previous block.
-        </p>
-        <template id="filterTemplate">
-            <div class="quiet">
-                Filter:
-                <input type="search" id="fileSearch">
-            </div>
-        </template>
-    </div>
-    <div class='status-line medium'></div>
-    <pre><table class="coverage">
-<tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
-<a name='L2'></a><a href='#L2'>2</a>
-<a name='L3'></a><a href='#L3'>3</a>
-<a name='L4'></a><a href='#L4'>4</a>
-<a name='L5'></a><a href='#L5'>5</a>
-<a name='L6'></a><a href='#L6'>6</a>
-<a name='L7'></a><a href='#L7'>7</a>
-<a name='L8'></a><a href='#L8'>8</a>
-<a name='L9'></a><a href='#L9'>9</a>
-<a name='L10'></a><a href='#L10'>10</a>
-<a name='L11'></a><a href='#L11'>11</a>
-<a name='L12'></a><a href='#L12'>12</a>
-<a name='L13'></a><a href='#L13'>13</a>
-<a name='L14'></a><a href='#L14'>14</a>
-<a name='L15'></a><a href='#L15'>15</a>
-<a name='L16'></a><a href='#L16'>16</a>
-<a name='L17'></a><a href='#L17'>17</a>
-<a name='L18'></a><a href='#L18'>18</a>
-<a name='L19'></a><a href='#L19'>19</a>
-<a name='L20'></a><a href='#L20'>20</a>
-<a name='L21'></a><a href='#L21'>21</a>
-<a name='L22'></a><a href='#L22'>22</a>
-<a name='L23'></a><a href='#L23'>23</a>
-<a name='L24'></a><a href='#L24'>24</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">13x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { AmountPreference, Preferences } from '../model/types/index';
-&nbsp;
-export const deprecatedAmountPreferences = <span class="fstat-no" title="function not covered" >function (p</span>ref: Array&lt;AmountPreference&gt;): Preferences {
-<span class="cstat-no" title="statement not covered" >	console.warn('[DEPRECATION] Use `Preferences` instead of `Array&lt;AmountPreference&gt;`');</span>
-<span class="cstat-no" title="statement not covered" >	return { sendPreference: pref };</span>
-};
-&nbsp;
-export const isAmountPreference = <span class="fstat-no" title="function not covered" >function (o</span>bj: any): obj is AmountPreference {
-<span class="cstat-no" title="statement not covered" >	return (</span>
-		typeof obj === 'object' &amp;&amp;
-		obj !== null &amp;&amp;
-		'amount' in obj &amp;&amp;
-		'count' in obj &amp;&amp;
-		typeof obj.amount === 'number' &amp;&amp;
-		typeof obj.count === 'number'
-	);
-};
-&nbsp;
-export const isAmountPreferenceArray = function (
-	preference?: any
-): preference is Array&lt;AmountPreference&gt; {
-	return Array.isArray(preference) &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >preference.every(<span class="fstat-no" title="function not covered" >(i</span>tem) =&gt; <span class="cstat-no" title="statement not covered" >isAmountPreference(item));</span></span>
-};
-&nbsp;</pre></td></tr></table></pre>
-
-                <div class='push'></div><!-- for sticky footer -->
-            </div><!-- /wrapper -->
-            <div class='footer quiet pad2 space-top1 center small'>
-                Code coverage generated by
-                <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
-            </div>
-        <script src="../../prettify.js"></script>
-        <script>
-            window.onload = function () {
-                prettyPrint();
-            };
-        </script>
-        <script src="../../sorter.js"></script>
-        <script src="../../block-navigation.js"></script>
-    </body>
-</html>
-    
\ No newline at end of file
diff --git a/coverage/staging/src/legacy/index.html b/coverage/staging/src/legacy/index.html
index b06ce83a..80d82af5 100644
--- a/coverage/staging/src/legacy/index.html
+++ b/coverage/staging/src/legacy/index.html
@@ -23,30 +23,30 @@ <h1><a href="../../index.html">All files</a> src/legacy</h1>
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">69.69% </span>
+                <span class="strong">63.63% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>23/33</span>
+                <span class='fraction'>14/22</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">50% </span>
+                <span class="strong">58.33% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>16/32</span>
+                <span class='fraction'>14/24</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">50% </span>
+                <span class="strong">75% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>4/8</span>
+                <span class='fraction'>3/4</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">68.96% </span>
+                <span class="strong">63.63% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>20/29</span>
+                <span class='fraction'>14/22</span>
             </div>
         
             
@@ -79,21 +79,6 @@ <h1><a href="../../index.html">All files</a> src/legacy</h1>
 </tr>
 </thead>
 <tbody><tr>
-	<td class="file medium" data-value="cashu-ts.ts"><a href="cashu-ts.ts.html">cashu-ts.ts</a></td>
-	<td data-value="63.63" class="pic medium">
-	<div class="chart"><div class="cover-fill" style="width: 63%"></div><div class="cover-empty" style="width: 37%"></div></div>
-	</td>
-	<td data-value="63.63" class="pct medium">63.63%</td>
-	<td data-value="11" class="abs medium">7/11</td>
-	<td data-value="12.5" class="pct low">12.5%</td>
-	<td data-value="8" class="abs low">1/8</td>
-	<td data-value="25" class="pct low">25%</td>
-	<td data-value="4" class="abs low">1/4</td>
-	<td data-value="57.14" class="pct medium">57.14%</td>
-	<td data-value="7" class="abs medium">4/7</td>
-	</tr>
-
-<tr>
 	<td class="file low" data-value="nut-04.ts"><a href="nut-04.ts.html">nut-04.ts</a></td>
 	<td data-value="28.57" class="pic low">
 	<div class="chart"><div class="cover-fill" style="width: 28%"></div><div class="cover-empty" style="width: 72%"></div></div>
@@ -109,18 +94,18 @@ <h1><a href="../../index.html">All files</a> src/legacy</h1>
 	</tr>
 
 <tr>
-	<td class="file high" data-value="nut-05.ts"><a href="nut-05.ts.html">nut-05.ts</a></td>
-	<td data-value="85.71" class="pic high">
-	<div class="chart"><div class="cover-fill" style="width: 85%"></div><div class="cover-empty" style="width: 15%"></div></div>
+	<td class="file medium" data-value="nut-05.ts"><a href="nut-05.ts.html">nut-05.ts</a></td>
+	<td data-value="57.14" class="pic medium">
+	<div class="chart"><div class="cover-fill" style="width: 57%"></div><div class="cover-empty" style="width: 43%"></div></div>
 	</td>
-	<td data-value="85.71" class="pct high">85.71%</td>
-	<td data-value="7" class="abs high">6/7</td>
-	<td data-value="25" class="pct low">25%</td>
-	<td data-value="4" class="abs low">1/4</td>
+	<td data-value="57.14" class="pct medium">57.14%</td>
+	<td data-value="7" class="abs medium">4/7</td>
+	<td data-value="0" class="pct low">0%</td>
+	<td data-value="4" class="abs low">0/4</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="1" class="abs high">1/1</td>
-	<td data-value="85.71" class="pct high">85.71%</td>
-	<td data-value="7" class="abs high">6/7</td>
+	<td data-value="57.14" class="pct medium">57.14%</td>
+	<td data-value="7" class="abs medium">4/7</td>
 	</tr>
 
 <tr>
@@ -146,7 +131,7 @@ <h1><a href="../../index.html">All files</a> src/legacy</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/legacy/nut-04.ts.html b/coverage/staging/src/legacy/nut-04.ts.html
index c69c9f20..cd4c7e56 100644
--- a/coverage/staging/src/legacy/nut-04.ts.html
+++ b/coverage/staging/src/legacy/nut-04.ts.html
@@ -133,7 +133,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/legacy</
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/legacy/nut-05.ts.html b/coverage/staging/src/legacy/nut-05.ts.html
index 25457fbf..cfda27bf 100644
--- a/coverage/staging/src/legacy/nut-05.ts.html
+++ b/coverage/staging/src/legacy/nut-05.ts.html
@@ -23,16 +23,16 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/legacy</
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">85.71% </span>
+                <span class="strong">57.14% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>6/7</span>
+                <span class='fraction'>4/7</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">25% </span>
+                <span class="strong">0% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>1/4</span>
+                <span class='fraction'>0/4</span>
             </div>
         
             
@@ -44,9 +44,9 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/legacy</
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">85.71% </span>
+                <span class="strong">57.14% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>6/7</span>
+                <span class='fraction'>4/7</span>
             </div>
         
             
@@ -61,7 +61,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/legacy</
             </div>
         </template>
     </div>
-    <div class='status-line high'></div>
+    <div class='status-line medium'></div>
     <pre><table class="coverage">
 <tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
 <a name='L2'></a><a href='#L2'>2</a>
@@ -95,15 +95,15 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/legacy</
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">8x</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import type { MeltQuoteResponse } from '../model/types/index.js';
 import { MeltQuoteState } from '../model/types/index.js';
@@ -116,11 +116,11 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/legacy</
 	response: MeltQuoteResponse &amp; MeltQuoteResponsePaidDeprecated
 ): MeltQuoteResponse {
 	// if the response MeltQuoteResponse has a "paid" flag, we monkey patch it to the state enum
-	if (!response.state) {
-		console.warn(
+	<span class="missing-if-branch" title="if path not taken" >I</span>if (!response.state) {
+<span class="cstat-no" title="statement not covered" >		console.warn(</span>
 			"Field 'state' not found in MeltQuoteResponse. Update NUT-05 of mint: https://github.com/cashubtc/nuts/pull/136)"
 		);
-		<span class="missing-if-branch" title="if path not taken" >I</span>if (typeof response.paid === 'boolean') {
+<span class="cstat-no" title="statement not covered" >		<span class="missing-if-branch" title="if path not taken" >I</span>if (typeof response.paid === 'boolean') {</span>
 <span class="cstat-no" title="statement not covered" >			response.state = response.paid ? MeltQuoteState.PAID : MeltQuoteState.UNPAID;</span>
 		}
 	}
@@ -133,7 +133,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/legacy</
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/legacy/nut-06.ts.html b/coverage/staging/src/legacy/nut-06.ts.html
index cfd76b2f..fce02932 100644
--- a/coverage/staging/src/legacy/nut-06.ts.html
+++ b/coverage/staging/src/legacy/nut-06.ts.html
@@ -101,8 +101,8 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/legacy</
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -122,11 +122,11 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/legacy</
 				typeof contact[0] === 'string' &amp;&amp;
 				typeof contact[1] === 'string'
 			) {
+				console.warn(
+					`Mint returned deprecated 'contact' field: Update NUT-06: https://github.com/cashubtc/nuts/pull/117`
+				);
 				return { method: contact[0], info: contact[1] } as MintContactInfo;
 			}
-			console.warn(
-				"Mint returned deprecated 'contact' field. Update NUT-06: https://github.com/cashubtc/nuts/pull/117"
-			);
 			return contact;
 		});
 	}
@@ -139,7 +139,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/legacy</
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/model/BlindedMessage.ts.html b/coverage/staging/src/model/BlindedMessage.ts.html
index b376591a..8f2b5f23 100644
--- a/coverage/staging/src/model/BlindedMessage.ts.html
+++ b/coverage/staging/src/model/BlindedMessage.ts.html
@@ -88,12 +88,12 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/model</a
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">34x</span>
-<span class="cline-any cline-yes">34x</span>
+<span class="cline-any cline-yes">23x</span>
+<span class="cline-any cline-yes">23x</span>
+<span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">34x</span>
+<span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-yes">3x</span>
@@ -121,7 +121,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/model</a
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/model/Errors.ts.html b/coverage/staging/src/model/Errors.ts.html
index 67912a6a..c133e91a 100644
--- a/coverage/staging/src/model/Errors.ts.html
+++ b/coverage/staging/src/model/Errors.ts.html
@@ -91,7 +91,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/model</a
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/model/PaymentRequest.ts.html b/coverage/staging/src/model/PaymentRequest.ts.html
index f41ae930..db0439dd 100644
--- a/coverage/staging/src/model/PaymentRequest.ts.html
+++ b/coverage/staging/src/model/PaymentRequest.ts.html
@@ -298,7 +298,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/model</a
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/model/index.html b/coverage/staging/src/model/index.html
index 4ecd321b..e11b0f3d 100644
--- a/coverage/staging/src/model/index.html
+++ b/coverage/staging/src/model/index.html
@@ -131,7 +131,7 @@ <h1><a href="../../index.html">All files</a> src/model</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/model/types/index.html b/coverage/staging/src/model/types/index.html
index 3bb99841..8b02cb54 100644
--- a/coverage/staging/src/model/types/index.html
+++ b/coverage/staging/src/model/types/index.html
@@ -101,7 +101,7 @@ <h1><a href="../../../index.html">All files</a> src/model/types</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../../../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/model/types/index.ts.html b/coverage/staging/src/model/types/index.ts.html
index c79b2bc9..d8253108 100644
--- a/coverage/staging/src/model/types/index.ts.html
+++ b/coverage/staging/src/model/types/index.ts.html
@@ -82,9 +82,7 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">src/model
 <a name='L17'></a><a href='#L17'>17</a>
 <a name='L18'></a><a href='#L18'>18</a>
 <a name='L19'></a><a href='#L19'>19</a>
-<a name='L20'></a><a href='#L20'>20</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</span>
+<a name='L20'></a><a href='#L20'>20</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -101,16 +99,18 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">src/model
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { AmountPreference } from './wallet/index';
-&nbsp;
-export * from './mint/index';
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">export * from './mint/index';
 export * from './wallet/index';
 &nbsp;
-export type Preferences = {
-	sendPreference: Array&lt;AmountPreference&gt;;
-	keepPreference?: Array&lt;AmountPreference&gt;;
+export type OutputAmounts = {
+	sendAmounts: Array&lt;number&gt;;
+	keepAmounts?: Array&lt;number&gt;;
 };
 &nbsp;
+// deprecated
+&nbsp;
 export type InvoiceData = {
 	paymentRequest: string;
 	amountInSats?: number;
@@ -127,7 +127,7 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">src/model
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../../../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/model/types/mint/index.html b/coverage/staging/src/model/types/mint/index.html
index 95eaaab8..a5fd30ce 100644
--- a/coverage/staging/src/model/types/mint/index.html
+++ b/coverage/staging/src/model/types/mint/index.html
@@ -116,7 +116,7 @@ <h1><a href="../../../../index.html">All files</a> src/model/types/mint</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../../../../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/model/types/mint/index.ts.html b/coverage/staging/src/model/types/mint/index.ts.html
index cd4257f0..4645b2a0 100644
--- a/coverage/staging/src/model/types/mint/index.ts.html
+++ b/coverage/staging/src/model/types/mint/index.ts.html
@@ -133,7 +133,7 @@ <h1><a href="../../../../index.html">All files</a> / <a href="index.html">src/mo
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../../../../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/model/types/mint/responses.ts.html b/coverage/staging/src/model/types/mint/responses.ts.html
index ab99a2dd..1f5ed402 100644
--- a/coverage/staging/src/model/types/mint/responses.ts.html
+++ b/coverage/staging/src/model/types/mint/responses.ts.html
@@ -520,7 +520,7 @@ <h1><a href="../../../../index.html">All files</a> / <a href="index.html">src/mo
 /**
  * Entries of CheckStateResponse with state of the proof
  */
-export type CheckStateEntry = {
+export type ProofState = {
 	Y: string;
 	state: CheckStateEnum;
 	witness: string | null;
@@ -542,7 +542,7 @@ <h1><a href="../../../../index.html">All files</a> / <a href="index.html">src/mo
 	/**
 	 *
 	 */
-	states: Array&lt;CheckStateEntry&gt;;
+	states: Array&lt;ProofState&gt;;
 } &amp; ApiError;
 &nbsp;
 /**
@@ -721,7 +721,7 @@ <h1><a href="../../../../index.html">All files</a> / <a href="index.html">src/mo
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../../../../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/model/types/wallet/index.html b/coverage/staging/src/model/types/wallet/index.html
index e1151027..064edf42 100644
--- a/coverage/staging/src/model/types/wallet/index.html
+++ b/coverage/staging/src/model/types/wallet/index.html
@@ -116,7 +116,7 @@ <h1><a href="../../../../index.html">All files</a> src/model/types/wallet</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../../../../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/model/types/wallet/index.ts.html b/coverage/staging/src/model/types/wallet/index.ts.html
index a60c9461..aa939616 100644
--- a/coverage/staging/src/model/types/wallet/index.ts.html
+++ b/coverage/staging/src/model/types/wallet/index.ts.html
@@ -122,12 +122,7 @@ <h1><a href="../../../../index.html">All files</a> / <a href="index.html">src/mo
 <a name='L57'></a><a href='#L57'>57</a>
 <a name='L58'></a><a href='#L58'>58</a>
 <a name='L59'></a><a href='#L59'>59</a>
-<a name='L60'></a><a href='#L60'>60</a>
-<a name='L61'></a><a href='#L61'>61</a>
-<a name='L62'></a><a href='#L62'>62</a>
-<a name='L63'></a><a href='#L63'>63</a>
-<a name='L64'></a><a href='#L64'>64</a>
-<a name='L65'></a><a href='#L65'>65</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">3x</span>
+<a name='L60'></a><a href='#L60'>60</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-yes">3x</span>
@@ -186,21 +181,11 @@ <h1><a href="../../../../index.html">All files</a> / <a href="index.html">src/mo
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">export * from './payloads';
 export * from './responses';
 export * from './tokens';
 export * from './paymentRequests';
 &nbsp;
-export type AmountPreference = {
-	amount: number;
-	count: number;
-};
-&nbsp;
 /**
  * represents a single Cashu proof.
  */
@@ -262,7 +247,7 @@ <h1><a href="../../../../index.html">All files</a> / <a href="index.html">src/mo
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../../../../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/model/types/wallet/paymentRequests.ts.html b/coverage/staging/src/model/types/wallet/paymentRequests.ts.html
index c9dff777..a93b6833 100644
--- a/coverage/staging/src/model/types/wallet/paymentRequests.ts.html
+++ b/coverage/staging/src/model/types/wallet/paymentRequests.ts.html
@@ -178,7 +178,7 @@ <h1><a href="../../../../index.html">All files</a> / <a href="index.html">src/mo
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../../../../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/request.ts.html b/coverage/staging/src/request.ts.html
index 8c4e11cd..1d1ed5ed 100644
--- a/coverage/staging/src/request.ts.html
+++ b/coverage/staging/src/request.ts.html
@@ -138,21 +138,21 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> request
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">41x</span>
-<span class="cline-any cline-yes">41x</span>
-<span class="cline-any cline-yes">41x</span>
-<span class="cline-any cline-yes">41x</span>
+<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-yes">44x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">41x</span>
-<span class="cline-any cline-yes">41x</span>
+<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-yes">44x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">41x</span>
+<span class="cline-any cline-yes">44x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">80x</span>
+<span class="cline-any cline-yes">86x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
@@ -160,7 +160,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> request
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-yes">42x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -168,8 +168,8 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> request
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-yes">41x</span>
-<span class="cline-any cline-yes">39x</span>
+<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-yes">42x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { HttpResponseError } from './model/Errors';
 &nbsp;
@@ -232,7 +232,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> request
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/utils.ts.html b/coverage/staging/src/utils.ts.html
index 9654fdf4..004c3418 100644
--- a/coverage/staging/src/utils.ts.html
+++ b/coverage/staging/src/utils.ts.html
@@ -23,30 +23,30 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> utils.t
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">88.09% </span>
+                <span class="strong">89.88% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>111/126</span>
+                <span class='fraction'>160/178</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">56.66% </span>
+                <span class="strong">67.27% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>17/30</span>
+                <span class='fraction'>37/55</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">77.77% </span>
+                <span class="strong">88.46% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>28/36</span>
+                <span class='fraction'>46/52</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">88.69% </span>
+                <span class="strong">89.93% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>102/115</span>
+                <span class='fraction'>143/159</span>
             </div>
         
             
@@ -331,8 +331,103 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> utils.t
 <a name='L266'></a><a href='#L266'>266</a>
 <a name='L267'></a><a href='#L267'>267</a>
 <a name='L268'></a><a href='#L268'>268</a>
-<a name='L269'></a><a href='#L269'>269</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L269'></a><a href='#L269'>269</a>
+<a name='L270'></a><a href='#L270'>270</a>
+<a name='L271'></a><a href='#L271'>271</a>
+<a name='L272'></a><a href='#L272'>272</a>
+<a name='L273'></a><a href='#L273'>273</a>
+<a name='L274'></a><a href='#L274'>274</a>
+<a name='L275'></a><a href='#L275'>275</a>
+<a name='L276'></a><a href='#L276'>276</a>
+<a name='L277'></a><a href='#L277'>277</a>
+<a name='L278'></a><a href='#L278'>278</a>
+<a name='L279'></a><a href='#L279'>279</a>
+<a name='L280'></a><a href='#L280'>280</a>
+<a name='L281'></a><a href='#L281'>281</a>
+<a name='L282'></a><a href='#L282'>282</a>
+<a name='L283'></a><a href='#L283'>283</a>
+<a name='L284'></a><a href='#L284'>284</a>
+<a name='L285'></a><a href='#L285'>285</a>
+<a name='L286'></a><a href='#L286'>286</a>
+<a name='L287'></a><a href='#L287'>287</a>
+<a name='L288'></a><a href='#L288'>288</a>
+<a name='L289'></a><a href='#L289'>289</a>
+<a name='L290'></a><a href='#L290'>290</a>
+<a name='L291'></a><a href='#L291'>291</a>
+<a name='L292'></a><a href='#L292'>292</a>
+<a name='L293'></a><a href='#L293'>293</a>
+<a name='L294'></a><a href='#L294'>294</a>
+<a name='L295'></a><a href='#L295'>295</a>
+<a name='L296'></a><a href='#L296'>296</a>
+<a name='L297'></a><a href='#L297'>297</a>
+<a name='L298'></a><a href='#L298'>298</a>
+<a name='L299'></a><a href='#L299'>299</a>
+<a name='L300'></a><a href='#L300'>300</a>
+<a name='L301'></a><a href='#L301'>301</a>
+<a name='L302'></a><a href='#L302'>302</a>
+<a name='L303'></a><a href='#L303'>303</a>
+<a name='L304'></a><a href='#L304'>304</a>
+<a name='L305'></a><a href='#L305'>305</a>
+<a name='L306'></a><a href='#L306'>306</a>
+<a name='L307'></a><a href='#L307'>307</a>
+<a name='L308'></a><a href='#L308'>308</a>
+<a name='L309'></a><a href='#L309'>309</a>
+<a name='L310'></a><a href='#L310'>310</a>
+<a name='L311'></a><a href='#L311'>311</a>
+<a name='L312'></a><a href='#L312'>312</a>
+<a name='L313'></a><a href='#L313'>313</a>
+<a name='L314'></a><a href='#L314'>314</a>
+<a name='L315'></a><a href='#L315'>315</a>
+<a name='L316'></a><a href='#L316'>316</a>
+<a name='L317'></a><a href='#L317'>317</a>
+<a name='L318'></a><a href='#L318'>318</a>
+<a name='L319'></a><a href='#L319'>319</a>
+<a name='L320'></a><a href='#L320'>320</a>
+<a name='L321'></a><a href='#L321'>321</a>
+<a name='L322'></a><a href='#L322'>322</a>
+<a name='L323'></a><a href='#L323'>323</a>
+<a name='L324'></a><a href='#L324'>324</a>
+<a name='L325'></a><a href='#L325'>325</a>
+<a name='L326'></a><a href='#L326'>326</a>
+<a name='L327'></a><a href='#L327'>327</a>
+<a name='L328'></a><a href='#L328'>328</a>
+<a name='L329'></a><a href='#L329'>329</a>
+<a name='L330'></a><a href='#L330'>330</a>
+<a name='L331'></a><a href='#L331'>331</a>
+<a name='L332'></a><a href='#L332'>332</a>
+<a name='L333'></a><a href='#L333'>333</a>
+<a name='L334'></a><a href='#L334'>334</a>
+<a name='L335'></a><a href='#L335'>335</a>
+<a name='L336'></a><a href='#L336'>336</a>
+<a name='L337'></a><a href='#L337'>337</a>
+<a name='L338'></a><a href='#L338'>338</a>
+<a name='L339'></a><a href='#L339'>339</a>
+<a name='L340'></a><a href='#L340'>340</a>
+<a name='L341'></a><a href='#L341'>341</a>
+<a name='L342'></a><a href='#L342'>342</a>
+<a name='L343'></a><a href='#L343'>343</a>
+<a name='L344'></a><a href='#L344'>344</a>
+<a name='L345'></a><a href='#L345'>345</a>
+<a name='L346'></a><a href='#L346'>346</a>
+<a name='L347'></a><a href='#L347'>347</a>
+<a name='L348'></a><a href='#L348'>348</a>
+<a name='L349'></a><a href='#L349'>349</a>
+<a name='L350'></a><a href='#L350'>350</a>
+<a name='L351'></a><a href='#L351'>351</a>
+<a name='L352'></a><a href='#L352'>352</a>
+<a name='L353'></a><a href='#L353'>353</a>
+<a name='L354'></a><a href='#L354'>354</a>
+<a name='L355'></a><a href='#L355'>355</a>
+<a name='L356'></a><a href='#L356'>356</a>
+<a name='L357'></a><a href='#L357'>357</a>
+<a name='L358'></a><a href='#L358'>358</a>
+<a name='L359'></a><a href='#L359'>359</a>
+<a name='L360'></a><a href='#L360'>360</a>
+<a name='L361'></a><a href='#L361'>361</a>
+<a name='L362'></a><a href='#L362'>362</a>
+<a name='L363'></a><a href='#L363'>363</a>
+<a name='L364'></a><a href='#L364'>364</a>
+<a name='L365'></a><a href='#L365'>365</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -361,98 +456,191 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> utils.t
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">45x</span>
+<span class="cline-any cline-yes">40x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">19x</span>
 <span class="cline-any cline-yes">37x</span>
-<span class="cline-any cline-yes">37x</span>
-<span class="cline-any cline-yes">12x</span>
-<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">22x</span>
+<span class="cline-any cline-yes">18x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">36x</span>
-<span class="cline-any cline-yes">129x</span>
-<span class="cline-any cline-yes">93x</span>
-<span class="cline-any cline-yes">36x</span>
-<span class="cline-any cline-yes">129x</span>
-<span class="cline-any cline-yes">129x</span>
-<span class="cline-any cline-yes">129x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">134x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">25x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">43x</span>
+<span class="cline-any cline-yes">43x</span>
+<span class="cline-any cline-yes">296x</span>
+<span class="cline-any cline-yes">296x</span>
+<span class="cline-any cline-yes">296x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">142x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">18x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">1152x</span>
+<span class="cline-any cline-yes">192x</span>
+<span class="cline-any cline-yes">192x</span>
+<span class="cline-any cline-yes">1074x</span>
+<span class="cline-any cline-yes">181x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">25x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">12x</span>
-<span class="cline-any cline-yes">12x</span>
-<span class="cline-any cline-yes">12x</span>
-<span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">23x</span>
-<span class="cline-any cline-yes">23x</span>
-<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">22x</span>
+<span class="cline-any cline-yes">89x</span>
+<span class="cline-any cline-yes">46x</span>
+<span class="cline-any cline-yes">43x</span>
+<span class="cline-any cline-yes">296x</span>
+<span class="cline-any cline-yes">253x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">192x</span>
+<span class="cline-any cline-yes">189x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">11x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">37x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">4x</span>
@@ -461,7 +649,6 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> utils.t
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -491,35 +678,44 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> utils.t
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">15x</span>
+<span class="cline-any cline-yes">15x</span>
+<span class="cline-any cline-yes">60x</span>
+<span class="cline-any cline-yes">43x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">17x</span>
-<span class="cline-any cline-yes">17x</span>
-<span class="cline-any cline-yes">68x</span>
-<span class="cline-any cline-yes">51x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">15x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">17x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">15x</span>
+<span class="cline-any cline-yes">15x</span>
+<span class="cline-any cline-yes">15x</span>
+<span class="cline-any cline-yes">9x</span>
+<span class="cline-any cline-yes">9x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">17x</span>
-<span class="cline-any cline-yes">17x</span>
-<span class="cline-any cline-yes">17x</span>
 <span class="cline-any cline-yes">9x</span>
-<span class="cline-any cline-yes">8x</span>
-<span class="cline-any cline-yes">6x</span>
-<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">9x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">9x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">9x</span>
+<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-yes">9x</span>
@@ -532,8 +728,12 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> utils.t
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -550,7 +750,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> utils.t
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">64x</span>
 <span class="cline-any cline-yes">64x</span>
@@ -563,7 +763,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> utils.t
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">37x</span>
+<span class="cline-any cline-yes">27x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">4x</span>
@@ -576,28 +776,20 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> utils.t
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">169x</span>
-<span class="cline-any cline-yes">87x</span>
+<span class="cline-any cline-yes">192x</span>
+<span class="cline-any cline-yes">104x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">45x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import {
 	encodeBase64ToJson,
@@ -606,13 +798,12 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> utils.t
 	encodeUint8toBase64Url
 } from './base64.js';
 import {
-	AmountPreference,
+	DeprecatedToken,
 	Keys,
 	Proof,
 	RawPaymentRequest,
 	RawTransport,
 	Token,
-	TokenEntry,
 	TokenV4Template,
 	V4InnerToken,
 	V4ProofTemplate
@@ -623,111 +814,203 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> utils.t
 import { decodeCBOR, encodeCBOR } from './cbor.js';
 import { PaymentRequest } from './model/PaymentRequest.js';
 &nbsp;
-function splitAmount(
+/**
+ * Splits the amount into denominations of the provided @param keyset
+ * @param value amount to split
+ * @param keyset keys to look up split amounts
+ * @param split? optional custom split amounts
+ * @param order? optional order for split amounts (default: "asc")
+ * @returns Array of split amounts
+ * @throws Error if @param split amount is greater than @param value amount
+ */
+export function splitAmount(
 	value: number,
 	keyset: Keys,
-	amountPreference?: Array&lt;AmountPreference&gt;,
-	isDesc?: boolean
+	split?: Array&lt;number&gt;,
+	order?: 'desc' | 'asc'
 ): Array&lt;number&gt; {
-	const chunks: Array&lt;number&gt; = [];
-	if (amountPreference) {
-		chunks.push(...getPreference(value, keyset, amountPreference));
+	if (split) {
+		if (split.reduce((a: number, b: number) =&gt; a + b, 0) &gt; value) {
+			throw new Error(
+				`Split is greater than total amount: ${split.reduce(
+					(a: number, b: number) =&gt; a + b,
+					0
+				)} &gt; ${value}`
+			);
+		}
+		split.forEach((amt: number) =&gt; {
+			if (!hasCorrespondingKey(amt, keyset)) {
+				throw new Error('Provided amount preferences do not match the amounts of the mint keyset.');
+			}
+		});
 		value =
 			value -
-			chunks.reduce((curr: number, acc: number) =&gt; {
+			split.reduce((curr: number, acc: number) =&gt; {
 				return curr + acc;
 			}, 0);
+	} else {
+		split = [];
 	}
-	const sortedKeyAmounts: Array&lt;number&gt; = Object.keys(keyset)
-		.map((k) =&gt; parseInt(k))
-		.sort((a, b) =&gt; b - a);
-	sortedKeyAmounts.forEach((amt) =&gt; {
+	const sortedKeyAmounts = getKeysetAmounts(keyset);
+	sortedKeyAmounts.forEach((amt: number) =&gt; {
 		const q = Math.floor(value / amt);
-		for (let i = 0; i &lt; q; ++i) chunks.push(amt);
+		for (let i = 0; i &lt; q; ++i) split<span class="branch-0 cbranch-no" title="branch not covered" >?.p</span>ush(amt);
 		value %= amt;
 	});
-	return chunks.sort((a, b) =&gt; (isDesc ? b - a : a - b));
-}
-&nbsp;
-/*
-function isPowerOfTwo(number: number) {
-	return number &amp;&amp; !(number &amp; (number - 1));
+	return split.sort((a, b) =&gt; (order === 'desc' ? b - a : a - b));
 }
-*/
 &nbsp;
-function hasCorrespondingKey(amount: number, keyset: Keys): boolean {
-	return amount in keyset;
-}
-&nbsp;
-function getPreference(
-	amount: number,
-	keyset: Keys,
-	preferredAmounts: Array&lt;AmountPreference&gt;
+/**
+ * Creates a list of amounts to keep based on the proofs we have and the proofs we want to reach.
+ * @param proofsWeHave complete set of proofs stored (from current mint)
+ * @param amountToKeep amount to keep
+ * @param keys keys of current keyset
+ * @param targetCount the target number of proofs to reach
+ * @returns an array of amounts to keep
+ */
+export function getKeepAmounts(
+	proofsWeHave: Array&lt;Proof&gt;,
+	amountToKeep: number,
+	keys: Keys,
+	targetCount: number
 ): Array&lt;number&gt; {
-	const chunks: Array&lt;number&gt; = [];
-	let accumulator = 0;
-	preferredAmounts.forEach((pa: AmountPreference) =&gt; {
-		if (!hasCorrespondingKey(pa.amount, keyset)) {
-			throw new Error('Provided amount preferences do not match the amounts of the mint keyset.');
-		}
-		for (let i = 1; i &lt;= pa.count; i++) {
-			accumulator += pa.amount;
-			if (accumulator &gt; amount) {
-				return;
+	// determines amounts we need to reach the targetCount for each amount based on the amounts of the proofs we have
+	// it tries to select amounts so that the proofs we have and the proofs we want reach the targetCount
+	const amountsWeWant: Array&lt;number&gt; = [];
+	const amountsWeHave = proofsWeHave.map((p: Proof) =&gt; p.amount);
+	const sortedKeyAmounts = getKeysetAmounts(keys, 'asc');
+	sortedKeyAmounts.forEach((amt) =&gt; {
+		const countWeHave = amountsWeHave.filter((a) =&gt; a === amt).length;
+		const countWeWant = Math.max(targetCount - countWeHave, 0);
+		for (let i = 0; i &lt; countWeWant; ++i) {
+			if (amountsWeWant.reduce((a, b) =&gt; a + b, 0) + amt &gt; amountToKeep) {
+				break;
 			}
-			chunks.push(pa.amount);
+			amountsWeWant.push(amt);
 		}
 	});
-	return chunks;
+	// use splitAmount to fill the rest between the sum of amountsWeHave and amountToKeep
+	const amountDiff = amountToKeep - amountsWeWant.reduce((a, b) =&gt; a + b, 0);
+	if (amountDiff) {
+		const remainingAmounts = splitAmount(amountDiff, keys);
+		remainingAmounts.forEach((amt: number) =&gt; {
+			amountsWeWant.push(amt);
+		});
+	}
+	const sortedAmountsWeWant = amountsWeWant.sort((a, b) =&gt; a - b);
+	return sortedAmountsWeWant;
+}
+/**
+ * returns the amounts in the keyset sorted by the order specified
+ * @param keyset to search in
+ * @param order order to sort the amounts in
+ * @returns the amounts in the keyset sorted by the order specified
+ */
+export function getKeysetAmounts(keyset: Keys, order: 'asc' | 'desc' = 'desc'): Array&lt;number&gt; {
+	if (order == 'desc') {
+		return Object.keys(keyset)
+			.map((k: string) =&gt; parseInt(k))
+			.sort((a: number, b: number) =&gt; b - a);
+	}
+	return Object.keys(keyset)
+		.map((k: string) =&gt; parseInt(k))
+		.sort((a: number, b: number) =&gt; a - b);
 }
 &nbsp;
-function getDefaultAmountPreference(amount: number, keyset: Keys): Array&lt;AmountPreference&gt; {
-	const amounts = splitAmount(amount, keyset);
-	return amounts.map(<span class="fstat-no" title="function not covered" >(a</span>: number) =&gt; {
-<span class="cstat-no" title="statement not covered" >		return { amount: a, count: 1 };</span>
-	});
+/**
+ * Checks if the provided amount is in the keyset.
+ * @param amount amount to check
+ * @param keyset to search in
+ * @returns true if the amount is in the keyset, false otherwise
+ */
+export function hasCorrespondingKey(amount: number, keyset: Keys): boolean {
+	return amount in keyset;
 }
 &nbsp;
-function <span class="fstat-no" title="function not covered" >bytesToNumber(</span>bytes: Uint8Array): bigint {
+/**
+ * Converts a bytes array to a number.
+ * @param bytes to convert to number
+ * @returns  number
+ */
+export function <span class="fstat-no" title="function not covered" >bytesToNumber(</span>bytes: Uint8Array): bigint {
 <span class="cstat-no" title="statement not covered" >	return hexToNumber(bytesToHex(bytes));</span>
 }
 &nbsp;
-function <span class="fstat-no" title="function not covered" >hexToNumber(</span>hex: string): bigint {
+/**
+ * Converts a hex string to a number.
+ * @param hex to convert to number
+ * @returns number
+ */
+export function <span class="fstat-no" title="function not covered" >hexToNumber(</span>hex: string): bigint {
 <span class="cstat-no" title="statement not covered" >	return BigInt(`0x${hex}`);</span>
 }
 &nbsp;
+function isValidHex(str: string) {
+	return /^[a-f0-9]*$/i.test(str);
+}
+&nbsp;
+/**
+ * Checks wether a proof or a list of proofs contains a non-hex id
+ * @param p Proof or list of proofs
+ * @returns boolean
+ */
+export function hasNonHexId(p: Proof | Array&lt;Proof&gt;) {
+	if (Array.isArray(p)) {
+		return p.some((proof) =&gt; !isValidHex(proof.id));
+	}
+<span class="cstat-no" title="statement not covered" >	return isValidHex(p.id);</span>
+}
+&nbsp;
 //used for json serialization
-function <span class="fstat-no" title="function not covered" >bigIntStringify&lt;</span>T&gt;(_key: unknown, value: T) {
+export function <span class="fstat-no" title="function not covered" >bigIntStringify&lt;</span>T&gt;(_key: unknown, value: T) {
 <span class="cstat-no" title="statement not covered" >	return typeof value === 'bigint' ? value.toString() : value;</span>
 }
 &nbsp;
 /**
  * Helper function to encode a v3 cashu token
+ * @param token to encode
+ * @returns encoded token
+ */
+export function getEncodedTokenV3(token: Token): string {
+	const v3TokenObj: DeprecatedToken = { token: [{ mint: token.mint, proofs: token.proofs }] };
+	if (token.unit) {
+		v3TokenObj.unit = token.unit;
+	}
+	if (token.memo) {
+		v3TokenObj.memo = token.memo;
+	}
+	return TOKEN_PREFIX + TOKEN_VERSION + encodeJsonToBase64(v3TokenObj);
+}
+&nbsp;
+/**
+ * Helper function to encode a cashu token (defaults to v4 if keyset id allows it)
  * @param token
- * @returns
+ * @param [opts]
  */
-function <span class="fstat-no" title="function not covered" >getEncodedToken(</span>token: Token): string {
-<span class="cstat-no" title="statement not covered" >	return TOKEN_PREFIX + TOKEN_VERSION + encodeJsonToBase64(token);</span>
+export function getEncodedToken(token: Token, opts?: { version: 3 | 4 }): string {
+	const nonHex = hasNonHexId(token.proofs);
+	if (nonHex || opts<span class="branch-0 cbranch-no" title="branch not covered" >?.v</span>ersion === 3) {
+		<span class="missing-if-branch" title="if path not taken" >I</span>if (opts<span class="branch-0 cbranch-no" title="branch not covered" >?.v</span>ersion === 4) {
+<span class="cstat-no" title="statement not covered" >			throw new Error('can not encode to v4 token if proofs contain non-hex keyset id');</span>
+		}
+		return getEncodedTokenV3(token);
+	}
+<span class="cstat-no" title="statement not covered" >	return getEncodedTokenV4(token);</span>
 }
 &nbsp;
-function getEncodedTokenV4(token: Token): string {
+export function getEncodedTokenV4(token: Token): string {
+	const nonHex = hasNonHexId(token.proofs);
+	<span class="missing-if-branch" title="if path not taken" >I</span>if (nonHex) {
+<span class="cstat-no" title="statement not covered" >		throw new Error('can not encode to v4 token if proofs contain non-hex keyset id');</span>
+	}
 	const idMap: { [id: string]: Array&lt;Proof&gt; } = {};
-	let mint: string | undefined = undefined;
-	for (let i = 0; i &lt; token.token.length; i++) {
-		if (!mint) {
-			mint = token.token[i].mint;
-		} else <span class="missing-if-branch" title="else path not taken" >E</span>{
-<span class="cstat-no" title="statement not covered" >			<span class="missing-if-branch" title="if path not taken" >I</span>if (mint !== token.token[i].mint) {</span>
-<span class="cstat-no" title="statement not covered" >				throw new Error('Multimint token can not be encoded as V4 token');</span>
-			}
-		}
-		for (let j = 0; j &lt; token.token[i].proofs.length; j++) {
-			const proof = token.token[i].proofs[j];
-			if (idMap[proof.id]) {
-				idMap[proof.id].push(proof);
-			} else {
-				idMap[proof.id] = [proof];
-			}
+	const mint = token.mint;
+	for (let i = 0; i &lt; token.proofs.length; i++) {
+		const proof = token.proofs[i];
+		if (idMap[proof.id]) {
+			idMap[proof.id].push(proof);
+		} else {
+			idMap[proof.id] = [proof];
 		}
 	}
 	const tokenTemplate: TokenV4Template = {
@@ -759,7 +1042,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> utils.t
  * @param token an encoded cashu token (cashuAey...)
  * @returns cashu token object
  */
-function getDecodedToken(token: string) {
+export function getDecodedToken(token: string) {
 	// remove prefixes
 	const uriPrefixes = ['web+cashu://', 'cashu://', 'cashu:', 'cashu'];
 	uriPrefixes.forEach((prefix: string) =&gt; {
@@ -772,36 +1055,49 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> utils.t
 }
 &nbsp;
 /**
- * @param token
- * @returns
+ * Helper function to decode different versions of cashu tokens into an object
+ * @param token an encoded cashu token (cashuAey...)
+ * @returns cashu Token object
  */
-function handleTokens(token: string): Token {
+export function handleTokens(token: string): Token {
 	const version = token.slice(0, 1);
 	const encodedToken = token.slice(1);
 	if (version === 'A') {
-		return encodeBase64ToJson&lt;Token&gt;(encodedToken);
+		const parsedV3Token = encodeBase64ToJson&lt;DeprecatedToken&gt;(encodedToken);
+		<span class="missing-if-branch" title="if path not taken" >I</span>if (parsedV3Token.token.length &gt; 1) {
+<span class="cstat-no" title="statement not covered" >			throw new Error('Multi entry token are not supported');</span>
+		}
+		const entry = parsedV3Token.token[0];
+		const tokenObj: Token = {
+			mint: entry.mint,
+			proofs: entry.proofs,
+			unit: parsedV3Token.unit || 'sat'
+		};
+		<span class="missing-if-branch" title="if path not taken" >I</span>if (parsedV3Token.memo) {
+<span class="cstat-no" title="statement not covered" >			tokenObj.memo = parsedV3Token.memo;</span>
+		}
+		return tokenObj;
 	} else if (version === 'B') {
 		const uInt8Token = encodeBase64toUint8(encodedToken);
-		const tokenData = decodeCBOR(uInt8Token) as {
-			t: Array&lt;{ p: Array&lt;{ a: number; s: string; c: Uint8Array }&gt;; i: Uint8Array }&gt;;
-			m: string;
-			d: string;
-			u: string;
-		};
-		const mergedTokenEntry: TokenEntry = { mint: tokenData.m, proofs: [] };
-		tokenData.t.forEach((tokenEntry: V4InnerToken) =&gt;
-			tokenEntry.p.forEach((p: V4ProofTemplate) =&gt; {
-				mergedTokenEntry.proofs.push({
+		const tokenData = decodeCBOR(uInt8Token) as TokenV4Template;
+		const proofs: Array&lt;Proof&gt; = [];
+		tokenData.t.forEach((t) =&gt;
+			t.p.forEach((p) =&gt; {
+				proofs.push({
 					secret: p.s,
 					C: bytesToHex(p.c),
 					amount: p.a,
-					id: bytesToHex(tokenEntry.i)
+					id: bytesToHex(t.i)
 				});
 			})
 		);
-		return { token: [mergedTokenEntry], memo: tokenData.d || '', unit: tokenData.u || <span class="branch-1 cbranch-no" title="branch not covered" >'sat' </span>};
+		const decodedToken: Token = { mint: tokenData.m, proofs, unit: tokenData.u || <span class="branch-1 cbranch-no" title="branch not covered" >'sat' </span>};
+		if (tokenData.d) {
+			decodedToken.memo = tokenData.d;
+		}
+		return decodedToken;
 	}
-	throw new Error('Token version is not supported');
+<span class="cstat-no" title="statement not covered" >	throw new Error('Token version is not supported');</span>
 }
 /**
  * Returns the keyset id of a set of keys
@@ -818,7 +1114,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> utils.t
 	return '00' + hashHex;
 }
 &nbsp;
-function mergeUInt8Arrays(a1: Uint8Array, a2: Uint8Array): Uint8Array {
+export function mergeUInt8Arrays(a1: Uint8Array, a2: Uint8Array): Uint8Array {
 	// sum of individual array lengths
 	const mergedArray = new Uint8Array(a1.length + a2.length);
 	mergedArray.set(a1);
@@ -852,21 +1148,13 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> utils.t
 	return url.replace(/\/$/, '');
 }
 &nbsp;
-function decodePaymentRequest(paymentRequest: string) {
-	return PaymentRequest.fromEncodedRequest(paymentRequest);
+export function sumProofs(proofs: Array&lt;Proof&gt;) {
+	return proofs.reduce((acc: number, proof: Proof) =&gt; acc + proof.amount, 0);
 }
 &nbsp;
-export {
-	bigIntStringify,
-	bytesToNumber,
-	getDecodedToken,
-	getEncodedToken,
-	getEncodedTokenV4,
-	hexToNumber,
-	splitAmount,
-	getDefaultAmountPreference,
-	decodePaymentRequest
-};
+export function decodePaymentRequest(paymentRequest: string) {
+	return PaymentRequest.fromEncodedRequest(paymentRequest);
+}
 &nbsp;</pre></td></tr></table></pre>
 
                 <div class='push'></div><!-- for sticky footer -->
@@ -874,7 +1162,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">src</a> utils.t
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/utils/Constants.ts.html b/coverage/staging/src/utils/Constants.ts.html
index 70382cac..6df228d7 100644
--- a/coverage/staging/src/utils/Constants.ts.html
+++ b/coverage/staging/src/utils/Constants.ts.html
@@ -91,7 +91,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">src/utils</a
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../../prettify.js"></script>
         <script>
diff --git a/coverage/staging/src/utils/index.html b/coverage/staging/src/utils/index.html
index 54ea8053..288e95ce 100644
--- a/coverage/staging/src/utils/index.html
+++ b/coverage/staging/src/utils/index.html
@@ -101,7 +101,7 @@ <h1><a href="../../index.html">All files</a> src/utils</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../../prettify.js"></script>
         <script>
diff --git a/coverage/staging/test/consts.ts.html b/coverage/staging/test/consts.ts.html
index 3cc9ed05..d2ddf5ba 100644
--- a/coverage/staging/test/consts.ts.html
+++ b/coverage/staging/test/consts.ts.html
@@ -268,7 +268,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">test</a> consts
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../prettify.js"></script>
         <script>
diff --git a/coverage/staging/test/index.html b/coverage/staging/test/index.html
index 3496c9f3..fabfbc46 100644
--- a/coverage/staging/test/index.html
+++ b/coverage/staging/test/index.html
@@ -101,7 +101,7 @@ <h1><a href="../index.html">All files</a> test</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-10-24T09:50:34.198Z
+                at 2024-10-31T08:04:25.273Z
             </div>
         <script src="../prettify.js"></script>
         <script>