refactor: some cashu-sdk-ffi to v1

cashubtc · Dec 22, 2023 · 3301199 · 3301199
1 parent 85df354
commit 3301199
Show file tree

Hide file tree

Showing 7 changed files with 179 additions and 158 deletions.
diff --git a/bindings/cashu-ffi/src/cashu.udl b/bindings/cashu-ffi/src/cashu.udl
@@ -33,10 +33,6 @@ interface Secret {
 
 // NUT00
 
-interface Id {
-    [Throws=CashuError]
-	constructor(string id);
-};
 
 interface PublicKey {
     [Throws=CashuError, Name=from_hex]
@@ -112,6 +108,14 @@ interface PreMintSecrets {
 	sequence<Amount> amounts();
 };
 
+
+// NUT-02
+
+interface Id {
+    [Throws=CashuError]
+	constructor(string id);
+};
+
 interface KeyPair {
 	[Name=from_secret_key]
 	constructor(SecretKey secret_key);
@@ -137,7 +141,6 @@ interface MintKeySet {
 	constructor(string secret, string unit, string derivation_path, u8 max_order);
 };
 
-
 interface KeysResponse {
 	constructor(Keys keys);
 };
@@ -147,14 +150,28 @@ interface KeySetResponse {
 	sequence<KeySetInfo> keysets();
 };
 
-// --- NUT-04
+// NUT-03
+
+interface SwapRequest {
+	constructor(sequence<Proof> proofs, sequence<BlindedMessage> outputs);
+	sequence<Proof> proofs();
+	sequence<BlindedMessage> outputs();
+	Amount proofs_amount();
+	Amount output_amount();
+};
+
+interface SwapResponse {
+	constructor(sequence<BlindedSignature> promises);
+	sequence<BlindedSignature> signatures();
+};
+
+// NUT-04
 
 interface MintQuoteBolt11Request {
 	constructor(Amount amount, string unit);
 	Amount amount();
 };
 
-
 interface MintQuoteBolt11Response {
 	constructor(string quote, string request, boolean paid, u64 expiry);
 	string quote();
@@ -175,8 +192,6 @@ interface MintBolt11Response {
 	sequence<BlindedSignature> signatures();
 };
 
-// ---
-
 // NUT-05
 
 interface MeltQuoteBolt11Response {
@@ -208,20 +223,21 @@ interface MeltBolt11Response {
 	boolean paid();
 };
 
-// ----
-interface SwapRequest {
-	constructor(sequence<Proof> proofs, sequence<BlindedMessage> outputs);
-	sequence<Proof> proofs();
-	sequence<BlindedMessage> outputs();
-	Amount proofs_amount();
-	Amount output_amount();
-};
+// NUT-06
 
-interface SwapResponse {
-	constructor(sequence<BlindedSignature> promises);
-	sequence<BlindedSignature> signatures();
+interface MintInfo {
+	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();
+	string? motd();
 };
 
+// NUT-07
+
 interface CheckSpendableRequest {
 	constructor(sequence<MintProof> proofs);
 	sequence<MintProof> proofs();
@@ -239,17 +255,6 @@ interface MintVersion {
 	string version();
 };
 
-interface MintInfo {
-	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();
-	string? motd();
-};
-
 interface KeySetInfo {
 	constructor(Id id, string unit);
 

diff --git a/bindings/cashu-ffi/src/nuts/nut00/token.rs b/bindings/cashu-ffi/src/nuts/nut00/token.rs
@@ -25,6 +25,16 @@ impl From<&CurrencyUnit> for CurrencyUnitSdk {
     }
 }
 
+impl From<CurrencyUnit> for CurrencyUnitSdk {
+    fn from(unit: CurrencyUnit) -> CurrencyUnitSdk {
+        match unit {
+            CurrencyUnit::Sat() => CurrencyUnitSdk::Sat,
+            CurrencyUnit::Usd() => CurrencyUnitSdk::Usd,
+            CurrencyUnit::Custom { unit } => CurrencyUnitSdk::Custom(unit.clone()),
+        }
+    }
+}
+
 impl From<CurrencyUnitSdk> for CurrencyUnit {
     fn from(unit: CurrencyUnitSdk) -> CurrencyUnit {
         match unit {

diff --git a/bindings/cashu-ffi/src/nuts/nut04/mod.rs b/bindings/cashu-ffi/src/nuts/nut04/mod.rs
@@ -160,3 +160,9 @@ impl MintBolt11Response {
             .collect()
     }
 }
+
+impl From<MintBolt11ResponseSdk> for MintBolt11Response {
+    fn from(inner: MintBolt11ResponseSdk) -> MintBolt11Response {
+        MintBolt11Response { inner }
+    }
+}