not working still

Author: neotheprogramist

server/Cargo.lock

@@ -4,11 +4,25 @@ members = [
     "blockchain",
     "engagement",
     "engine",
-    "types/evm",
-    "types/fraction",
-    "types/infinity",
-    "types/macros",
-    "types/pricelevel",
-    "types/value",
+    "types/*",
     "worker",
 ]
+
+[workspace.package]
+name = "ksox-server"
+version = "0.1.0"
+edition = "2021"
+
+[workspace.dependencies]
+ethereum-types = "0.14.1"
+num-bigint = { version = "0.4.3", features = ["serde", "arbitrary", "quickcheck"] }
+prefix-hex = "0.7.1"
+serde = { version = "1.0.183", features = ["derive"] }
+sqlx = { version = "0.7.1", features = [
+    "runtime-tokio-native-tls",
+    "postgres",
+    "uuid",
+    "bigdecimal",
+    "chrono"
+] }
+uuid = { version = "1.4.1", features = ["v4", "serde"] }

server/Cargo.toml

@@ -34,7 +34,7 @@ impl AssetsManager {
         sqlx::query_as!(
             Asset,
             r#"
-            SELECT 
+            SELECT
                 a.id,
                 em.address as "address: Address",
                 em.decimals as "decimals: Fraction"

server/blockchain/src/database/managers/assets.rs

@@ -1,8 +1,9 @@
 use crate::database::projections::deposit::{Deposit, DepositInsert};
 use chrono::Utc;
-use evm::{address::Address, txhash::TxHash, confirmations_counter::Confirmations};
+use evm::{address::Address, confirmations_counter::Confirmations, txhash::TxHash};
 use fraction::Fraction;
 use sqlx::{postgres::PgQueryResult, Postgres, Transaction};
+use uuid::Uuid;
 
 #[derive(Debug, Clone)]
 pub struct DepositsManager {}
@@ -17,7 +18,7 @@ impl DepositsManager {
             Deposit,
             r#"
             INSERT INTO "assets"."deposit_evm_metadata"
-            (created_at, last_modification_at, owner, spender, asset, amount, tx_hash, confirmations)
+                (created_at, last_modification_at, owner, spender, asset, amount, tx_hash, confirmations)
             VALUES
                 ($1, $2, $3, $4, $5, $6::fraction, $7, $8::confirmations)
             RETURNING 
@@ -46,21 +47,22 @@ impl DepositsManager {
 
     pub async fn update<'t>(
         t: &'t mut Transaction<'_, Postgres>,
-        deposit: Deposit,
+        id: Uuid,
+        confirmations: Confirmations,
     ) -> sqlx::Result<PgQueryResult> {
         let now = Utc::now();
         sqlx::query!(
             r#"
             UPDATE 
-                deposits
+                "assets"."deposit_evm_metadata"
             SET
-                confirmations = $2::fraction,
+                confirmations = $2::confirmations,
                 last_modification_at = $3
             WHERE
                 id = $1
             "#,
-            deposit.id,
-            deposit.confirmations.to_tuple_string() as _,
+            id,
+            confirmations.to_tuple_string() as _,
             now
         )
         .execute(t.as_mut())

server/blockchain/src/database/managers/deposits.rs

@@ -14,19 +14,30 @@ impl UsersManager {
         address: &Address,
     ) -> Result<User> {
         let now = Utc::now();
-        sqlx::query_as!(
+        let user = sqlx::query_as!(
             User,
             r#"
-            INSERT INTO 
-                users
-                (last_modification_at, address) VALUES ($1, $2)
-                RETURNING id, address as "address: Address"
+            INSERT INTO "users"."user"
+                (created_at, last_modification_at)
+            VALUES
+                ($1, $2)
+            RETURNING id
             "#,
             now,
-            &address.to_string()
+            now,
         )
         .fetch_one(t.as_mut())
-        .await
+        .await?;
+        sqlx::query!(
+            r#"
+            INSERT INTO "users"."address"
+                (network_id, user_id, address)
+            VALUES
+                ($1, $2)
+            RETURNING id
+            "#
+        );
+        user
     }
 
     pub async fn get_by_address<'t>(
@@ -36,11 +47,11 @@ impl UsersManager {
         sqlx::query_as!(
             User,
             r#"
-            SELECT
-                id,
-                address as "address: Address"
-            FROM users
-            WHERE address = $1
+            SELECT 
+                u.id
+            FROM "users"."user" u
+            JOIN "users"."address" a ON u.id = a.user_id
+            WHERE a.address = $1
             "#,
             address.to_string()
         )

server/blockchain/src/database/managers/users.rs

@@ -1,9 +1,7 @@
-use evm::address::Address;
 use serde::{Deserialize, Serialize};
 use sqlx::types::Uuid;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct User {
     pub id: Uuid,
-    pub address: Address,
 }

server/blockchain/src/database/projections/user.rs

@@ -15,6 +15,3 @@ seq-macro = "0.3.5"
 serde = { version = "1.0.183", features = ["derive"] }
 serde_json = "1.0.105"
 sqlx = { version = "0.7.1", features = [ "postgres", "bigdecimal" ] }
-
-[package.metadata.cargo-udeps.ignore]
-normal = ["proptest", "seq-macro"]

server/types/evm/Makefile.toml

@@ -0,0 +1,10 @@
+[package]
+name = "network"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+serde.workspace = true
+uuid.workspace = true

server/types/fraction/Cargo.toml

@@ -0,0 +1 @@
+pub mod network;

server/types/fraction/Makefile.toml

@@ -0,0 +1,8 @@
+use serde::{Deserialize, Serialize};
+use uuid::Uuid;
+
+#[derive(Debug, Deserialize, Serialize)]
+struct Network {
+    id: Uuid,
+    name: String,
+}