Sik/tradingbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update filtering

Browse Source
This commit is contained in:
Sik Yoon 2024-05-25 00:37:31 +09:00
parent b867d231fa
commit 2561a1081d
3 changed files with 92 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/strategy_team/future_strategy_long.rs
View File

@ -134,7 +134,7 @@ pub async fn list_up_for_buy(
Ok(()) Ok(())
} }
pub async fn list_up_for_sell() -> Result<(), Box<dyn std::error::Error + Send + Sync>> { pub async fn list_up_for_sell(alldata: &AllData) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
let filled_positions = select_filled_positions().await?; let filled_positions = select_filled_positions().await?;
let client = ClientBuilder::new() let client = ClientBuilder::new()
@ -142,37 +142,52 @@ pub async fn list_up_for_sell() -> Result<(), Box<dyn std::error::Error + Send +
.build() .build()
.unwrap(); .unwrap();
let server_epoch = get_server_epoch().await; let server_epoch = get_server_epoch().await;
let mut filtered_symbols: HashMap<String, FilteredDataValue> = HashMap::new();
for element in &filled_positions {
filtered_symbols.insert(element.symbol.clone(), FilteredDataValue::new());
}
let server_epoch = get_server_epoch().await;
let stoch_rsis = stoch_rsi(30, 30, 2, 2, &alldata.rt_price_1m_vec, &filtered_symbols).await?;
for element in filled_positions { for element in filled_positions {
let mut is_sell = false; if let Some(stoch_rsis_vec) = stoch_rsis.get(&element.symbol) {
let mut over_turned = false;
// TODO: BNB 코인이 있으면 let mut is_sell = false;
// let base_qty_to_be_ordered = if stoch_rsis_vec.last().unwrap().close_time > server_epoch
// element.base_qty_ordered.round_dp_with_strategy( && stoch_rsis_vec.last().unwrap().k < stoch_rsis_vec.last().unwrap().d {
// lot_step_size.normalize().scale(), over_turned = true;
// RoundingStrategy::ToZero,
// );
// TODO: BNB 코인이 없으면
if !element.current_price.is_zero() {
if element.pure_profit_percent >= 0.6 {
is_sell = true;
} else if element.pure_profit_percent <= -0.8 {
is_sell = true;
} else if server_epoch - element.transact_time >= (300_000) * 1 {
// time up selling
is_sell = true;
} }
if is_sell == true { // TODO: BNB 코인이 있으면
limit_order_close( // let base_qty_to_be_ordered =
&element, // element.base_qty_ordered.round_dp_with_strategy(
TimeInForce::Gtc, // lot_step_size.normalize().scale(),
element.current_price, // RoundingStrategy::ToZero,
element.base_qty_ordered, // );
&client // TODO: BNB 코인이 없으면
)
.await; if !element.current_price.is_zero() {
if element.pure_profit_percent >= 0.6 {
is_sell = true;
} else if element.pure_profit_percent <= -0.8 {
is_sell = true;
} else if server_epoch - element.transact_time >= (300_000) * 1 {
// time up selling
is_sell = true;
} else if over_turned == true {
is_sell = true;
}
if is_sell == true {
limit_order_close(
&element,
TimeInForce::Gtc,
element.current_price,
element.base_qty_ordered,
&client
)
.await;
}
} }
} }
} }

71
src/strategy_team/future_strategy_short.rs
View File

@ -133,45 +133,60 @@ pub async fn list_up_for_buy(
Ok(()) Ok(())
} }
pub async fn list_up_for_sell() -> Result<(), Box<dyn std::error::Error + Send + Sync>> { pub async fn list_up_for_sell(alldata: &AllData) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
let filled_positions = select_filled_positions().await?; let filled_positions = select_filled_positions().await?;
let client = ClientBuilder::new() let client = ClientBuilder::new()
.timeout(tokio::time::Duration::from_millis(5000)) .timeout(tokio::time::Duration::from_millis(5000))
.build() .build()
.unwrap(); .unwrap();
let mut filtered_symbols: HashMap<String, FilteredDataValue> = HashMap::new();
for element in &filled_positions {
filtered_symbols.insert(element.symbol.clone(), FilteredDataValue::new());
}
let server_epoch = get_server_epoch().await; let server_epoch = get_server_epoch().await;
let stoch_rsis = stoch_rsi(30, 30, 2, 2, &alldata.rt_price_1m_vec, &filtered_symbols).await?;
for element in filled_positions { for element in filled_positions {
let mut is_sell = false; if let Some(stoch_rsis_vec) = stoch_rsis.get(&element.symbol) {
let mut over_turned = false;
// TODO: BNB 코인이 있으면 let mut is_sell = false;
// let base_qty_to_be_ordered = if stoch_rsis_vec.last().unwrap().close_time > server_epoch
// element.base_qty_ordered.round_dp_with_strategy( && stoch_rsis_vec.last().unwrap().k > stoch_rsis_vec.last().unwrap().d {
// lot_step_size.normalize().scale(), over_turned = true;
// RoundingStrategy::ToZero,
// );
// TODO: BNB 코인이 없으면
if !element.current_price.is_zero() {
if element.pure_profit_percent >= 0.6 {
is_sell = true;
} else if element.pure_profit_percent <= -0.8 {
is_sell = true;
} else if server_epoch - element.transact_time >= (300_000) * 1 {
// time up selling
is_sell = true;
} }
if is_sell == true { // TODO: BNB 코인이 있으면
limit_order_close( // let base_qty_to_be_ordered =
&element, // element.base_qty_ordered.round_dp_with_strategy(
TimeInForce::Gtc, // lot_step_size.normalize().scale(),
element.current_price, // RoundingStrategy::ToZero,
element.base_qty_ordered, // );
&client // TODO: BNB 코인이 없으면
)
.await; if !element.current_price.is_zero() {
if element.pure_profit_percent >= 0.6 {
is_sell = true;
} else if element.pure_profit_percent <= -0.8 {
is_sell = true;
} else if server_epoch - element.transact_time >= (300_000) * 1 {
// time up selling
is_sell = true;
} else if over_turned == true {
is_sell = true;
}
if is_sell == true {
limit_order_close(
&element,
TimeInForce::Gtc,
element.current_price,
element.base_qty_ordered,
&client
)
.await;
}
} }
} }
} }

4
src/strategy_team/strategy_manager.rs
View File

@ -84,8 +84,8 @@ pub async fn execute_list_up_for_sell(
// &trade_fee_map, // &trade_fee_map,
// ) // )
// .await; // .await;
crate::strategy_team::future_strategy_long::list_up_for_sell().await; crate::strategy_team::future_strategy_long::list_up_for_sell(&all_data).await;
crate::strategy_team::future_strategy_short::list_up_for_sell().await; crate::strategy_team::future_strategy_short::list_up_for_sell(&all_data).await;
Ok(()) Ok(())
} }