More endpoints and a test

client.js

@@ -0,0 +1,63 @@
+
+const addr1 = "foo";
+const addr2 = "bar";
+const fee = "fee";
+const percentage = 0.01;
+
+async function deposit(account, amount, asset) {
+	const response = (await fetch("http://127.0.0.1:8080/deposit", {
+		method: "POST",
+		headers: {
+			"Content-Type": "application/json",
+		},
+		body: JSON.stringify({
+			memo: "deposit",
+			account,
+			amount: amount.toString(),
+			status: 'settled',
+			asset,
+		})
+	}));
+	return response.json();
+}
+
+async function trade(amount, asset, from, to) {
+	const response = (await fetch("http://127.0.0.1:8080/tx", {
+		method: "POST",
+		headers: {
+			"Content-Type": "application/json",
+		},
+		body: JSON.stringify({
+			memo: "trade",
+			debit: [
+				{
+					account: from,
+					amount: amount.toString(),
+					asset,
+				}
+			],
+			credit: [
+				{
+					account: to,
+					amount: (amount * (1 - percentage)).toString(),
+					asset,
+				},
+				{
+					account: fee,
+					amount: (amount * percentage).toString(),
+					asset,
+				}
+			],
+			status: 'settled',
+			asset,
+		})
+	}));
+	return response.json();
+}
+
+async function test() {
+	console.log(await deposit(addr1, 100, "BTC"));
+	console.log(await trade(10, "BTC", addr1, addr2))
+}
+
+test()

src/main.rs

@@ -1,12 +1,10 @@
-use std::sync::Arc;
-
 use actix_web::{
     error::InternalError, get, middleware::Logger, post, web, App, HttpResponse, HttpServer,
     Responder,
 };
 use ledger_utxo::{AccountId, AnyId, AssetDefinition, AssetManager, Status, TransactionId};
 use serde::{Deserialize, Serialize};
-use serde_json::json;
+use std::sync::Arc;
 
 #[derive(Deserialize)]
 pub struct Movement {

utxo/src/amount.rs

@@ -4,7 +4,7 @@ use serde::{Serialize, Serializer};
 /// The raw storage for cents, the more the better
 pub type AmountCents = i128;
 
-#[derive(Clone, Debug, Eq, PartialEq, thiserror::Error)]
+#[derive(Clone, Debug, Eq, PartialEq, thiserror::Error, Serialize)]
 pub enum Error {
     #[error("{0} is not a valid number")]
     NoANumber(String),

utxo/src/error.rs

@@ -1,7 +1,7 @@
 use crate::{amount, asset::AssetId, storage, transaction, AccountId};
-use serde::{Serialize, Serializer};
+use serde::Serialize;
 
-#[derive(thiserror::Error, Debug)]
+#[derive(thiserror::Error, Debug, Serialize)]
 pub enum Error {
     #[error("Transaction: {0}")]
     Transaction(#[from] transaction::Error),
@@ -21,13 +21,3 @@ pub enum Error {
     #[error("Invalid amount: {0}")]
     InvalidAmount(#[from] amount::Error),
 }
-
-impl Serialize for Error {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let serialized = self.to_string();
-        serializer.serialize_str(&serialized)
-    }
-}

utxo/src/sqlite/mod.rs

@@ -37,7 +37,7 @@ impl<'a> Sqlite<'a> {
                 "transaction_id" VARCHAR(66) NOT NULL,
                 "position_id" INTEGER NOT NULL,
                 "asset_id" TEXT NOT NULL,
-                "cents" TEXT NOT NULL,
+                "cents" BIG INTEGER NOT NULL,
                 "status" INTEGER NOT NULL,
                 "to" VARCHAR(71) NOT NULL,
                 "spent_by" TEXT,
@@ -97,10 +97,9 @@ impl<'a> Sqlite<'a> {
         };
 
         let cents = row
-            .try_get::<String, usize>(3)
+            .try_get::<i64, usize>(3)
             .map_err(|_| Error::Storage("Invalid cents".to_string()))?
-            .parse::<i128>()
-            .map_err(|_| Error::Storage("Invalid cents".to_string()))?;
+            .into();
 
         Ok(Payment {
             id,
@@ -191,11 +190,12 @@ impl<'a> Storage<'a, Batch<'a>> for Sqlite<'a> {
             r#"
             SELECT
                 "asset_id",
-                "cents"
+                SUM("cents") as "cents"
             FROM
                 "payments"
             WHERE
                 "to" = ? AND "spent_by" IS NULL AND status = ? 
+            GROUP BY "asset_id"
             "#,
         )
         .bind(account.to_string())
@@ -220,10 +220,9 @@ impl<'a> Storage<'a, Batch<'a>> for Sqlite<'a> {
                 .map_err(|e| Error::Storage(e.to_string()))?;
 
             let cents = row
-                .try_get::<String, usize>(1)
+                .try_get::<i64, usize>(1)
                 .map_err(|_| Error::Storage("Invalid cents".to_string()))?
-                .parse::<i128>()
-                .map_err(|_| Error::Storage("Invalid cents".to_string()))?;
+                .into();
 
             let new_amount = asset.new_amount(cents);
 

utxo/src/storage.rs

@@ -4,8 +4,9 @@ use crate::{
     transaction::{from_db, Type},
     AccountId, Amount, Payment, PaymentId, Status, Transaction, TransactionId,
 };
+use serde::Serialize;
 
-#[derive(thiserror::Error, Debug)]
+#[derive(thiserror::Error, Debug, Serialize)]
 pub enum Error {
     #[error("Storage error: {0}")]
     Storage(String),

utxo/src/transaction/error.rs

@@ -1,6 +1,9 @@
+use std::fmt::Display;
+
 use crate::{storage, Amount, Asset, Status, TransactionId};
+use serde::{Serialize, Serializer};
 
-#[derive(thiserror::Error, Debug)]
+#[derive(thiserror::Error, Debug, Serialize)]
 pub enum Error {
     #[error("Payment {0} is already spent")]
     SpentPayment(usize),
@@ -30,6 +33,7 @@ pub enum Error {
     Storage(#[from] storage::Error),
 
     #[error("Internal error at serializing: {0}")]
+    #[serde(serialize_with = "serialize_to_string")]
     Internal(#[from] Box<bincode::ErrorKind>),
 
     #[error("Invalid calculated id {0} (expected {1})")]
@@ -38,3 +42,11 @@ pub enum Error {
     #[error("Overflow")]
     Overflow,
 }
+
+fn serialize_to_string<S, T>(value: &T, serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+    T: ToString + Display,
+{
+    serializer.serialize_str(&value.to_string())
+}