Rename to WTP and clean it up

Author: miksax

Cargo.lock

@@ -2,7 +2,7 @@
 members = [".", "migration"]
 
 [package]
-name = "cardano_price_feed"
+name = "wtp"
 version = "0.1.0"
 edition = "2021"
 

Cargo.toml

@@ -1,17 +1,30 @@
-# Fast Cardano swap price feed
+# What the price
+Tool for cardano to get Dex SWAP operation, store it to the Database and broadcast it throught the websocket.
 
-## Setting up
+## DEXes
+Current state is, that we have implemeneted 3 Dexes
+* WingRiders
+* MinSwap
+* SundaeSwap
 
-Run a Postgres instance and create an empty databas for this project:
+Dex can have more versions and more addresses per version.
 
-```bash
-psql -U postgres -c 'CREATE DATABASE cardano_price_feed;'
-```
+## Interface
+* `/health` - Health check endpoint
+* `/assets` - List of assets presents in the database. This is place, where pair asset_id with name and policy
+* `/exchange_rates` - Calculate exchange rate. There is no information about decimal numbers
+* `/mean_history/TOKEN1_ID/TOKEN2_ID?count=<number>` - Return mean swap price for tokens. Mean is not AVG, but ration on the pool address
+* `/asset_swap/TOKEN1_ID/TOKEN2_ID?count=<number>` - Return last swap price for tokens.
+* `/socket/` - WebSocket enpoint for Live informatino about swap.
 
-## Running
+
+## Setting up
+
+Run a Postgres instance and create an empty databas for this project:
 
 ```bash
-export DATABASE_URL='postgres://postgres:postgres@localhost:5432/cardano_price_feed'
+export DATABASE_URL='postgres://postgres:postgres@localhost:5432/wtp'
+psql -U postgres -c 'CREATE DATABASE wtp;'
 cargo migrate up
 cargo run -- -s 'relays-new.cardano-mainnet.iohk.io:3001' -d $DATABASE_URL
 ```
@@ -34,6 +47,8 @@ cargo migrate up
 sea-orm-cli generate entity -o src/entity
 ```
 
+## Run
+
 ```bash
 # Ideal run parametres for WR
 cargo run -- --socket localhost:3001 --database $DATABASE_URL --persistent  --start 57270168:17a26b5607a6f61fe89bf73a7a242ff4fa6dd6c667f3b2d6fc56bbcad644e90b

README.md

@@ -33,10 +33,14 @@ struct Args {
     #[arg(short, long)]
     database: String,
 
-    /// Persistency option
+    // Persistency option
     #[arg(short, long)]
     persistent: bool,
 
+    // Bind address
+    #[arg(short, long, default_value_t = String::from("0.0.0.0:3000"))]
+    bind: String,
+
     /// Config file
     #[arg(short, long, default_value_t = String::from("example.toml"))]
     config: String,
@@ -49,8 +53,8 @@ async fn main() -> anyhow::Result<()> {
     let fmt_layer = tracing_subscriber::fmt::layer();
     let filter = tracing_subscriber::filter::Targets::new()
         .with_target("oura", tracing::Level::WARN)
-        //.with_target("sqlx", tracing::Level::DEBUG)
-        .with_target("cardano_price_feed", tracing::Level::TRACE);
+        .with_target("sqlx", tracing::Level::DEBUG)
+        .with_target("wtp", tracing::Level::TRACE);
 
     tracing_subscriber::registry()
         .with(fmt_layer)
@@ -63,7 +67,7 @@ async fn main() -> anyhow::Result<()> {
     }
 
     let db_path = args.database.clone();
-    let addr = SocketAddr::from(([0, 0, 0, 0], 3000));
+    let addr: SocketAddr = args.bind.parse().unwrap();
     let make_service = make_service_fn(move |_conn| {
         let db_path = db_path.clone();
         let service = service_fn(move |req| server::route(req, db_path.clone()));

src/main.rs

@@ -19,7 +19,7 @@ use sea_orm::{
     Statement,
 };
 
-#[allow(dead_code)]
+
 pub async fn insert_block(block: &BlockRecord, db: &DatabaseConnection) -> anyhow::Result<i64> {
     let previous_hash = hex::decode(block.previous_hash.clone())?;
     let previous_block_model = block::Entity::find()
@@ -40,7 +40,7 @@ pub async fn insert_block(block: &BlockRecord, db: &DatabaseConnection) -> anyho
     Ok(block_model.id)
 }
 
-#[allow(dead_code)]
+
 pub async fn rollback_to_slot(slot: &u64, db: &DatabaseConnection) -> anyhow::Result<()> {
     // We remove all blocks that are after the given slot. Removing based on the rollback event's
     // block_hash might not work because it's affected by the --start option and thus the
@@ -52,7 +52,7 @@ pub async fn rollback_to_slot(slot: &u64, db: &DatabaseConnection) -> anyhow::Re
     Ok(())
 }
 
-#[allow(dead_code)]
+
 pub async fn insert_transaction(
     transaction: &TransactionRecord,
     block_id: i64,
@@ -102,7 +102,6 @@ pub async fn insert_transaction(
     Ok(transaction_model.id)
 }
 
-#[allow(dead_code)]
 async fn insert_missing_addresses(
     addresses: HashSet<String>,
     db: &DatabaseConnection,
@@ -139,7 +138,6 @@ async fn insert_missing_addresses(
         .collect())
 }
 
-#[allow(dead_code)]
 async fn insert_missing_tokens(
     tokens: HashSet<(Vec<u8>, Vec<u8>)>,
     db: &DatabaseConnection,
@@ -189,7 +187,6 @@ async fn insert_missing_tokens(
         .collect())
 }
 
-#[allow(dead_code)]
 async fn insert_output(
     output: &TxOutputRecord,
     transaction_model: &transaction::Model,
@@ -241,7 +238,6 @@ async fn insert_output(
     Ok(())
 }
 
-#[allow(dead_code)]
 pub async fn insert_price_update(
     tx_id: i64,
     script_hash: &[u8],
@@ -264,7 +260,6 @@ pub async fn insert_price_update(
     Ok(())
 }
 
-#[allow(dead_code)]
 pub async fn insert_swap(
     tx_id: i64,
     script_hash: &[u8],
@@ -298,7 +293,6 @@ pub async fn get_token_id(asset: &Asset, db: &DatabaseConnection) -> anyhow::Res
         .id)
 }
 
-#[allow(dead_code)]
 pub async fn get_latest_prices(db: &DatabaseConnection) -> anyhow::Result<Vec<ExchangeRate>> {
     // The raw SQL query here is rather unlucky, but we need to join the token table twice,
     // and the sea-orm version usde by us (dcSpark's fork which implements
@@ -312,7 +306,6 @@ pub async fn get_latest_prices(db: &DatabaseConnection) -> anyhow::Result<Vec<Ex
         t2_id: i64,
         amount1: i64,
         amount2: i64,
-        tx_id: i64,
     }
 
     let raw_exchange_rates: Vec<RawExchangeRate> =
@@ -324,8 +317,7 @@ pub async fn get_latest_prices(db: &DatabaseConnection) -> anyhow::Result<Vec<Ex
                 t1.id AS t1_id,
                 t2.id AS t2_id,
                 amount1,
-                amount2,
-                tx_id
+                amount2
 
             FROM price_update
             JOIN token AS t1 ON t1.id = price_update.token1_id
@@ -423,7 +415,6 @@ pub async fn get_swap_history(
         .collect())
 }
 
-#[allow(dead_code)]
 pub async fn get_utxo_input(
     inputs: &[TxInputRecord],
     db: &DatabaseConnection,

src/queries.rs

@@ -140,67 +140,69 @@ impl common::Dex for SundaeSwapV1 {
                         == 0
                     {
                         let address = get_address_from_plutus(&plutus.plutus_data);
-                        let utxo_pos = free_utxo.iter().position(|o| o.address == address).unwrap();
-                        let utxo = free_utxo[utxo_pos];
-                        // Remove this UTxO as used
-                        free_utxo.remove(utxo_pos);
-
-                        let (amount1, amount2, direction) = match plutus.plutus_data["fields"][3]
-                            ["fields"][0]["constructor"]
-                            .as_i64()
-                            .unwrap()
-                            == 0
+                        if let Some(utxo_pos) = free_utxo.iter().position(|o| o.address == address)
                         {
-                            true => (
-                                common::get_amount(input, &asset1.policy_id, &asset1.name)
-                                    - common::reduce_ada_amount(
-                                        &asset1.policy_id,
-                                        &asset1.name,
-                                        SS1_ADA_SWAP_IN,
-                                    ),
-                                common::get_amount(utxo, &asset2.policy_id, &asset2.name)
-                                    - common::reduce_ada_amount(
-                                        &asset2.policy_id,
-                                        &asset2.name,
-                                        SS1_ADA_SWAP_OUT,
-                                    ),
-                                false,
-                            ),
-                            false => (
-                                common::get_amount(utxo, &asset1.policy_id, &asset1.name)
-                                    - common::reduce_ada_amount(
-                                        &asset1.policy_id,
-                                        &asset1.name,
-                                        SS1_ADA_SWAP_OUT,
-                                    ),
-                                common::get_amount(input, &asset2.policy_id, &asset2.name)
-                                    - common::reduce_ada_amount(
-                                        &asset2.policy_id,
-                                        &asset2.name,
-                                        SS1_ADA_SWAP_IN,
-                                    ),
-                                true,
-                            ),
-                        };
+                            let utxo = free_utxo[utxo_pos];
+                            // Remove this UTxO as used
+                            free_utxo.remove(utxo_pos);
+
+                            let (amount1, amount2, direction) = match plutus.plutus_data["fields"]
+                                [3]["fields"][0]["constructor"]
+                                .as_i64()
+                                .unwrap()
+                                == 0
+                            {
+                                true => (
+                                    common::get_amount(input, &asset1.policy_id, &asset1.name)
+                                        - common::reduce_ada_amount(
+                                            &asset1.policy_id,
+                                            &asset1.name,
+                                            SS1_ADA_SWAP_IN,
+                                        ),
+                                    common::get_amount(utxo, &asset2.policy_id, &asset2.name)
+                                        - common::reduce_ada_amount(
+                                            &asset2.policy_id,
+                                            &asset2.name,
+                                            SS1_ADA_SWAP_OUT,
+                                        ),
+                                    false,
+                                ),
+                                false => (
+                                    common::get_amount(utxo, &asset1.policy_id, &asset1.name)
+                                        - common::reduce_ada_amount(
+                                            &asset1.policy_id,
+                                            &asset1.name,
+                                            SS1_ADA_SWAP_OUT,
+                                        ),
+                                    common::get_amount(input, &asset2.policy_id, &asset2.name)
+                                        - common::reduce_ada_amount(
+                                            &asset2.policy_id,
+                                            &asset2.name,
+                                            SS1_ADA_SWAP_IN,
+                                        ),
+                                    true,
+                                ),
+                            };
 
-                        // Add swap to the result
-                        swaps.push(Swap {
-                            first: AssetAmount {
-                                asset: Asset {
-                                    policy_id: asset1.policy_id.clone(),
-                                    name: asset1.name.clone(),
+                            // Add swap to the result
+                            swaps.push(Swap {
+                                first: AssetAmount {
+                                    asset: Asset {
+                                        policy_id: asset1.policy_id.clone(),
+                                        name: asset1.name.clone(),
+                                    },
+                                    amount: amount1 as u64,
                                 },
-                                amount: amount1 as u64,
-                            },
-                            second: AssetAmount {
-                                asset: Asset {
-                                    policy_id: asset2.policy_id.clone(),
-                                    name: asset2.name.clone(),
+                                second: AssetAmount {
+                                    asset: Asset {
+                                        policy_id: asset2.policy_id.clone(),
+                                        name: asset2.name.clone(),
+                                    },
+                                    amount: amount2 as u64,
                                 },
-                                amount: amount2 as u64,
-                            },
-                            direction,
-                        });
+                                direction,
+                            });
+                        }
                     }
                 }
             }