Render binary data as base64

Cargo.lock

@@ -526,6 +526,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
 
 [[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
 name = "base64ct"
 version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3261,6 +3267,7 @@ name = "verax"
 version = "0.1.0"
 dependencies = [
  "async-trait",
+ "base64 0.22.1",
  "bech32",
  "borsh",
  "chrono",

src/main.rs

@@ -13,6 +13,7 @@ pub trait Handler {
 mod balance;
 mod deposit;
 mod get;
+mod lock;
 mod subscribe;
 mod tx;
 mod update;
@@ -64,6 +65,7 @@ async fn main() -> std::io::Result<()> {
             .service(subscribe::handler)
             .service(deposit::handler)
             .service(balance::handler)
+            .service(lock::handler)
             .service(tx::handler)
             .service(update::handler)
             .service(get::handler)

src/update.rs

@@ -2,7 +2,7 @@ use crate::{Context, Handler};
 use actix_web::{post, web, HttpResponse, Responder};
 use serde::Deserialize;
 use serde_json::json;
-use verax::{RevId, Status, Tag};
+use verax::{RevId, Status, Tag, TokenPayload};
 
 #[derive(Deserialize)]
 pub struct UpdateOperation {
@@ -11,6 +11,7 @@ pub struct UpdateOperation {
     #[serde(default)]
     pub tags: Option<Vec<Tag>>,
     pub memo: String,
+    pub update_token: Option<TokenPayload>,
 }
 
 struct Update {

utxo/Cargo.toml

@@ -5,6 +5,7 @@ edition = "2021"
 
 [dependencies]
 async-trait = "0.1.73"
+base64 = "0.22.1"
 bech32 = "0.11.0"
 borsh = { version = "1.3.1", features = ["derive", "bytes", "de_strict_order"] }
 chrono = { version = "0.4.31", features = ["serde"] }

utxo/src/token.rs

@@ -74,11 +74,11 @@ impl TokenManager {
         let mut mac = HmacSha256::new_from_slice(&self.0).expect("HMAC can take key of any size");
         mac.update(&payload);
 
-        let signature = mac.finalize().into_bytes().into();
+        let signature = mac.finalize().into_bytes().to_vec();
 
         (
             // The token cannot be altered once it is commited, as the revision ID is the hash of
-            // the entire content, therefore it is safer to only HMAC the payload
+            // the entire content, therefore it is safer to only HMAC the
             Token {
                 expires_at: Utc::now() + duration,
                 owner,
@@ -100,7 +100,11 @@ pub struct Token {
         deserialize_with = "crate::from_ts_microseconds"
     )]
     expires_at: DateTime<Utc>,
-    signature: [u8; 32],
+    #[serde(
+        serialize_with = "crate::serialize_base64",
+        deserialize_with = "crate::deserialize_base64"
+    )]
+    signature: Vec<u8>,
     owner: String,
 }
 

utxo/src/transaction/mod.rs

@@ -5,8 +5,9 @@ use crate::{
     token::{TokenManager, TokenPayload},
     AccountId, Amount, FilterableValue, MaxLengthString, PaymentFrom, RevId, Status, TxId,
 };
+use base64::{engine::general_purpose, Engine as _};
 use chrono::{DateTime, Duration, TimeZone, Utc};
-use serde::{Deserialize, Serialize};
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::ops::Deref;
 
 mod base_tx;
@@ -19,6 +20,24 @@ pub use self::{base_tx::BaseTx, error::Error, revision::Revision, typ::Type};
 /// Tag definition
 pub type Tag = MaxLengthString<64>;
 
+pub(crate) fn serialize_base64<S>(bytes: &Vec<u8>, serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
+    let encoded = general_purpose::STANDARD_NO_PAD.encode(bytes);
+    serializer.serialize_str(&encoded)
+}
+
+pub(crate) fn deserialize_base64<'de, D>(deserializer: D) -> Result<Vec<u8>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let s = String::deserialize(deserializer)?;
+    general_purpose::STANDARD_NO_PAD
+        .decode(&s)
+        .map_err(serde::de::Error::custom)
+}
+
 pub(crate) fn to_ts_microseconds<W: std::io::Write>(
     dt: &DateTime<Utc>,
     writer: &mut W,