|
|
@@ -307,7 +307,8 @@ async fn main() {
|
|
|
let okx_access_key= env::var("okx_access_key").unwrap();
|
|
|
let okx_secret_key= env::var("okx_secret_key").unwrap();
|
|
|
let okx_passphrase= env::var("okx_passphrase").unwrap();
|
|
|
- let exchange:Exchange = Exchange::new(okx_access_key, okx_secret_key, okx_passphrase);
|
|
|
+
|
|
|
+ let exchange:Exchange = Exchange::new(okx_access_key.clone(), okx_secret_key.clone(), okx_passphrase.clone());
|
|
|
|
|
|
let bot = Bot::new(spread_list, symbol.clone(), limit, short_interval, rl_start, rl_end, quantity_max, amount_decimal_places, order_info_map, last_buy_time, buy_time_limit, cancel_time_limit, price_decimal_places, spread_list_limit, exchange);
|
|
|
let bot_arc = Arc::new(Mutex::new(bot));
|
|
|
@@ -316,11 +317,7 @@ async fn main() {
|
|
|
|
|
|
// bot主线程
|
|
|
let bot_arc_thread = tokio::spawn(async move {
|
|
|
- let okx_access_key= env::var("okx_access_key").unwrap();
|
|
|
- let okx_secret_key= env::var("okx_secret_key").unwrap();
|
|
|
- let okx_passphrase= env::var("okx_passphrase").unwrap();
|
|
|
-
|
|
|
- let exchange:Exchange = Exchange::new(okx_access_key, okx_secret_key, okx_passphrase);
|
|
|
+ let exchange:Exchange = Exchange::new(okx_access_key.clone(), okx_secret_key.clone(), okx_passphrase.clone());
|
|
|
|
|
|
loop {
|
|
|
{
|
|
|
@@ -341,20 +338,14 @@ async fn main() {
|
|
|
|
|
|
// 各种订阅信息,辅助线程
|
|
|
let subscribe_binance_depth_thread = tokio::spawn(async move {
|
|
|
- let okx_access_key_x= env::var("okx_access_key").unwrap();
|
|
|
- let okx_secret_key_x= env::var("okx_secret_key").unwrap();
|
|
|
- let okx_passphrase_x= env::var("okx_passphrase").unwrap();
|
|
|
- let exchange_x:Exchange = Exchange::new(okx_access_key_x, okx_secret_key_x, okx_passphrase_x);
|
|
|
+ let exchange_x:Exchange = Exchange::new(okx_access_key.clone(), okx_secret_key.clone(), okx_passphrase.clone());
|
|
|
exchange_x.subscribe_binance_depth(&symbol, 10, bot_binance_depth_arc).await;
|
|
|
});
|
|
|
|
|
|
|
|
|
// 各种订阅信息,辅助线程
|
|
|
let subscribe_order_change_thread = tokio::spawn(async move {
|
|
|
- let okx_access_key_y= env::var("okx_access_key").unwrap();
|
|
|
- let okx_secret_key_y= env::var("okx_secret_key").unwrap();
|
|
|
- let okx_passphrase_y= env::var("okx_passphrase").unwrap();
|
|
|
- let exchange_x:Exchange = Exchange::new(okx_access_key_y, okx_secret_key_y, okx_passphrase_y);
|
|
|
+ let exchange_x:Exchange = Exchange::new(okx_access_key, okx_secret_key, okx_passphrase);
|
|
|
exchange_x.subscribe_okx_order(&symbol_order, bot_okx_order_arc).await;
|
|
|
});
|
|
|
|