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

Change find() with position()

Browse Source
This commit is contained in:
Sik Yoon 2023-11-20 20:25:56 +09:00
parent 689a3cd8a7
commit f45d5da3c3
2 changed files with 401 additions and 418 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
src/coex/order_team.rs
View File

@ -439,11 +439,11 @@ pub async fn limit_order_buy(
T.get("cummulativeQuoteQty").unwrap().as_str().unwrap(), T.get("cummulativeQuoteQty").unwrap().as_str().unwrap(),
) )
.unwrap(); .unwrap();
let base_asset_precision = exchange_info_vec // let base_asset_precision = exchange_info_vec
.iter() // .iter()
.find(|exchange_info| exchange_info.symbol == element.symbol) // .find(|exchange_info| exchange_info.symbol == element.symbol)
.unwrap() // .unwrap()
.base_asset_precision; // .base_asset_precision;
let buy_price = decimal_div(cummulative_quote_qty, base_qty_ordered) let buy_price = decimal_div(cummulative_quote_qty, base_qty_ordered)
.round_dp_with_strategy(8, RoundingStrategy::ToZero); .round_dp_with_strategy(8, RoundingStrategy::ToZero);
@ -718,18 +718,16 @@ pub async fn limit_order_sell(
let mut insert_value_container: Vec<String> = Vec::new(); let mut insert_value_container: Vec<String> = Vec::new();
let server_epoch = server_epoch().await; let server_epoch = server_epoch().await;
if RUNNING_MODE == SIMUL && buy_ordered_coin.status == "SIMUL" { if RUNNING_MODE == SIMUL && buy_ordered_coin.status == "SIMUL" {
let quote_asset_precision = exchange_info_vec let quote_asset_precision_option = exchange_info_vec
.iter() .iter()
// FIXME: find() should be position() .position(|exchange_info| exchange_info.symbol == buy_ordered_coin.symbol);
.find(|exchange_info| exchange_info.symbol == buy_ordered_coin.symbol) let trade_fee_option = trade_fee_vec
.unwrap()
.quote_asset_precision;
let trade_fee = trade_fee_vec
.iter() .iter()
// FIXME: find() should be position() .position(|trade_fee| trade_fee.symbol == buy_ordered_coin.symbol);
.find(|trade_fee| trade_fee.symbol == buy_ordered_coin.symbol) if quote_asset_precision_option.is_some() && trade_fee_option.is_some() {
.unwrap() let quote_asset_precision = exchange_info_vec[quote_asset_precision_option.unwrap()].quote_asset_precision;
.takercommission; let trade_fee = trade_fee_vec[trade_fee_option.unwrap()].takercommission;
let get_usdt = decimal_mul(sell_base_quantity, sell_base_price) let get_usdt = decimal_mul(sell_base_quantity, sell_base_price)
.round_dp_with_strategy(quote_asset_precision, RoundingStrategy::ToZero); .round_dp_with_strategy(quote_asset_precision, RoundingStrategy::ToZero);
let get_usdt_fee_adjusted = decimal_mul(get_usdt, decimal_sub(dec!(1), trade_fee)) let get_usdt_fee_adjusted = decimal_mul(get_usdt, decimal_sub(dec!(1), trade_fee))
@ -770,6 +768,7 @@ pub async fn limit_order_sell(
let mut delete_condition = String::from("WHERE id = "); let mut delete_condition = String::from("WHERE id = ");
delete_condition.push_str(buy_ordered_coin.id.to_string().as_str()); delete_condition.push_str(buy_ordered_coin.id.to_string().as_str());
delete_record(&delete_table_name, &delete_condition).await; delete_record(&delete_table_name, &delete_condition).await;
}
} else if RUNNING_MODE == REAL || RUNNING_MODE == TEST { } else if RUNNING_MODE == REAL || RUNNING_MODE == TEST {
// building URL and API-keys // building URL and API-keys
let mut url = String::new(); let mut url = String::new();
@ -831,18 +830,15 @@ pub async fn limit_order_sell(
.push(T.get("status").unwrap().as_str().unwrap().to_string()); // status .push(T.get("status").unwrap().as_str().unwrap().to_string()); // status
insert_value_container.push(buy_ordered_coin.used_usdt.to_string()); // used_usdt insert_value_container.push(buy_ordered_coin.used_usdt.to_string()); // used_usdt
let quote_asset_precision = exchange_info_vec let quote_asset_precision_option = exchange_info_vec
.iter() .iter()
// FIXME: find() should be position() .position(|exchange_info| exchange_info.symbol == buy_ordered_coin.symbol);
.find(|exchange_info| exchange_info.symbol == buy_ordered_coin.symbol) let trade_fee_option = trade_fee_vec
.unwrap()
.quote_asset_precision;
let trade_fee = trade_fee_vec
.iter() .iter()
// FIXME: find() should be position() .position(|trade_fee| trade_fee.symbol == buy_ordered_coin.symbol);
.find(|trade_fee| trade_fee.symbol == buy_ordered_coin.symbol) if quote_asset_precision_option.is_some() && trade_fee_option.is_some() {
.unwrap() let quote_asset_precision = exchange_info_vec[quote_asset_precision_option.unwrap()].quote_asset_precision;
.takercommission; let trade_fee = trade_fee_vec[trade_fee_option.unwrap()].takercommission;
let get_usdt = rust_decimal::prelude::FromStr::from_str( let get_usdt = rust_decimal::prelude::FromStr::from_str(
T.get("cummulativeQuoteQty").unwrap().as_str().unwrap(), T.get("cummulativeQuoteQty").unwrap().as_str().unwrap(),
) )
@ -913,6 +909,7 @@ pub async fn limit_order_sell(
delete_record(&delete_table_name, &delete_condition).await; delete_record(&delete_table_name, &delete_condition).await;
} }
} }
}
Err(e) => { Err(e) => {
println!("sell order failed!: {}", body); println!("sell order failed!: {}", body);
} }
@ -1188,26 +1185,26 @@ pub async fn cancel_buy_order(
status_value_build.push('\''); status_value_build.push('\'');
// calculate values to be updated // calculate values to be updated
let trade_fee = trade_fee_vec let trade_fee_option = trade_fee_vec
.iter() .iter()
// FIXME: find() should be position() .position(|trade_fee| trade_fee.symbol == order.symbol);
.find(|trade_fee| trade_fee.symbol == order.symbol)
.unwrap() let base_asset_precision_option = exchange_info_vec
.takercommission; .iter()
.position(|exchange_info| exchange_info.symbol == order.symbol);
if trade_fee_option.is_some() && base_asset_precision_option.is_some() {
let trade_fee = trade_fee_vec[trade_fee_option.unwrap()].takercommission;
let base_qty_ordered = rust_decimal::prelude::FromStr::from_str( let base_qty_ordered = rust_decimal::prelude::FromStr::from_str(
T.get("executedQty").unwrap().as_str().unwrap(), T.get("executedQty").unwrap().as_str().unwrap(),
) )
.unwrap(); .unwrap();
let base_qty_fee_adjusted = let base_qty_fee_adjusted =
decimal_mul(base_qty_ordered, decimal_sub(dec!(1), trade_fee)); decimal_mul(base_qty_ordered, decimal_sub(dec!(1), trade_fee));
let base_asset_precision = exchange_info_vec let base_asset_precision = exchange_info_vec[base_asset_precision_option.unwrap()].base_asset_precision;
.iter()
// FIXME: find() should be position()
.find(|exchange_info| exchange_info.symbol == order.symbol)
.unwrap()
.base_asset_precision;
let buy_price = decimal_div(cummulative_quote_qty, base_qty_ordered) let buy_price = decimal_div(cummulative_quote_qty, base_qty_ordered)
.round_dp_with_strategy(8, RoundingStrategy::ToZero); .round_dp_with_strategy(8, RoundingStrategy::ToZero);
@ -1241,6 +1238,7 @@ pub async fn cancel_buy_order(
println!("partially buy {}", order.symbol); println!("partially buy {}", order.symbol);
} }
} }
}
} else if T.get("code").is_some() { } else if T.get("code").is_some() {
// case that the order isn't canceled because the order completes while canceling // case that the order isn't canceled because the order completes while canceling
// update record in ordered_coin_list // update record in ordered_coin_list
@ -1371,22 +1369,19 @@ pub async fn cancel_sell_order(
insert_values.push(insert_value_container.clone()); insert_values.push(insert_value_container.clone());
insert_records(&insert_table_name, &insert_columns, &insert_values).await; insert_records(&insert_table_name, &insert_columns, &insert_values).await;
} else { } else {
let quote_asset_precision_option = exchange_info_vec
.iter()
.position(|exchange_info| exchange_info.symbol == order.symbol);
let trade_fee_option = trade_fee_vec
.iter()
.position(|trade_fee| trade_fee.symbol == order.symbol);
if quote_asset_precision_option.is_some() && trade_fee_option.is_some() {
let quote_asset_precision = exchange_info_vec[quote_asset_precision_option.unwrap()].quote_asset_precision;
let trade_fee = trade_fee_vec[trade_fee_option.unwrap()].takercommission;
if base_qty_executed == base_qty_ordered { if base_qty_executed == base_qty_ordered {
// FILLED case // FILLED case
// update status FILLED // update status FILLED
let quote_asset_precision = exchange_info_vec
.iter()
// FIXME: find() should be position()
.find(|exchange_info| exchange_info.symbol == order.symbol)
.unwrap()
.quote_asset_precision;
let trade_fee = trade_fee_vec
.iter()
// FIXME: find() should be position()
.find(|trade_fee| trade_fee.symbol == order.symbol)
.unwrap()
.takercommission;
let get_usdt = rust_decimal::prelude::FromStr::from_str( let get_usdt = rust_decimal::prelude::FromStr::from_str(
T.get("cummulativeQuoteQty").unwrap().as_str().unwrap(), T.get("cummulativeQuoteQty").unwrap().as_str().unwrap(),
) )
@ -1435,18 +1430,6 @@ pub async fn cancel_sell_order(
} else { } else {
// PARTIALLY FILLED case // PARTIALLY FILLED case
// reflect partially filled information and update status with FILLED // reflect partially filled information and update status with FILLED
let quote_asset_precision = exchange_info_vec
.iter()
// FIXME: find() should be position()
.find(|exchange_info| exchange_info.symbol == order.symbol)
.unwrap()
.quote_asset_precision;
let trade_fee = trade_fee_vec
.iter()
// FIXME: find() should be position()
.find(|trade_fee| trade_fee.symbol == order.symbol)
.unwrap()
.takercommission;
let used_usdt = decimal_mul(base_qty_executed, order.buy_price); let used_usdt = decimal_mul(base_qty_executed, order.buy_price);
let get_usdt = rust_decimal::prelude::FromStr::from_str( let get_usdt = rust_decimal::prelude::FromStr::from_str(
T.get("cummulativeQuoteQty").unwrap().as_str().unwrap(), T.get("cummulativeQuoteQty").unwrap().as_str().unwrap(),
@ -1529,6 +1512,7 @@ pub async fn cancel_sell_order(
.await; .await;
} }
} }
}
} else { } else {
query_sell_order(&order, &client, exchange_info_vec, trade_fee_vec).await; query_sell_order(&order, &client, exchange_info_vec, trade_fee_vec).await;
} }
@ -1675,13 +1659,16 @@ pub async fn query_buy_order(
value_build.push('\''); value_build.push('\'');
// calculate values to be updated // calculate values to be updated
let trade_fee = trade_fee_vec let trade_fee_option = trade_fee_vec
.iter() .iter()
// FIXME: find() should be position() .position(|trade_fee| trade_fee.symbol == order.symbol);
.find(|trade_fee| trade_fee.symbol == order.symbol) let base_asset_precision_option = exchange_info_vec
.unwrap() .iter()
.takercommission; .position(|exchange_info| exchange_info.symbol == order.symbol);
if trade_fee_option.is_some() && base_asset_precision_option.is_some() {
let trade_fee = trade_fee_vec[trade_fee_option.unwrap()].takercommission;
let base_asset_precision = exchange_info_vec[base_asset_precision_option.unwrap()].base_asset_precision;
let base_qty_ordered = rust_decimal::prelude::FromStr::from_str( let base_qty_ordered = rust_decimal::prelude::FromStr::from_str(
T.get("executedQty").unwrap().as_str().unwrap(), T.get("executedQty").unwrap().as_str().unwrap(),
) )
@ -1693,12 +1680,7 @@ pub async fn query_buy_order(
T.get("cummulativeQuoteQty").unwrap().as_str().unwrap(), T.get("cummulativeQuoteQty").unwrap().as_str().unwrap(),
) )
.unwrap(); .unwrap();
let base_asset_precision = exchange_info_vec
.iter()
// FIXME: find() should be position()
.find(|exchange_info| exchange_info.symbol == order.symbol)
.unwrap()
.base_asset_precision;
let buy_price = decimal_div(cummulative_quote_qty, base_qty_ordered) let buy_price = decimal_div(cummulative_quote_qty, base_qty_ordered)
.round_dp_with_strategy(8, RoundingStrategy::ToZero); .round_dp_with_strategy(8, RoundingStrategy::ToZero);
@ -1732,6 +1714,8 @@ pub async fn query_buy_order(
sub_available_usdt(decimal_sub(cummulative_quote_qty, order.used_usdt)); sub_available_usdt(decimal_sub(cummulative_quote_qty, order.used_usdt));
} }
} }
}
} else if T.get("status").unwrap().as_str().unwrap() == "CANCELED" { } else if T.get("status").unwrap().as_str().unwrap() == "CANCELED" {
let update_table_name = String::from("suggested_coin_list"); let update_table_name = String::from("suggested_coin_list");
let update_condition = vec![ let update_condition = vec![
@ -1798,18 +1782,16 @@ pub async fn query_sell_order(
if T.get("status").unwrap().as_str().unwrap() == "FILLED" if T.get("status").unwrap().as_str().unwrap() == "FILLED"
|| T.get("status").unwrap().as_str().unwrap() == "PARTIALLY_FILLED" || T.get("status").unwrap().as_str().unwrap() == "PARTIALLY_FILLED"
{ {
let quote_asset_precision = exchange_info_vec let quote_asset_precision_option = exchange_info_vec
.iter() .iter()
// FIXME: find() should be position() .position(|exchange_info| exchange_info.symbol == order.symbol);
.find(|exchange_info| exchange_info.symbol == order.symbol) let trade_fee_option = trade_fee_vec
.unwrap()
.quote_asset_precision;
let trade_fee = trade_fee_vec
.iter() .iter()
// FIXME: find() should be position() .position(|trade_fee| trade_fee.symbol == order.symbol);
.find(|trade_fee| trade_fee.symbol == order.symbol)
.unwrap() if quote_asset_precision_option.is_some() && trade_fee_option.is_some() {
.takercommission; let quote_asset_precision = exchange_info_vec[quote_asset_precision_option.unwrap()].quote_asset_precision;
let trade_fee = trade_fee_vec[trade_fee_option.unwrap()].takercommission;
let get_usdt = rust_decimal::prelude::FromStr::from_str( let get_usdt = rust_decimal::prelude::FromStr::from_str(
T.get("cummulativeQuoteQty").unwrap().as_str().unwrap(), T.get("cummulativeQuoteQty").unwrap().as_str().unwrap(),
) )
@ -1851,6 +1833,7 @@ pub async fn query_sell_order(
.unwrap(); .unwrap();
} }
} }
}
Err(e) => { Err(e) => {
println!("query sell order failed!: {}", body); println!("query sell order failed!: {}", body);
} }

16
src/strategy_team/strategy_004.rs
View File

@ -252,10 +252,10 @@ pub async fn list_up_for_sell(
let lot_step_size_option = exchange_info_vec let lot_step_size_option = exchange_info_vec
.iter() .iter()
.find(|exchange_info| exchange_info.symbol == element.symbol); .position(|exchange_info| exchange_info.symbol == element.symbol);
let quote_commission_precision_option = exchange_info_vec let quote_commission_precision_option = exchange_info_vec
.iter() .iter()
.find(|exchange_info| exchange_info.symbol == element.symbol); .position(|exchange_info| exchange_info.symbol == element.symbol);
let opclo_30m_option = all_data let opclo_30m_option = all_data
.rt_price_30m_vec .rt_price_30m_vec
@ -266,9 +266,9 @@ pub async fn list_up_for_sell(
&& quote_commission_precision_option.is_some() && quote_commission_precision_option.is_some()
&& opclo_30m_option.is_some() && opclo_30m_option.is_some()
{ {
let lot_step_size = lot_step_size_option.unwrap().stepsize; let lot_step_size = exchange_info_vec[lot_step_size_option.unwrap()].stepsize;
let quote_commission_precision = quote_commission_precision_option let quote_commission_precision = exchange_info_vec[quote_commission_precision_option
.unwrap() .unwrap()]
.quote_commission_precision; .quote_commission_precision;
let base_qty_to_be_ordered = let base_qty_to_be_ordered =
element.base_qty_fee_adjusted.round_dp_with_strategy( element.base_qty_fee_adjusted.round_dp_with_strategy(
@ -277,8 +277,8 @@ pub async fn list_up_for_sell(
); );
if (element.is_long == 0 || element.is_long == 1) && !element.current_price.is_zero() { if (element.is_long == 0 || element.is_long == 1) && !element.current_price.is_zero() {
if element.current_price >= element.target_price { if element.current_price >= element.target_price && element.pure_profit_percent >= 0.1 {
println!("target selling {} {}", element.symbol, element.pure_profit_percent); println!("target selling {} {:.2}", element.symbol, element.pure_profit_percent);
limit_order_sell( limit_order_sell(
&element, &element,
element.current_price, element.current_price,
@ -289,7 +289,7 @@ pub async fn list_up_for_sell(
) )
.await; .await;
} else if element.current_price <= element.stoploss { } else if element.current_price <= element.stoploss {
println!("stoploss selling {} {}", element.symbol, element.pure_profit_percent); println!("stoploss selling {} {:.2}", element.symbol, element.pure_profit_percent);
limit_order_sell( limit_order_sell(
&element, &element,
element.current_price, element.current_price,