Merge pull request #225 from xch-dev/offer-address

Add receive address to make_offer

Author: Rigidity

crates/sage-api/src/requests/offers.rs

@@ -10,6 +10,9 @@ pub struct MakeOffer {
     pub requested_assets: Assets,
     pub offered_assets: Assets,
     pub fee: Amount,
+    #[serde(default)]
+    pub receive_address: Option<String>,
+    #[serde(default)]
     pub expires_at_second: Option<u64>,
 }
 

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

@@ -23,7 +23,7 @@ mod tests {
         puzzles::nft::NftMetadata,
     };
     use clvmr::Allocator;
-    use indexmap::{indexmap, IndexMap};
+    use indexmap::indexmap;
     use test_log::test;
 
     use crate::{MakerSide, RequestedNft, TakerSide, TestWallet, WalletNftMint};
@@ -44,14 +44,12 @@ mod tests {
             .make_offer(
                 MakerSide {
                     xch: 750,
-                    cats: IndexMap::new(),
-                    nfts: Vec::new(),
                     fee: 250,
+                    ..Default::default()
                 },
                 TakerSide {
-                    xch: 0,
                     cats: indexmap! { asset_id => 1000 },
-                    nfts: IndexMap::new(),
+                    ..Default::default()
                 },
                 None,
                 false,
@@ -120,13 +118,9 @@ mod tests {
             .make_offer(
                 MakerSide {
                     xch: 1000,
-                    cats: IndexMap::new(),
-                    nfts: Vec::new(),
-                    fee: 0,
+                    ..Default::default()
                 },
                 TakerSide {
-                    xch: 0,
-                    cats: IndexMap::new(),
                     nfts: indexmap! {
                         nft.info.launcher_id => RequestedNft {
                             metadata,
@@ -135,6 +129,7 @@ mod tests {
                             royalty_ten_thousandths: nft.info.royalty_ten_thousandths,
                         },
                     },
+                    ..Default::default()
                 },
                 None,
                 false,
@@ -201,15 +196,12 @@ mod tests {
             .wallet
             .make_offer(
                 MakerSide {
-                    xch: 0,
-                    cats: IndexMap::new(),
                     nfts: vec![nft.info.launcher_id],
-                    fee: 0,
+                    ..Default::default()
                 },
                 TakerSide {
                     xch: 1000,
-                    cats: IndexMap::new(),
-                    nfts: IndexMap::new(),
+                    ..Default::default()
                 },
                 None,
                 false,
@@ -284,18 +276,15 @@ mod tests {
             .wallet
             .make_offer(
                 MakerSide {
-                    xch: 0,
-                    cats: IndexMap::new(),
                     nfts: vec![
                         nft_id_first.info.launcher_id,
                         nft_id_second.info.launcher_id,
                     ],
-                    fee: 0,
+                    ..Default::default()
                 },
                 TakerSide {
                     xch: 1000,
-                    cats: IndexMap::new(),
-                    nfts: IndexMap::new(),
+                    ..Default::default()
                 },
                 None,
                 false,
@@ -385,18 +374,15 @@ mod tests {
             .wallet
             .make_offer(
                 MakerSide {
-                    xch: 0,
-                    cats: IndexMap::new(),
                     nfts: vec![
                         nft_id_first.info.launcher_id,
                         nft_id_second.info.launcher_id,
                     ],
-                    fee: 0,
+                    ..Default::default()
                 },
                 TakerSide {
-                    xch: 0,
                     cats: indexmap! { asset_id => 1000 },
-                    nfts: IndexMap::new(),
+                    ..Default::default()
                 },
                 None,
                 false,
@@ -481,18 +467,15 @@ mod tests {
             .wallet
             .make_offer(
                 MakerSide {
-                    xch: 0,
-                    cats: IndexMap::new(),
                     nfts: vec![
                         nft_id_first.info.launcher_id,
                         nft_id_second.info.launcher_id,
                     ],
-                    fee: 0,
+                    ..Default::default()
                 },
                 TakerSide {
                     xch: 1000,
-                    cats: IndexMap::new(),
-                    nfts: IndexMap::new(),
+                    ..Default::default()
                 },
                 None,
                 false,

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

@@ -22,15 +22,16 @@ pub struct UnsignedMakeOffer {
     pub builder: OfferBuilder<Partial>,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Default, Clone)]
 pub struct MakerSide {
     pub xch: u64,
     pub cats: IndexMap<Bytes32, u64>,
     pub nfts: Vec<Bytes32>,
     pub fee: u64,
+    pub p2_puzzle_hash: Option<Bytes32>,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Default, Clone)]
 pub struct TakerSide {
     pub xch: u64,
     pub cats: IndexMap<Bytes32, u64>,
@@ -81,7 +82,9 @@ impl Wallet {
         let maker_coins = self
             .fetch_offer_coins(&total_amounts, maker.nfts.clone())
             .await?;
-        let p2_puzzle_hash = self.p2_puzzle_hash(hardened, reuse).await?;
+
+        let change_puzzle_hash = self.p2_puzzle_hash(hardened, reuse).await?;
+        let p2_puzzle_hash = maker.p2_puzzle_hash.unwrap_or(change_puzzle_hash);
 
         let mut builder = OfferBuilder::new(maker_coins.nonce());
         let mut ctx = SpendContext::new();
@@ -173,7 +176,7 @@ impl Wallet {
                 royalties: maker_royalties,
                 trade_prices,
                 fee: maker.fee,
-                change_puzzle_hash: p2_puzzle_hash,
+                change_puzzle_hash,
                 extra_conditions,
             },
         )

crates/sage/src/endpoints/offers.rs

@@ -76,13 +76,19 @@ impl Sage {
 
         let fee = self.parse_amount(req.fee)?;
 
+        let p2_puzzle_hash = req
+            .receive_address
+            .map(|address| self.parse_address(address))
+            .transpose()?;
+
         let unsigned = wallet
             .make_offer(
                 MakerSide {
                     xch: offered_xch,
                     cats: offered_cats,
                     nfts: offered_nfts,
                     fee,
+                    p2_puzzle_hash,
                 },
                 TakerSide {
                     xch: requested_xch,