Great clean up

.config/flakebox/.gitignore

@@ -0,0 +1 @@
+tmp/

.config/flakebox/id

@@ -1 +1 @@
-437409787773bc012f713d609c43406e98174dca8d94911ed7905618cc62f2d026781205d6583645176c630878fe6a238e3a17b85254677c632ec4c25b699a4a
+4554d31c5e79420d5b097aad56a49a1c61bb89f32d6b93fb5ff4d0677bc9b587e3426e881d01f5551ff816cfcec2941d0529130f491f6098abb64e6c28592c94

.rustfmt.toml

@@ -2,3 +2,4 @@ group_imports = "StdExternalCrate"
 wrap_comments = true
 format_code_in_doc_comments = true
 imports_granularity = "Module"
+edition = "2021"

.typos.toml

@@ -2,4 +2,5 @@
 extend-ignore-identifiers-re = [
     # Ignore cashu tokens
     "cashuA*",
+    "casshuAeyJ0b2tlbiI6W3sibWludCI6Imh0dHBzOi8vODMzMy5zcGFjZTozMzM4IiwicHJvb2ZzIjpbeyJhbW91bnQiOjIsImlkIjoiMDA5YTFmMjkzMjUzZTQxZSIsInNlY3JldCI6IjQwNzkxNWJjMjEyYmU2MWE3N2UzZTZkMmFlYjRjNzI3OTgwYmRhNTFjZDA2YTZhZmMyOWUyODYxNzY4YTc4MzciLCJDIjoiMDJiYzkwOTc5OTdkODFhZmIyY2M3MzQ2YjVlNDM0NWE5MzQ2YmQyYTUwNmViNzk1ODU5OGE3MmYwY2Y4NTE2M2VhIn0seyJhbW91bnQiOjgsImlkIjoiMDA5YTFmMjkzMjUzZTQxZSIsInNlY3JldCI6ImZlMTUxMDkzMTRlNjFkNzc1NmIwZjhlZTBmMjNhNjI0YWNhYTNmNGUwNDJmNjE0MzNjNzI4YzcwNTdiOTMxYmUiLCJDIjoiMDI5ZThlNTA1MGI4OTBhN2Q2YzA5NjhkYjE2YmMxZDVkNWZhMDQwZWExZGUyODRmNmVjNjlkNjEyOTlmNjcxMDU5In1dfV0sInVuaXQiOiJzYXQiLCJtZW1vIjoiVGhhbmsgeW91LiJ9"
 ]

LICENSES/MOKSHA-MIT

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Steffen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

bindings/cashu-ffi/src/cashu.udl

@@ -6,6 +6,13 @@ interface CashuError {
 };
 
 // Types
+
+[Enum]
+interface CurrencyUnit {
+	Sat();
+	Usd();
+	Custom(string unit);
+};
 
 interface Bolt11Invoice {
     [Throws=CashuError]
@@ -15,12 +22,7 @@ interface Bolt11Invoice {
 };
 
 interface Amount {
-	u64 to_sat();	
-	u64 to_msat();
-	[Name = from_sat]
-	constructor(u64 sat);
-	[Name = from_msat]
-	constructor(u64 msat);
+	constructor(u64 amount);
  	sequence<Amount> split();
 };
 
@@ -29,13 +31,16 @@ interface Secret {
 	sequence<u8> as_bytes();	
 };
 
-// NUT00
+interface MintQuote {
+	constructor(string id, Amount amount, string unit, Bolt11Invoice request, boolean paid, u64 boolean);
+};
 
-interface Id {
-    [Throws=CashuError]
-	constructor(string id);
+interface MeltQuote {
+	constructor(string id, Amount amount, string unit, Bolt11Invoice request, Amount fee_reserve, boolean paid, u64 boolean);
 };
 
+// NUT00
+
 interface PublicKey {
     [Throws=CashuError, Name=from_hex]
     constructor(string hex);
@@ -50,22 +55,23 @@ interface SecretKey {
 };
 
 interface BlindedMessage {
-	constructor(Amount amount, PublicKey b);
+	constructor(Id keyset_id, Amount amount, PublicKey b);
 	Amount amount();
+	Id keyset_id();
 	PublicKey b();	
 };
 
 interface Proof {
-	constructor(Amount amount, Secret secret, PublicKey c, Id? id);
+	constructor(Amount amount, Secret secret, PublicKey c, Id id);
 	Amount amount();
 	Secret secret();
 	PublicKey c();
- 	Id? id();
+	Id keyset_id();
 };
 
 interface BlindedSignature {
-	constructor(Id id, Amount amount, PublicKey c);
-	Id id();
+	constructor(Id keyset_id, Amount amount, PublicKey c);
+	Id keyset_id();
 	Amount amount();
 	PublicKey c();
 };
@@ -75,7 +81,7 @@ interface MintProof {
 	Amount? amount();
 	Secret secret();
 	PublicKey? c();
-	Id? id();
+	Id? keyset_id();
 
 };
 
@@ -88,27 +94,35 @@ interface MintProofs {
 
 interface Token {
     [Throws=CashuError]
-	constructor(string mint, sequence<Proof> token, string? memo);
+	constructor(string mint, sequence<Proof> token, string? memo, string? unit);
 	sequence<MintProofs> token();
 	string? memo();
-    [Throws=CashuError]
-	string as_string();
+	string? unit();
+	string to_string();
     [Throws=CashuError, Name=from_string]
 	constructor(string token);
 
 };
 
-interface BlindedMessages {
+interface PreMintSecrets {
     [Throws=CashuError, Name=random]
-	constructor(Amount amount);
+	constructor(Id keyset_id, Amount amount);
     [Throws=CashuError, Name=blank]
-	constructor(Amount fee_reserve);
+	constructor(Id keyset_id, Amount amount);
 	sequence<BlindedMessage> blinded_messages();
 	sequence<Secret> secrets();
 	sequence<SecretKey> rs();
 	sequence<Amount> amounts();
 };
 
+
+// NUT-02
+
+interface Id {
+    [Throws=CashuError]
+	constructor(string id);
+};
+
 interface KeyPair {
 	[Name=from_secret_key]
 	constructor(SecretKey secret_key);
@@ -124,129 +138,132 @@ interface Keys {
 };
 
 interface KeySet {
-	constructor(Id id, Keys keys);
+	constructor(Id id, string unit, Keys keys);
 	Id id();
 	Keys keys();
 };
 
 interface MintKeySet {
 	[Name=generate]
-	constructor(string secret, string derivation_path, u8 max_order);
+	constructor(string secret, string unit, string derivation_path, u8 max_order);
 };
 
-
 interface KeysResponse {
-	constructor(Keys keys);
+	constructor(sequence<KeySet> keysets);
 };
 
 interface KeySetResponse {
-	constructor(sequence<Id> keyset_ids);
-	sequence<Id> keyset_ids();
+	constructor(sequence<KeySetInfo> keysets);
+	sequence<KeySetInfo> keysets();
 };
 
-interface RequestMintResponse {
-    [Throws=CashuError]
-	constructor(string invoice, string hash);
-	string invoice();
-	string hash();
-};
+// NUT-03
 
-interface MintRequest {
-	constructor(sequence<BlindedMessage> outputs);
+interface SwapRequest {
+	constructor(sequence<Proof> proofs, sequence<BlindedMessage> outputs);
+	sequence<Proof> proofs();
 	sequence<BlindedMessage> outputs();
-	Amount total_amount();
+	Amount proofs_amount();
+	Amount output_amount();
 };
 
-interface PostMintResponse {
+interface SwapResponse {
 	constructor(sequence<BlindedSignature> promises);
-	sequence<BlindedSignature> promises();
+	sequence<BlindedSignature> signatures();
 };
 
-interface CheckFeesRequest {
-    [Throws=CashuError]
-	constructor(string invoice);
-	string invoice();
-};
+// NUT-04
 
-interface CheckFeesResponse {
-	constructor(Amount amount);
+interface MintQuoteBolt11Request {
+	constructor(Amount amount, string unit);
 	Amount amount();
 };
 
-interface Nut05MeltRequest {
-    [Throws=CashuError]
-	constructor(sequence<Proof> proofs, string Invoice);
-	sequence<Proof> proofs();
-	string invoice();
-};
-
-interface Nut05MeltResponse {
-	constructor(boolean paid, string? preimage);
+interface MintQuoteBolt11Response {
+	constructor(string quote, string request, boolean paid, u64 expiry);
+	string quote();
+	string request();
 	boolean paid();
-	string? preimage();
+	u64 expiry();
 };
 
-interface SplitRequest {
-	constructor(sequence<Proof> proofs, sequence<BlindedMessage> outputs);
-	sequence<Proof> proofs();
+
+interface MintBolt11Request {
+	constructor(string quote, sequence<BlindedMessage> outputs);
+	string quote();
 	sequence<BlindedMessage> outputs();
-	Amount proofs_amount();
-	Amount output_amount();
 };
 
-interface SplitResponse {
-	constructor(sequence<BlindedSignature> promises);
-	sequence<BlindedSignature> promises();
-	Amount? promises_amount();
-
+interface MintBolt11Response {
+	constructor(sequence<BlindedSignature> signatures);
+	sequence<BlindedSignature> signatures();
 };
 
-interface CheckSpendableRequest {
-	constructor(sequence<MintProof> proofs);
-	sequence<MintProof> proofs();
+// NUT-05
+
+interface MeltQuoteBolt11Response {
+    [Throws=CashuError]
+	constructor(string quote, u64 amount, u64 fee_reserve, boolean paid, u64 expiry);
+	string quote();
+	u64 amount();
+	u64 fee_reserve();
+	boolean paid();
+	u64 expiry();
 };
 
-interface CheckSpendableResponse {
-	constructor(sequence<boolean> spendable, sequence<boolean> pending);
-	sequence<boolean> spendable();
-	sequence<boolean> pending();	
+interface MeltQuoteBolt11Request {
+    [Throws=CashuError]
+	constructor(string request, string unit);
+	string request();
 };
 
-interface MeltRequest {
+interface MeltBolt11Request {
     [Throws=CashuError]
-	constructor(sequence<Proof> proofs, string Invoice, sequence<BlindedMessage>? outputs);
-	sequence<Proof> proofs();
-	string invoice();
-	sequence<BlindedMessage>? outputs();
+	constructor(string quote, sequence<Proof> inputs, sequence<BlindedMessage>? outputs);
+	sequence<Proof> inputs();
+	string quote();
 };
 
-interface MeltResponse {
-	constructor(boolean paid, string? preimage, sequence<BlindedSignature>? change);
+interface MeltBolt11Response {
+	constructor(boolean paid, string? payment_preimage, sequence<BlindedSignature>? change);
+	string? payment_preimage();
 	boolean paid();
-	string? preimage();
-	sequence<BlindedSignature>? change();
 };
 
-interface MintVersion {
-	constructor(string name, string version);
-	string name();
-	string version();
-};
+// NUT-06
 
 interface MintInfo {
-	constructor(string? name, PublicKey? pubkey, MintVersion? version, string? description, string? description_long, sequence<sequence<string>>? contact, sequence<string> nuts, string? motd);
+	constructor(string? name, PublicKey? pubkey, MintVersion? version, string? description, string? description_long, sequence<sequence<string>>? contact, string nuts, string? motd);
 	string? name();
 	PublicKey? pubkey();
 	MintVersion? version();
 	string? description();
 	string? description_long();
 	sequence<sequence<string>>? contact();
-	sequence<string> nuts();
 	string? motd();
 };
 
+// NUT-07
+
+interface CheckSpendableRequest {
+	constructor(sequence<MintProof> proofs);
+	sequence<MintProof> proofs();
+};
+
+interface CheckSpendableResponse {
+	constructor(sequence<boolean> spendable, sequence<boolean> pending);
+	sequence<boolean> spendable();
+	sequence<boolean> pending();	
+};
+
+interface MintVersion {
+	constructor(string name, string version);
+	string name();
+	string version();
+};
+
 interface KeySetInfo {
-	constructor(Id id, u64 valid_from, u64? valid_to, string secret, string derivation_path, u8 max_order);
+	constructor(Id id, string unit);
 
 };