Improving code

utxo/Cargo.lock

@@ -36,6 +36,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
 name = "async-trait"
 version = "0.1.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -122,6 +137,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "bumpalo"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+
+[[package]]
 name = "byteorder"
 version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -149,6 +170,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
+name = "chrono"
+version = "0.4.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-targets",
+]
+
+[[package]]
 name = "const-oid"
 version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -548,6 +583,29 @@ dependencies = [
 ]
 
 [[package]]
+name = "iana-time-zone"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
 name = "idna"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -583,6 +641,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
+name = "js-sys"
+version = "0.3.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
 name = "lazy_static"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -597,6 +664,7 @@ version = "0.1.0"
 dependencies = [
  "async-trait",
  "bincode",
+ "chrono",
  "futures",
  "hex",
  "serde",
@@ -1252,6 +1320,7 @@ dependencies = [
  "atoi",
  "byteorder",
  "bytes",
+ "chrono",
  "crc",
  "crossbeam-queue",
  "dotenvy",
@@ -1314,6 +1383,7 @@ dependencies = [
  "sha2",
  "sqlx-core",
  "sqlx-mysql",
+ "sqlx-postgres",
  "sqlx-sqlite",
  "syn 1.0.109",
  "tempfile",
@@ -1332,6 +1402,7 @@ dependencies = [
  "bitflags 2.4.0",
  "byteorder",
  "bytes",
+ "chrono",
  "crc",
  "digest",
  "dotenvy",
@@ -1373,6 +1444,7 @@ dependencies = [
  "base64",
  "bitflags 2.4.0",
  "byteorder",
+ "chrono",
  "crc",
  "dotenvy",
  "etcetera",
@@ -1409,6 +1481,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2"
 dependencies = [
  "atoi",
+ "chrono",
  "flume",
  "futures-channel",
  "futures-core",
@@ -1673,12 +1746,75 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
+name = "wasm-bindgen"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.31",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.31",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+
+[[package]]
 name = "whoami"
 version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50"
 
 [[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
 name = "windows-sys"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"

utxo/Cargo.toml

@@ -7,11 +7,12 @@ edition = "2021"
 [dependencies]
 async-trait = "0.1.73"
 bincode = { version = "1.3.3", features = ["i128"] }
+chrono = "0.4.31"
 futures = "0.3.28"
 hex = "0.4.3"
 serde = { version = "1.0.188", features = ["derive"] }
 sha2 = "0.10.7"
-sqlx = { version = "0.7.1", features = ["runtime-tokio", "tls-native-tls", "sqlite"] }
+sqlx = { version = "0.7.1", features = ["runtime-tokio", "tls-native-tls", "sqlite", "chrono"] }
 strum = "0.25.0"
 strum_macros = "0.25.2"
 thiserror = "1.0.48"

utxo/src/account_id.rs

@@ -0,0 +1,24 @@
+use std::fmt::Display;
+
+use serde::Serialize;
+
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, Serialize)]
+pub struct AccountId(pub [u8; 32]);
+
+impl AccountId {
+    pub fn new() -> Self {
+        Self([0; 32])
+    }
+}
+
+impl Display for AccountId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", hex::encode(self.0))
+    }
+}
+
+impl AsRef<[u8]> for AccountId {
+    fn as_ref(&self) -> &[u8] {
+        &self.0
+    }
+}

utxo/src/payment.rs

@@ -23,3 +23,9 @@ pub struct Payment {
     #[serde(skip)]
     pub spent_by: Option<TransactionId>,
 }
+
+impl Payment {
+    pub fn is_spendable(&self) -> bool {
+        self.spent_by.is_none() && self.status == Status::Settled
+    }
+}

utxo/src/sqlite/batch.rs

@@ -1,6 +1,6 @@
 use crate::{
     storage::{self, Error},
-    Payment, PaymentId, Status, Transaction, TransactionId,
+    AccountId, Payment, PaymentId, Status, Transaction, TransactionId,
 };
 use sqlx::{Row, Sqlite, Transaction as SqlxTransaction};
 use std::marker::PhantomData;
@@ -21,6 +21,20 @@ impl<'a> Batch<'a> {
 
 #[async_trait::async_trait]
 impl<'a> storage::Batch<'a> for Batch<'a> {
+    async fn rollback(self) -> Result<(), Error> {
+        self.inner
+            .rollback()
+            .await
+            .map_err(|e| Error::Storage(e.to_string()))
+    }
+
+    async fn commit(self) -> Result<(), Error> {
+        self.inner
+            .commit()
+            .await
+            .map_err(|e| Error::Storage(e.to_string()))
+    }
+
     async fn spend_payment(
         &mut self,
         payment_id: &PaymentId,
@@ -85,23 +99,8 @@ impl<'a> storage::Batch<'a> for Batch<'a> {
         }
     }
 
-    async fn rollback(self) -> Result<(), Error> {
-        self.inner
-            .rollback()
-            .await
-            .map_err(|e| Error::Storage(e.to_string()))
-    }
-
-    async fn commit(self) -> Result<(), Error> {
-        self.inner
-            .commit()
-            .await
-            .map_err(|e| Error::Storage(e.to_string()))
-    }
-
-    async fn store_new_payments(&mut self, payments: &[Payment]) -> Result<(), Error> {
-        for payment in payments.iter() {
-            sqlx::query(
+    async fn store_new_payment(&mut self, payment: &Payment) -> Result<(), Error> {
+        sqlx::query(
                 r#"
                 INSERT INTO payments("transaction_id", "position_id", "to", "cents", "asset_id", "status")
                 VALUES (?, ?, ?, ?, ?, ?)
@@ -118,22 +117,23 @@ impl<'a> storage::Batch<'a> for Batch<'a> {
             .execute(&mut *self.inner)
             .await
             .map_err(|e| Error::Storage(e.to_string()))?;
-        }
         Ok(())
     }
 
     async fn store_transaction(&mut self, transaction: &Transaction) -> Result<(), Error> {
         sqlx::query(
             r#"
-                INSERT INTO "transactions"("transaction_id", "status", "reference")
-                VALUES(?, ?, ?)
+                INSERT INTO "transactions"("transaction_id", "status", "reference", "created_at", "updated_at")
+                VALUES(?, ?, ?, ?, ?)
                 ON CONFLICT("transaction_id")
-                    DO UPDATE SET "status" = excluded."status", "reference" = excluded."reference"
+                    DO UPDATE SET "status" = excluded."status", "reference" = excluded."reference", "updated_at" = excluded."updated_at"
             "#,
         )
         .bind(transaction.id().to_string())
         .bind::<u32>(transaction.status().into())
         .bind(transaction.reference())
+        .bind(transaction.created_at().timestamp())
+        .bind(transaction.updated_at().timestamp())
         .execute(&mut *self.inner)
         .await
         .map_err(|e| Error::Storage(e.to_string()))?;
@@ -141,7 +141,7 @@ impl<'a> storage::Batch<'a> for Batch<'a> {
         for payment in transaction.spent().iter() {
             sqlx::query(
                 r#"
-            INSERT INTO "transaction_payments"("transaction_id", "payment_transaction_id", "payment_position_id")
+            INSERT INTO "transaction_input_payments"("transaction_id", "payment_transaction_id", "payment_position_id")
             VALUES(?, ?, ?)
             ON CONFLICT("transaction_id", "payment_transaction_id", "payment_position_id")
                 DO NOTHING
@@ -157,4 +157,25 @@ impl<'a> storage::Batch<'a> for Batch<'a> {
 
         Ok(())
     }
+
+    async fn relate_account_to_transaction(
+        &mut self,
+        transaction_id: &TransactionId,
+        account: &AccountId,
+    ) -> Result<(), Error> {
+        sqlx::query(
+            r#"
+            INSERT INTO "transaction_accounts"("transaction_id", "account_id")
+            VALUES(?, ?)
+            ON CONFLICT("transaction_id", "account_id")
+                DO NOTHING
+            "#,
+        )
+        .bind(transaction_id.to_string())
+        .bind(account.to_string())
+        .execute(&mut *self.inner)
+        .await
+        .map_err(|e| Error::Storage(e.to_string()))?;
+        Ok(())
+    }
 }

utxo/src/sqlite/mod.rs

@@ -2,6 +2,7 @@ use crate::{
     amount::AmountCents, asset::AssetId, storage::Error, transaction::from_db, AccountId, Amount,
     Asset, AssetManager, Payment, PaymentId, Status, Storage, TransactionId,
 };
+use chrono::NaiveDateTime;
 use futures::TryStreamExt;
 use sqlx::{sqlite::SqliteRow, Executor, Row};
 use std::{collections::HashMap, marker::PhantomData};
@@ -49,7 +50,12 @@ impl<'a> Sqlite<'a> {
                 "updated_at" DATETIME DEFAULT CURRENT_TIMESTAMP,
                 PRIMARY KEY ("transaction_id")
             );
-            CREATE TABLE IF NOT EXISTS "transaction_payments" (
+            CREATE TABLE IF NOT EXISTS "transaction_accounts" (
+                "transaction_id" VARCHAR(66) NOT NULL,
+                "account_id" VARCHAR(71) NOT NULL,
+                PRIMARY KEY("account_id", "transaction_id")
+            );
+            CREATE TABLE IF NOT EXISTS "transaction_input_payments" (
                 "transaction_id" VARCHAR(66) NOT NULL,
                 "payment_transaction_id" VARCHAR(66) NOT NULL,
                 "payment_position_id"  INTEGER NOT NULL,
@@ -292,7 +298,9 @@ impl<'a> Storage<'a, Batch<'a>> for Sqlite<'a> {
             r#"
             SELECT
                 "t"."status",
-                "t"."reference"
+                "t"."reference",
+                "t"."created_at",
+                "t"."updated_at"
             FROM
                 "transactions" "t"
             WHERE
@@ -317,10 +325,10 @@ impl<'a> Storage<'a, Batch<'a>> for Sqlite<'a> {
                 "p"."spent_by"
             FROM
                 "payments" "p"
-            INNER JOIN 
-                "transaction_payments" "tp" 
+            INNER JOIN
+                "transaction_input_payments" "tp"
                 ON (
-                    "tp"."payment_transaction_id" = "p"."transaction_id" 
+                    "tp"."payment_transaction_id" = "p"."transaction_id"
                     AND "tp"."payment_position_id" = "p"."position_id"
                 )
             WHERE
@@ -380,12 +388,24 @@ impl<'a> Storage<'a, Batch<'a>> for Sqlite<'a> {
             .try_get::<String, usize>(1)
             .map_err(|_| Error::Storage("Invalid reference".to_string()))?;
 
+        let created_at = transaction_row
+            .try_get::<NaiveDateTime, usize>(2)
+            .map_err(|e| Error::InvalidDate(e.to_string()))?
+            .and_utc();
+
+        let updated_at = transaction_row
+            .try_get::<NaiveDateTime, usize>(3)
+            .map_err(|e| Error::InvalidDate(e.to_string()))?
+            .and_utc();
+
         Ok(from_db::Transaction {
             id: transaction_id.clone(),
             spend,
             create,
             status,
             reference,
+            created_at,
+            updated_at,
         })
     }
 }

utxo/src/storage.rs

@@ -8,6 +8,9 @@ pub enum Error {
     #[error("Storage error: {0}")]
     Storage(String),
 
+    #[error("Invalid date format: {0}")]
+    InvalidDate(String),
+
     #[error("Spend payment: {0}")]
     SpendPayment(String),
 
@@ -24,6 +27,10 @@ pub enum Error {
 
 #[async_trait::async_trait]
 pub trait Batch<'a> {
+    async fn rollback(self) -> Result<(), Error>;
+
+    async fn commit(self) -> Result<(), Error>;
+
     async fn spend_payment(
         &mut self,
         payment_id: &PaymentId,
@@ -31,18 +38,20 @@ pub trait Batch<'a> {
         transaction_id: &TransactionId,
     ) -> Result<(), Error>;
 
-    async fn rollback(self) -> Result<(), Error>;
-
     async fn get_payment_status(
         &mut self,
         transaction_id: &TransactionId,
     ) -> Result<Option<Status>, Error>;
 
-    async fn commit(self) -> Result<(), Error>;
-
-    async fn store_new_payments(&mut self, outputs: &[Payment]) -> Result<(), Error>;
+    async fn store_new_payment(&mut self, payment: &Payment) -> Result<(), Error>;
 
     async fn store_transaction(&mut self, transaction: &Transaction) -> Result<(), Error>;
+
+    async fn relate_account_to_transaction(
+        &mut self,
+        transaction_id: &TransactionId,
+        account: &AccountId,
+    ) -> Result<(), Error>;
 }
 
 #[async_trait::async_trait]
@@ -50,21 +59,40 @@ pub trait Storage<'a, B>
 where
     B: Batch<'a>,
 {
+    /// Begins a transaction
+    ///
+    /// A transaction prepares the storage for a batch of operations, where all
+    /// the operations are persisted or none.
+    ///
+    /// The transaction is returned as a Batch object, which is used to perform
+    /// the changes in the transactions and payments.
+    ///
+    /// The batch has also a rollback
     async fn begin(&'a self) -> Result<B, Error>;
 
+    /// Returns a payment object by ID.
     async fn get_payment(&self, id: PaymentId) -> Result<Payment, Error>;
 
+    /// Similar to get_payment() but errors if the requested payment is not spendable.
     async fn get_unspent_payment(&self, id: PaymentId) -> Result<Payment, Error> {
         let payment = self.get_payment(id).await?;
-        if payment.spent_by.is_some() {
-            Err(Error::NotFound)
-        } else {
+        if payment.is_spendable() {
             Ok(payment)
+        } else {
+            Err(Error::NotFound)
         }
     }
 
+    /// Returns the balances for a given account
     async fn get_balance(&self, account: &AccountId) -> Result<Vec<Amount>, Error>;
 
+    /// Returns a list of unspent payments for a given account and asset.
+    ///
+    /// The payments are returned sorted by ascending amount, this bit is
+    /// important to make sure that all negative payment is always taken into
+    /// account. It will also improve the database by using many small payments
+    /// instead of a few large ones, which will make the database faster leaving
+    /// fewer unspent payments when checking for balances.
     async fn get_unspent_payments(
         &self,
         account: &AccountId,
@@ -72,6 +100,7 @@ where
         target_amount: AmountCents,
     ) -> Result<Vec<Payment>, Error>;
 
+    /// Returns a transaction object by id
     async fn get_transaction(
         &self,
         transaction_id: &TransactionId,

utxo/src/transaction/error.rs

@@ -1,4 +1,4 @@
-use crate::{amount::AmountCents, storage, Asset, Status, TransactionId};
+use crate::{storage, Amount, Asset, Status, TransactionId};
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -8,10 +8,8 @@ pub enum Error {
     #[error("Payment {0} is in the incorrect status {1}")]
     InvalidPaymentStatus(usize, Status),
 
-    #[error(
-        "Payment {0} is not a valid amount. Spending {1} and issuing {2}. Both amounts must match"
-    )]
-    InvalidAmount(Asset, AmountCents, AmountCents),
+    #[error("Spending {0:?} and issuing {1:?}. Both amounts must match")]
+    InvalidAmount(Amount, Amount),
 
     #[error("Missing input payment for asset {0}")]
     MissingSpendingAsset(Asset),

utxo/src/transaction/from_db.rs

@@ -1,4 +1,5 @@
 use crate::{Payment, Status, TransactionId};
+use chrono::{DateTime, Utc};
 
 pub struct Transaction {
     pub id: TransactionId,
@@ -6,4 +7,6 @@ pub struct Transaction {
     pub create: Vec<Payment>,
     pub reference: String,
     pub status: Status,
+    pub created_at: DateTime<Utc>, 
+    pub updated_at: DateTime<Utc>, 
 }

utxo/src/transaction/transaction.rs → utxo/src/transaction/inner.rs

@@ -2,6 +2,7 @@ use crate::{
     amount::AmountCents, transaction::*, AccountId, Amount, Asset, Batch, Payment, PaymentId,
     Status, Storage, TransactionId,
 };
+use chrono::{DateTime, Utc};
 use sha2::{Digest, Sha256};
 use std::collections::HashMap;
 
@@ -41,6 +42,8 @@ pub struct Transaction {
     create: Vec<Payment>,
     status: Status,
     is_external_deposit: bool,
+    created_at: DateTime<Utc>,
+    updated_at: DateTime<Utc>,
 }
 
 impl Transaction {
@@ -78,6 +81,8 @@ impl Transaction {
             reference,
             is_external_deposit: true,
             status,
+            created_at: Utc::now(),
+            updated_at: Utc::now(),
         })
     }
 
@@ -96,10 +101,7 @@ impl Transaction {
         )?;
 
         for (i, input) in spend.iter().enumerate() {
-            if input.spent_by.is_some() && input.spent_by.as_ref() != Some(&id) {
-                return Err(Error::SpentPayment(i));
-            }
-            if input.spent_by.is_none() && input.status != Status::Settled {
+            if input.spent_by.as_ref() != Some(&id) && !input.is_spendable() {
                 return Err(Error::InvalidPaymentStatus(i, input.status.clone()));
             }
         }
@@ -133,6 +135,8 @@ impl Transaction {
             create,
             is_external_deposit: false,
             status,
+            created_at: Utc::now(),
+            updated_at: Utc::now(),
         })
     }
 
@@ -235,7 +239,10 @@ impl Transaction {
         for (asset, credit_amount) in credit.into_iter() {
             if let Some(debit_amount) = debit.remove(&asset) {
                 if debit_amount != credit_amount {
-                    return Err(Error::InvalidAmount(asset, debit_amount, credit_amount));
+                    return Err(Error::InvalidAmount(
+                        asset.new_amount(debit_amount),
+                        asset.new_amount(credit_amount),
+                    ));
                 }
             } else {
                 return Err(Error::MissingSpendingAsset(asset));
@@ -269,6 +276,14 @@ impl Transaction {
         &self.reference
     }
 
+    pub fn created_at(&self) -> DateTime<Utc> {
+        self.created_at
+    }
+
+    pub fn updated_at(&self) -> DateTime<Utc> {
+        self.updated_at
+    }
+
     pub async fn persist<'a, B, S>(&mut self, storage: &'a S) -> Result<(), Error>
     where
         B: Batch<'a>,
@@ -281,12 +296,21 @@ impl Transaction {
             }
         }
         self.validate()?;
+        self.updated_at = Utc::now();
         batch.store_transaction(self).await?;
-        batch.store_new_payments(&self.create).await?;
+        for payment in self.create.iter() {
+            batch.store_new_payment(payment).await?;
+            batch
+                .relate_account_to_transaction(&self.id, &payment.to)
+                .await?;
+        }
         for input in self.spend.iter_mut() {
             batch
                 .spend_payment(&input.id, self.status.clone(), &self.id)
                 .await?;
+            batch
+                .relate_account_to_transaction(&self.id, &input.to)
+                .await?;
         }
         batch.commit().await?;
         Ok(())
@@ -304,6 +328,8 @@ impl TryFrom<from_db::Transaction> for Transaction {
             create: value.create,
             reference: value.reference,
             status: value.status,
+            created_at: value.created_at,
+            updated_at: value.updated_at,
         };
         tx.validate()?;
         Ok(tx)

utxo/src/transaction/mod.rs

@@ -1,5 +1,5 @@
 mod error;
 pub mod from_db;
-mod transaction;
+mod inner;
 
-pub use self::{error::Error, transaction::Transaction};
+pub use self::{error::Error, inner::Transaction};