From 12304df468ab41fcb0adb3bc65a75557b1300c0e Mon Sep 17 00:00:00 2001 From: f321x Date: Mon, 1 Jul 2024 15:51:35 +0000 Subject: [PATCH] finish submit-taker-bond --- .../coordinator/src/communication/mod.rs | 18 ++++++++++++++++-- .../coordinator/src/database/mod.rs | 7 +++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/taptrade-cli-demo/coordinator/src/communication/mod.rs b/taptrade-cli-demo/coordinator/src/communication/mod.rs index bfdac85..0ac798a 100755 --- a/taptrade-cli-demo/coordinator/src/communication/mod.rs +++ b/taptrade-cli-demo/coordinator/src/communication/mod.rs @@ -102,8 +102,22 @@ async fn submit_taker_bond( } Err(_) => return Ok(StatusCode::NOT_FOUND.into_response()), } - database.add_taker_info_and_move_table(&payload).await?; - Ok(Json(OfferTakenResponse { trade_psbt_hex }).into_response()) + + let trade_contract_psbt_taker = "".to_string(); // implement psbt + let trade_contract_psbt_maker = "".to_string(); // implement psbt + panic!("Trade contract PSBT not implemented!"); + + database + .add_taker_info_and_move_table( + &payload, + &trade_contract_psbt_maker, + &trade_contract_psbt_taker, + ) + .await?; + Ok(Json(OfferTakenResponse { + trade_psbt_hex_to_sign: trade_contract_psbt_taker, + }) + .into_response()) } pub async fn api_server(database: CoordinatorDB, wallet: CoordinatorWallet) -> Result<()> { diff --git a/taptrade-cli-demo/coordinator/src/database/mod.rs b/taptrade-cli-demo/coordinator/src/database/mod.rs index b9fa711..cb291b4 100644 --- a/taptrade-cli-demo/coordinator/src/database/mod.rs +++ b/taptrade-cli-demo/coordinator/src/database/mod.rs @@ -305,6 +305,8 @@ impl CoordinatorDB { pub async fn add_taker_info_and_move_table( &self, trade_and_taker_info: &OfferPsbtRequest, + trade_contract_psbt_maker: &String, + trade_contract_psbt_taker: &String, ) -> Result<()> { let public_offer = self .fetch_and_delete_offer_from_public_offers_table( @@ -337,10 +339,11 @@ impl CoordinatorDB { .bind(public_offer.musig_pubkey_hex_maker) .bind(trade_and_taker_info.trade_data.musig_pub_nonce_hex.clone()) .bind(trade_and_taker_info.trade_data.musig_pubkey_hex.clone()) - .bind(escrow psbt maker) - .bind(escrow psbt taker) + .bind(trade_contract_psbt_maker.clone()) + .bind(trade_contract_psbt_taker.clone()) .execute(&*self.db_pool) .await?; + Ok(()) } }