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

Delete unused codes

Browse Source
This commit is contained in:
Sik Yoon 2023-08-15 15:22:07 +09:00
parent 4e5d12be8f
commit 72aaa3bf60
1 changed files with 1 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

183
src/coex/order_team.rs
View File

@ -540,27 +540,9 @@ pub async fn monitoring_filled_buy_order(
} else { } else {
((average_amplitude / 2.0) * multiplier) + (standard_deviation_amplitude * 2.0) // 2.0 sigma (recommand: 0.5 ~ 2.0(patient & greedy)) ((average_amplitude / 2.0) * multiplier) + (standard_deviation_amplitude * 2.0) // 2.0 sigma (recommand: 0.5 ~ 2.0(patient & greedy))
} }
}; };
// if scoreboard_list.first().unwrap().pos_liquidation_signal == 1
// || scoreboard_list.first().unwrap().neg_liquidation_signal == 1
// {
// sell_order_count += 1;
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// }
if element.is_long == 0 || element.is_long == 1 { if element.is_long == 0 || element.is_long == 1 {
// if ema10_1m_vec[ema10_result.unwrap()].ema_value > ema3_1m_vec[2].ema_value {
// if stoch_rsi30_1m_k_vec[stoch_rsi30_k_result.unwrap()].stoch_rsi_k_value < stoch_rsi30_1m_d_vec[stoch_rsi30_d_result.unwrap()].stoch_rsi_d_value
// || (element.pure_profit_percent <= target_profit_percent * -1.0)
// {
// println!("Sold normal. target_profit: {:.3}", target_profit_percent * -1.0);
// sell_order_count += 1;
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// }
// } else
if element.pure_profit_percent >= 0.0 { if element.pure_profit_percent >= 0.0 {
let mut is_sell = false; let mut is_sell = false;
if element.maximum_profit_percent >= target_profit_percent(2.0) if element.maximum_profit_percent >= target_profit_percent(2.0)
@ -592,36 +574,6 @@ pub async fn monitoring_filled_buy_order(
is_sell = true; is_sell = true;
} }
// if element.maximum_profit_percent >= target_profit_percent * 1.0 {
// println!("Sold target_profit_percent: {}", target_profit_percent * 1.0);
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// } else if supertrend_vec[latest_supertrend_result.unwrap()].area.contains("UP") && supertrend_vec[latest_supertrend_result.unwrap()].band_value > element.current_price.to_f64().unwrap() && supertrend_vec[latest_supertrend_result.unwrap()].band_value > element.buy_price.to_f64().unwrap() {
// println!("Sold (Profit Adaptive Stoploss): {}", supertrend_vec[latest_supertrend_result.unwrap()].band_value);
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// } else if supertrend_vec[latest_supertrend_result.unwrap()].signal.is_some() {
// if supertrend_vec[latest_supertrend_result.unwrap()].signal.as_ref().unwrap().contains("SELL") {
// println!("Sold supertrend Sell signal");
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// }
// else if supertrend_vec[latest_supertrend_result.unwrap()].area.contains("UP") && supertrend_vec[latest_supertrend_result.unwrap()].band_value < element.buy_price.to_f64().unwrap() && stoch_rsi30_1m_k_vec[stoch_rsi30_k_result.unwrap()].stoch_rsi_k_value <= stoch_rsi30_1m_d_vec[stoch_rsi30_d_result.unwrap()].stoch_rsi_d_value - 3.0
// {
// println!("Sold Stoch RSI");
// sell_order_count += 1;
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// }
// else if sma10_1m_vec[sma10_result.unwrap()].sma_value > ema10_1m_vec[ema10_result.unwrap()].ema_value
// {
// println!("+Sold EMA10 < SMA10 reversal, profit: {:.3}", element.pure_profit_percent);
// sell_order_count += 1;
// is_sell = true;
// }
// else if sma10_1m_vec[sma10_result.unwrap()-2].sma_value > sma10_1m_vec[sma10_result.unwrap()].sma_value && sma10_1m_vec[sma10_result.unwrap()-1].sma_value > sma10_1m_vec[sma10_result.unwrap()].sma_value {
// println!("Sold SMA");
// sell_order_count += 1;
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// }
if is_sell == true { if is_sell == true {
// let mut sell_price_ahead: Decimal = Decimal::new(14, 8); // let mut sell_price_ahead: Decimal = Decimal::new(14, 8);
// sell_price_ahead = decimal_mul(decimal_add(decimal_mul(decimal_mul(rust_decimal::Decimal::from_f64(element.pure_profit_percent).unwrap(), dec!(0.01)), dec!(0.97)), dec!(1)), element.buy_price).round_dp_with_strategy(2, RoundingStrategy::ToZero); // sell_price_ahead = decimal_mul(decimal_add(decimal_mul(decimal_mul(rust_decimal::Decimal::from_f64(element.pure_profit_percent).unwrap(), dec!(0.01)), dec!(0.97)), dec!(1)), element.buy_price).round_dp_with_strategy(2, RoundingStrategy::ToZero);
@ -634,10 +586,9 @@ pub async fn monitoring_filled_buy_order(
&trade_fee_vec, &trade_fee_vec,
) )
.await; .await;
// limit_order_sell(&element, sell_price_ahead, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
} }
} else { } else {
if element.pure_profit_percent < target_profit_percent(-1.333) - 0.2 // -0.2 means about double trade fees. if element.pure_profit_percent < target_profit_percent(-1.333) - 0.2 // -0.2 means about total trade fees.
{ {
println!( println!(
"selling {} due to lower limit {:.3}", "selling {} due to lower limit {:.3}",
@ -654,139 +605,7 @@ pub async fn monitoring_filled_buy_order(
) )
.await; .await;
} }
// if supertrend_vec[latest_supertrend_result.unwrap()].area.contains("DOWN") && element.pure_profit_percent <= (target_profit_percent * -0.7) - 0.2 { // -0.2 means tradefee (buying+selling)
// // if supertrend_vec[latest_supertrend_result.unwrap()].area.contains("DOWN") && element.pure_profit_percent < target_profit_percent * -0.5 {
// println!("Downtrend Sold Loss, -70% target_profit_percent: {:.3}", target_profit_percent * -0.7);
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// } else if supertrend_vec[latest_supertrend_result.unwrap()].area.contains("UP") && element.pure_profit_percent < (target_profit_percent * -1.0) - 0.2 {
// println!("Uptrend Sold Loss, -100% target_profit_percent: {:.3}", target_profit_percent * -1.0);
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// } else if supertrend_vec[latest_supertrend_result.unwrap()].area.contains("UP") && supertrend_vec[latest_supertrend_result.unwrap()].band_value > element.current_price.to_f64().unwrap() {
// println!("Sold UP trend, (Loss Adaptive Stoploss) band_value: {:.3}", supertrend_vec[latest_supertrend_result.unwrap()].band_value);
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// }
// else if supertrend_vec[latest_supertrend_result.unwrap()].signal.is_some() {
// if supertrend_vec[latest_supertrend_result.unwrap()].signal.as_ref().unwrap().contains("SELL") {
// println!("Sold supertrend Sell signal");
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// }
// }
// else if sma10_1m_vec[sma10_result.unwrap()-2].sma_value > sma10_1m_vec[sma10_result.unwrap()].sma_value && sma10_1m_vec[sma10_result.unwrap()-1].sma_value > sma10_1m_vec[sma10_result.unwrap()].sma_value {
// println!("Sold SMA");
// sell_order_count += 1;
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// }
// else if sma10_1m_vec[sma10_result.unwrap()].sma_value > ema10_1m_vec[ema10_result.unwrap()].ema_value {
// println!("-Sold EMA10 < SMA10, profit: {:.3}", element.pure_profit_percent);
// sell_order_count += 1;
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// }
// else if sma3_1m_vec[sma3_result.unwrap()].sma_value > ema3_1m_vec.last().unwrap().ema_value {
// println!("-Sold EMA3 < SMA3, profit: {:.3}", element.pure_profit_percent);
// sell_order_count += 1;
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// }
// else if stoch_rsi30_1m_k_vec[stoch_rsi30_k_result.unwrap()].stoch_rsi_k_value <= stoch_rsi30_1m_d_vec[stoch_rsi30_d_result.unwrap()].stoch_rsi_d_value - 3.0
// {
// println!("Sold Stoch RSI");
// sell_order_count += 1;
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// }
} }
// if ema10_1m_vec[ema10_result.unwrap()].ema_value > ema3_1m_vec[2].ema_value {
// // if (10_000 <= server_epoch - element.transact_time)
// // || (element.pure_profit_percent <= -0.002)
// // || (element.pure_profit_percent >= 0.002)
// // || (ema3_1m_vec[0].ema_value < ema3_1m_vec[1].ema_value && ema3_1m_vec[1].ema_value > ema3_1m_vec[2].ema_value)
// {
// sell_order_count += 1;
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// }
// }
// else {
// // if (element.maximum_profit_percent >= 0.02 && element.pure_profit_percent < element.maximum_profit_percent * 0.5)
// // || (element.pure_profit_percent <= -0.03)
// // || (ema3_1m_vec[0].ema_value > ema3_1m_vec[1].ema_value && ema3_1m_vec[1].ema_value > ema3_1m_vec[2].ema_value)
// // || (stoch_rsi30_1m_k_vec[stoch_rsi30_k_result.unwrap()].stoch_rsi_k_value < stoch_rsi30_1m_d_vec[stoch_rsi30_d_result.unwrap()].stoch_rsi_d_value - 3.0)
// // || stoch_rsi30_1m_k_vec[stoch_rsi30_k_result.unwrap()].stoch_rsi_k_value < stoch_rsi30_1m_k_vec[stoch_rsi30_k_prev_result.unwrap()].stoch_rsi_k_value - 5.0
// // {
// // sell_order_count += 1;
// // limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// // }
// if average_stoch_rsi30_1m_k < 85.0 {
// if stoch_rsi30_1m_k_vec[stoch_rsi30_k_result.unwrap()].stoch_rsi_k_value < 80.0 {
// if
// // element.pure_profit_percent >= target_profit_percent
// (element.pure_profit_percent <= 0.0 && element.minimum_profit_percent <= target_profit_percent * -2.0 && element.pure_profit_percent >= element.minimum_profit_percent * 0.5)
// ||(element.maximum_profit_percent >= target_profit_percent && element.pure_profit_percent < element.maximum_profit_percent * 0.95)
// // || (60_000 <= server_epoch - element.transact_time && server_epoch - element.transact_time < 90_000 && element.pure_profit_percent >= target_profit_percent * 0.7)
// // || (90_000 <= server_epoch - element.transact_time && server_epoch - element.transact_time < 120_000 && element.pure_profit_percent >= target_profit_percent * 0.5)
// // || (120_000 < server_epoch - element.transact_time && server_epoch - element.transact_time < 150_000 && ((element.pure_profit_percent < 0.0 && element.pure_profit_percent > element.minimum_profit_percent / 2.0) || (element.pure_profit_percent >= 0.001)))
// // || (element.pure_profit_percent <= average_amplitude_candles * -0.8 && opclo_1m_vec[opclo_sample_length-1].candle_type.contains("DOWN"))
// // || (element.pure_profit_percent <= average_amplitude_candles * -0.8 && opclo_1m_vec[opclo_sample_length-1].candle_type.contains("UP"))
// // || (ema3_1m_vec[0].ema_value > ema3_1m_vec[1].ema_value && ema3_1m_vec[1].ema_value > ema3_1m_vec[2].ema_value)
// || (stoch_rsi30_1m_k_vec[stoch_rsi30_k_result.unwrap()].stoch_rsi_k_value < stoch_rsi30_1m_d_vec[stoch_rsi30_d_result.unwrap()].stoch_rsi_d_value - 3.0)
// {
// sell_order_count += 1;
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// }
// } else {
// if
// // element.pure_profit_percent >= target_profit_percent * 0.5
// (element.pure_profit_percent <= 0.0 && element.minimum_profit_percent <= target_profit_percent * -2.0 && element.pure_profit_percent >= element.minimum_profit_percent * 0.5)
// || (element.maximum_profit_percent >= target_profit_percent * 0.5 && element.pure_profit_percent < element.maximum_profit_percent * 0.95)
// // || (30_000 <= server_epoch - element.transact_time && server_epoch - element.transact_time < 60_000 && element.pure_profit_percent >= target_profit_percent * 0.5 * 0.5)
// // || (60_000 <= server_epoch - element.transact_time && server_epoch - element.transact_time < 90_000 && element.pure_profit_percent >= target_profit_percent * 0.5 * 0.25)
// // || (90_000 < server_epoch - element.transact_time && server_epoch - element.transact_time < 120_000 && ((element.pure_profit_percent < 0.0 && element.pure_profit_percent > element.minimum_profit_percent / 2.0) || (element.pure_profit_percent >= 0.001)))
// // || (element.pure_profit_percent <= average_amplitude_candles * -0.8 && opclo_1m_vec[opclo_sample_length-1].candle_type.contains("DOWN"))
// // || (element.pure_profit_percent <= average_amplitude_candles * -0.8 && opclo_1m_vec[opclo_sample_length-1].candle_type.contains("UP"))
// // || (ema3_1m_vec[0].ema_value > ema3_1m_vec[1].ema_value && ema3_1m_vec[1].ema_value > ema3_1m_vec[2].ema_value)
// || (stoch_rsi30_1m_k_vec[stoch_rsi30_k_result.unwrap()].stoch_rsi_k_value < stoch_rsi30_1m_d_vec[stoch_rsi30_d_result.unwrap()].stoch_rsi_d_value - 3.0)
// {
// sell_order_count += 1;
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// }
// }
// } else {
// if stoch_rsi10_1m_k_vec[stoch_rsi10_k_result.unwrap()].stoch_rsi_k_value < 80.0 {
// if
// // element.pure_profit_percent >= target_profit_percent
// (element.pure_profit_percent <= 0.0 && element.minimum_profit_percent <= target_profit_percent * -2.0 && element.pure_profit_percent >= element.minimum_profit_percent * 0.5)
// || (element.maximum_profit_percent >= target_profit_percent && element.pure_profit_percent < element.maximum_profit_percent * 0.95)
// // || (60_000 <= server_epoch - element.transact_time && server_epoch - element.transact_time < 90_000 && element.pure_profit_percent >= target_profit_percent * 0.7)
// // || (90_000 <= server_epoch - element.transact_time && server_epoch - element.transact_time < 120_000 && element.pure_profit_percent >= target_profit_percent * 0.5)
// // || (120_000 < server_epoch - element.transact_time && server_epoch - element.transact_time < 150_000 && ((element.pure_profit_percent < 0.0 && element.pure_profit_percent > element.minimum_profit_percent / 2.0) || (element.pure_profit_percent >= 0.001)))
// // || (element.pure_profit_percent <= average_amplitude_candles * -0.8 && opclo_1m_vec[opclo_sample_length-1].candle_type.contains("DOWN"))
// // || (element.pure_profit_percent <= average_amplitude_candles * -0.8 && opclo_1m_vec[opclo_sample_length-1].candle_type.contains("UP"))
// // || (ema3_1m_vec[0].ema_value > ema3_1m_vec[1].ema_value && ema3_1m_vec[1].ema_value > ema3_1m_vec[2].ema_value)
// || (stoch_rsi10_1m_k_vec[stoch_rsi10_k_result.unwrap()].stoch_rsi_k_value < stoch_rsi10_1m_d_vec[stoch_rsi10_d_result.unwrap()].stoch_rsi_d_value - 3.0)
// {
// sell_order_count += 1;
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// }
// } else {
// if
// // element.pure_profit_percent >= target_profit_percent * 0.5
// (element.pure_profit_percent <= 0.0 && element.minimum_profit_percent <= target_profit_percent * -2.0 && element.pure_profit_percent >= element.minimum_profit_percent * 0.5)
// || (element.maximum_profit_percent >= target_profit_percent * 0.5 && element.pure_profit_percent < element.maximum_profit_percent * 0.95)
// // || (30_000 <= server_epoch - element.transact_time && server_epoch - element.transact_time < 60_000 && element.pure_profit_percent >= target_profit_percent * 0.5 * 0.5)
// // || (60_000 <= server_epoch - element.transact_time && server_epoch - element.transact_time < 90_000 && element.pure_profit_percent >= target_profit_percent * 0.5 * 0.25)
// // || (90_000 < server_epoch - element.transact_time && server_epoch - element.transact_time < 120_000 && ((element.pure_profit_percent < 0.0 && element.pure_profit_percent > element.minimum_profit_percent / 2.0) || (element.pure_profit_percent >= 0.001)))
// // || (element.pure_profit_percent <= average_amplitude_candles * -0.8 && opclo_1m_vec[opclo_sample_length-1].candle_type.contains("DOWN"))
// // || (element.pure_profit_percent <= average_amplitude_candles * -0.8 && opclo_1m_vec[opclo_sample_length-1].candle_type.contains("UP"))
// // || (ema3_1m_vec[0].ema_value > ema3_1m_vec[1].ema_value && ema3_1m_vec[1].ema_value > ema3_1m_vec[2].ema_value)
// || (stoch_rsi10_1m_k_vec[stoch_rsi10_k_result.unwrap()].stoch_rsi_k_value < stoch_rsi10_1m_d_vec[stoch_rsi10_d_result.unwrap()].stoch_rsi_d_value - 3.0)
// {
// sell_order_count += 1;
// limit_order_sell(&element, element.current_price, base_qty_to_be_ordered, &client, &exchange_info_vec, &trade_fee_vec).await;
// }
// }
// }
// // || (index_list.first().unwrap().liquidation_signal == 1 && index_list.first().unwrap().market_cap_index > 0.0)
// }
} }
} }
} }