fix database assets

Author: neotheprogramist

postgres/migrations/03_assets.sql

@@ -27,9 +27,9 @@ CREATE TABLE "assets"."evm_metadata" (
   "last_modification_at" TIMESTAMP(6) WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
   "asset_id" uuid NOT NULL,
   "address" CHAR(42) UNIQUE NOT NULL,
-  "name" VARCHAR(128),
-  "symbol" VARCHAR(8),
-  "decimals" text
+  "name" VARCHAR(128) NOT NULL,
+  "symbol" VARCHAR(8) NOT NULL,
+  "decimals" text NOT NULL
 );
 ALTER TABLE "assets"."evm_metadata" ADD FOREIGN KEY ("asset_id") REFERENCES "assets"."asset" ("id");
 CREATE OR REPLACE FUNCTION assets_evm_metadata_changed_trigger() 

server/Cargo.lock

@@ -16,12 +16,13 @@ impl AssetsManager {
         sqlx::query_as!(
             Asset,
             r#"
-            SELECT
-                id,
-                address as "address: Address",
-                decimals as "decimals: Fraction"
-            FROM assets
-            WHERE address = $1
+            SELECT 
+                a.id,
+                em.address as "address: Address",
+                em.decimals as "decimals: Fraction"
+            FROM "assets"."asset" a
+            JOIN "assets"."evm_metadata" em ON a.id = em.asset_id
+            WHERE em.address = $1
             "#,
             address.to_string()
         )
@@ -33,12 +34,13 @@ impl AssetsManager {
         sqlx::query_as!(
             Asset,
             r#"
-            SELECT
-                id,
-                address as "address: Address",
-                decimals as "decimals: Fraction"
-            FROM assets
-            WHERE id = $1
+            SELECT 
+                a.id,
+                em.address as "address: Address",
+                em.decimals as "decimals: Fraction"
+            FROM "assets"."asset" a
+            JOIN "assets"."evm_metadata" em ON a.id = em.asset_id
+            WHERE a.id = $1
             "#,
             id
         )

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

@@ -1,7 +1,6 @@
 use crate::database::projections::deposit::{Deposit, DepositInsert};
 use chrono::Utc;
-use evm::address::Address;
-use evm::txhash::TxHash;
+use evm::{address::Address, txhash::TxHash, confirmations_counter::Confirmations};
 use fraction::Fraction;
 use sqlx::{postgres::PgQueryResult, Postgres, Transaction};
 
@@ -17,10 +16,10 @@ impl DepositsManager {
         sqlx::query_as!(
             Deposit,
             r#"
-            INSERT INTO deposits
+            INSERT INTO "assets"."deposit_evm_metadata"
             (created_at, last_modification_at, owner, spender, asset, amount, tx_hash, confirmations)
             VALUES
-                ($1, $2, $3, $4, $5, $6::fraction, $7, $8::fraction)
+                ($1, $2, $3, $4, $5, $6::fraction, $7, $8::confirmations)
             RETURNING 
                 id,
                 created_at,
@@ -30,7 +29,7 @@ impl DepositsManager {
                 asset as "asset: Address",
                 amount as "amount: Fraction",
                 tx_hash as "tx_hash: TxHash",
-                confirmations as "confirmations: Fraction"
+                confirmations as "confirmations: Confirmations"
             "#,
             now,
             now,

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

@@ -1,8 +1,7 @@
 use chrono::{DateTime, Utc};
 use ethers::prelude::LogMeta;
-use evm::{address::Address, txhash::TxHash};
-use fraction::{num_traits::One, Fraction};
-use num_bigint::BigInt;
+use evm::{address::Address, txhash::TxHash, confirmations_counter::Confirmations};
+use fraction::Fraction;
 use num_traits::Zero;
 use serde::{Deserialize, Serialize};
 use sqlx::{Postgres, Transaction};
@@ -15,7 +14,7 @@ use crate::{
     database::managers::{assets::AssetsManager, users::UsersManager, valuts::ValutsManager},
     engine_base,
 };
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Serialize, Deserialize, Clone, Hash)]
 pub struct Deposit {
     pub id: Uuid,
     pub created_at: DateTime<Utc>,
@@ -25,7 +24,7 @@ pub struct Deposit {
     pub asset: Address,
     pub amount: Fraction,
     pub tx_hash: TxHash,
-    pub confirmations: Fraction,
+    pub confirmations: Confirmations,
 }
 
 impl Deposit {
@@ -56,12 +55,12 @@ impl Deposit {
 }
 
 impl Confirmable for Deposit {
-    fn set(&mut self, confirmations: BigInt) {
-        let (_, denom) = self.confirmations.0.clone().into();
-        self.confirmations = Fraction::from_raw((confirmations, denom)).unwrap_or_default()
+    fn set(&mut self, actual: u64) {
+        let desired = self.confirmations.desired();
+        self.confirmations = Confirmations::from_raw(actual, desired);
     }
     fn is_confirmed(&self) -> bool {
-        self.confirmations >= Fraction::one()
+        self.confirmations.actual() >= self.confirmations.desired()
     }
 }
 

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

@@ -1,5 +1,4 @@
 use chrono::{DateTime, Utc};
-use num_bigint::BigInt;
 
 pub mod asset;
 pub mod deposit;
@@ -8,7 +7,7 @@ pub mod valut;
 pub mod withdraw;
 
 pub trait Confirmable {
-    fn set(&mut self, confirmations: BigInt);
+    fn set(&mut self, confirmations: u64);
     fn is_confirmed(&self) -> bool;
 }
 

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

@@ -6,6 +6,7 @@ edition = "2021"
 
 [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 = [

server/types/evm/Cargo.toml

@@ -0,0 +1,52 @@
+use num_bigint::BigInt;
+use serde::{Deserialize, Serialize};
+use sqlx::{
+    database::HasValueRef, postgres::PgArgumentBuffer, types::BigDecimal, Database, Decode, Encode,
+    Postgres, Type, TypeInfo,
+};
+
+#[derive(Debug, Clone, Hash, Default, Deserialize, Serialize)]
+pub struct Confirmations {
+    actual: BigInt,
+    desired: BigInt,
+}
+impl Confirmations {
+    pub fn new(desired: BigInt) -> Self {
+        Confirmations {
+            actual: BigInt::from(0),
+            desired,
+        }
+    }
+
+    pub fn from_raw(actual: BigInt, desired: BigInt) -> Self {
+        Confirmations { actual, desired }
+    }
+
+    pub fn to_tuple_string(&self) -> String {
+        format!("({},{})", self.actual, self.desired)
+    }
+
+    pub fn actual(&self) -> &BigInt {
+        &self.actual
+    }
+
+    pub fn desired(&self) -> &BigInt {
+        &self.desired
+    }
+}
+impl<'r, DB: Database> Decode<'r, DB> for Confirmations
+where
+    (BigDecimal, BigDecimal): Decode<'r, DB>,
+{
+    fn decode(
+        value: <DB as HasValueRef<'r>>::ValueRef,
+    ) -> Result<Self, Box<dyn std::error::Error + 'static + Send + Sync>> {
+        let (actual, desired) = <(BigDecimal, BigDecimal) as Decode<DB>>::decode(value)?;
+
+        let (actual_bigint, actual_exp) = actual.into_bigint_and_exponent();
+        let (desired_bigint, desired_exp) = desired.into_bigint_and_exponent();
+        let actual = actual_bigint * BigInt::from(10).pow(TryInto::try_into(-actual_exp)?);
+        let desired = desired_bigint * BigInt::from(10).pow(TryInto::try_into(-desired_exp)?);
+        Ok(Confirmations::from_raw(actual, desired))
+    }
+}

server/types/evm/src/confirmations_counter.rs

@@ -1,2 +1,3 @@
 pub mod address;
+pub mod confirmations_counter;
 pub mod txhash;