Robosats/taptrade-core
1
0
Fork 0
mirror of https://github.com/RoboSats/taptrade-core.git synced 2025-08-03 08:31:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

commit remaining changes

Browse Source
This commit is contained in:
f321x
2024-06-27 13:46:17 +00:00
parent 3a43b8e6bc
commit ab59cd9db2
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
taptrade-cli-demo/coordinator/src/communication/mod.rs
View File

@ -10,24 +10,12 @@ use axum::{
routing::post, routing::post,
Extension, Json, Router, Extension, Json, Router,
}; };
use rand::{distributions::Alphanumeric, Rng}; use rand::Rng;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::net::SocketAddr; use std::net::SocketAddr;
use tokio::net::TcpListener; use tokio::net::TcpListener;
// use crate::coordinator::verify_psbt; // use crate::coordinator::verify_psbt;
fn generate_random_order_id(len: usize) -> String {
// Generate `len` random bytes
let bytes: Vec<u8> = rand::thread_rng()
.sample_iter(&rand::distributions::Standard)
.take(len)
.collect();
// Convert bytes to hex string
let hex_string = hex::encode(bytes);
hex_string
}
// //
// Axum handler functions // Axum handler functions
// //
@ -65,13 +53,13 @@ async fn submit_maker_bond(
.validate_bond_tx_hex(&payload.signed_bond_hex, &bond_requirements) .validate_bond_tx_hex(&payload.signed_bond_hex, &bond_requirements)
.await?; .await?;
// insert bond into sql database // insert bond into sql database and move offer to different table
let bond_locked_until_timestamp = database let bond_locked_until_timestamp = database
.move_offer_to_active(&payload, &offer_id_hex) .move_offer_to_active(&payload, &offer_id_hex)
.await?; .await?;
// begin monitoring bond -> async loop monitoring bonds in sql table "active_maker_offers" -> see ../coordinator/monitoring.rs // begin monitoring bond -> async loop monitoring bonds in sql table "active_maker_offers" -> see ../coordinator/monitoring.rs
// show trade to orderbook -> orderbook endpoint will scan sql table "active_maker_offers" // show trade to orderbook -> orderbook endpoint will scan sql table "active_maker_offers" and return fitting results
// Create the JSON response // Create the JSON response
Ok(Json(OrderActivatedResponse { Ok(Json(OrderActivatedResponse {

12
taptrade-cli-demo/coordinator/src/communication/utils.rs
View File

@ -29,3 +29,15 @@ impl OrderRequest {
Ok(()) Ok(())
} }
} }
pub fn generate_random_order_id(len: usize) -> String {
// Generate `len` random bytes
let bytes: Vec<u8> = rand::thread_rng()
.sample_iter(&rand::distributions::Standard)
.take(len)
.collect();
// Convert bytes to hex string
let hex_string = hex::encode(bytes);
hex_string
}

2
taptrade-cli-demo/coordinator/src/wallet/mod.rs
View File

@ -63,7 +63,7 @@ impl CoordinatorWallet {
// let result = verify_tx(&tx, wallet.database(), blockchain); // let result = verify_tx(&tx, wallet.database(), blockchain);
// let valid = tx.verify_tx(); // let valid = tx.verify_tx();
panic!("Not implemented"); panic!("Bond verification not implemented!");
Ok(true) Ok(true)
} }
} }

2
taptrade-cli-demo/trader/src/communication/api.rs
View File

@ -34,7 +34,7 @@ pub struct BondSubmissionRequest {
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
pub struct OrderActivatedResponse { pub struct OrderActivatedResponse {
pub order_id_hex: String, pub order_id_hex: String,
pub bond_locked_until_timestamp: u128, // unix timestamp. Do not touch bond till then unless offer gets taken. pub bond_locked_until_timestamp: u64, // unix timestamp. Do not touch bond till then unless offer gets taken.
} }
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]