refactor sdk

Cargo.toml

@@ -12,12 +12,16 @@ path = "src/lib.rs"
 
 [[bin]]
 name = "strat"
-path = "src/bin/strategy.rs"
+path = "src/bin/dn_strat/main.rs"
 
 [[bin]]
 name = "deployer"
 path = "src/bin/perp_deployer.rs"
 
+[[bin]]
+name = "dex"
+path = "src/bin/perp_dex.rs"
+
 [dependencies]
 alloy = "1.0.9"
 anyhow = "1.0.98"
@@ -41,3 +45,5 @@ thiserror = "2.0.12"
 tokio = "1.45.1"
 tokio-tungstenite = {version = "0.26.2",features = ["native-tls"] }
 tokio-util = "0.7.15"
+tracing = "0.1.41"
+tracing-subscriber = {version = "0.3.19", features = ["json","env-filter"] }

Makefile

@@ -7,6 +7,9 @@ run-strat:
 
 run-deployer:
 	cargo run --bin deployer
+
+run-dex:
+	cargo run --bin dex
 
 debug:
 	cargo build

src/config.rs → src/bin/dn_strat/config.rs

@@ -11,9 +11,6 @@ pub struct Config {
     #[envconfig(from = "USER_ADDRESS")]
     pub user_address: String,
 
-    #[envconfig(from = "EXISTING_ORDER_ID")]
-    pub existing_order_id: String,
-
     #[envconfig(from = "BOT_URL")]
     pub bot_url: String,
 

src/handlers.rs → src/bin/dn_strat/handlers.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 use axum::{Json, extract::State};
 use serde::{Deserialize, Serialize};
 
-use crate::services::{CurrentUserPositionResponse, OpenPositionRequest, StrategyManagerService};
+use crate::service::{CurrentUserPositionResponse, OpenPositionRequest, StrategyManagerService};
 
 #[derive(Deserialize, Serialize)]
 pub struct ResponseJson<T> {

src/bin/strategy.rs → src/bin/dn_strat/main.rs

@@ -1,17 +1,36 @@
-use std::sync::Arc;
 use std::time::Duration;
+use std::{env, sync::Arc};
 
 use alloy::primitives::Address;
 use envconfig::Envconfig;
 use hyperqit::*;
-use log::info;
 use tokio::signal;
 use tokio_util::sync::CancellationToken;
+use tracing::info;
+
+mod config;
+mod handlers;
+mod notifier;
+mod router;
+mod service;
+mod strategy;
+
+use config::Config;
+use notifier::NotifierService;
+use router::create_router;
+use service::StrategyManagerService;
+use strategy::{Asset, Strategy};
+use tracing_subscriber::EnvFilter;
 
 #[tokio::main]
 async fn main() {
-    env_logger::init();
-    let config = hyperqit::Config::init_from_env().unwrap();
+    tracing_subscriber::fmt()
+        .json()
+        .with_env_filter(
+            EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info")),
+        )
+        .init();
+    let config = Config::init_from_env().unwrap();
     let signer = Signers::Local(hyperqit::LocalWallet::signer(config.private_key));
 
     let user_address: Address = config.user_address.parse().unwrap();

src/bin/dn_strat/notifier/mod.rs

@@ -0,0 +1,3 @@
+mod notifier;
+
+pub use notifier::*;

src/notifier/mod.rs → src/bin/dn_strat/notifier/notifier.rs

@@ -1,6 +1,6 @@
-use log::{error, info};
 use reqwest::Client;
 use serde::Serialize;
+use tracing::{error, info};
 
 #[derive(Debug, Clone)]
 pub struct NotifierService {

src/router.rs → src/bin/dn_strat/router.rs

@@ -7,7 +7,7 @@ use axum::{
 
 use crate::{
     handlers::{close_position, create_new_position, get_current_position},
-    services::StrategyManagerService,
+    service::StrategyManagerService,
 };
 
 pub fn create_router(manager_svc: Arc<StrategyManagerService>) -> Router {

src/services/manager.rs → src/bin/dn_strat/service/manager.rs

@@ -3,7 +3,9 @@ use std::sync::Arc;
 use anyhow::Ok;
 use serde::{Deserialize, Serialize};
 
-use crate::{Amount, Asset, Strategy, StrategyState, errors::Result};
+use hyperqit::Result;
+
+use crate::strategy::{Amount, Asset, Strategy, StrategyState};
 
 #[derive(Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]