Merge pull request #95 from xch-dev/cleanup-offers

Cleanup offers

crates/sage-api/Cargo.toml

@@ -21,3 +21,4 @@ specta = { workspace = true, features = ["derive", "bigdecimal"] }
 bigdecimal = { workspace = true, features = ["serde"] }
 once_cell = { workspace = true }
 num-traits = { workspace = true }
+indexmap = { workspace = true }

crates/sage-api/src/records/offer_summary.rs

@@ -1,26 +1,42 @@
+use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
 use specta::Type;
 
-use crate::{Amount, AssetKind};
+use crate::Amount;
 
 #[derive(Debug, Clone, Serialize, Deserialize, Type)]
 pub struct OfferSummary {
     pub fee: Amount,
-    pub offered: Vec<OfferedCoin>,
-    pub requested: Vec<RequestedAsset>,
+    pub maker: OfferAssets,
+    pub taker: OfferAssets,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, Type)]
-pub struct OfferedCoin {
-    pub coin_id: String,
-    pub offered_amount: Amount,
-    #[serde(flatten)]
-    pub kind: AssetKind,
+pub struct OfferAssets {
+    pub xch: OfferXch,
+    pub cats: IndexMap<String, OfferCat>,
+    pub nfts: IndexMap<String, OfferNft>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, Type)]
-pub struct RequestedAsset {
+pub struct OfferXch {
     pub amount: Amount,
-    #[serde(flatten)]
-    pub kind: AssetKind,
+    pub royalty: Amount,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Type)]
+pub struct OfferCat {
+    pub amount: Amount,
+    pub royalty: Amount,
+    pub name: Option<String>,
+    pub ticker: Option<String>,
+    pub icon_url: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Type)]
+pub struct OfferNft {
+    pub image_data: Option<String>,
+    pub image_mime_type: Option<String>,
+    pub name: Option<String>,
+    pub royalty_percent: String,
 }

crates/sage-wallet/src/wallet/offer/take_offer.rs

@@ -30,7 +30,6 @@ impl Wallet {
 
         let mut builder = offer.take();
         let requested_payments = parse_offer_payments(&mut ctx, &mut builder)?;
-
         let taker_amounts = requested_payments.amounts();
 
         let taker_royalties = calculate_royalties(

src-tauri/src/commands.rs

@@ -6,12 +6,14 @@ use crate::{app_state::AppState, error::Result};
 mod actions;
 mod data;
 mod keys;
+mod offers;
 mod settings;
 mod transactions;
 
 pub use actions::*;
 pub use data::*;
 pub use keys::*;
+pub use offers::*;
 pub use settings::*;
 pub use transactions::*;