Handle optional binaries with transaction request

db/migrations/004_transactions_binaries.sql

@@ -0,0 +1 @@
+ALTER TABLE transactions ADD COLUMN binaries BYTEA[]

src/db.rs

@@ -263,6 +263,7 @@
         value: U256,
         gas_limit: U256,
         priority: TransactionPriority,
+        binaries: Option<Vec<Vec<u8>>>,
         relayer_id: &str,
     ) -> eyre::Result<()> {
         let mut tx = self.pool.begin().await?;
@@ -288,8 +289,8 @@
 
         sqlx::query(
             r#"
-            INSERT INTO transactions (id, tx_to, data, value, gas_limit, priority, relayer_id, nonce)
-            VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
+            INSERT INTO transactions (id, tx_to, data, value, gas_limit, priority, relayer_id, nonce, binaries)
+            VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
         "#,
         )
         .bind(tx_id)
@@ -300,7 +301,8 @@
         .bind(priority)
         .bind(relayer_id)
         .bind(nonce)
+        .bind(binaries.map(|b| b))
         .execute(tx.as_mut())
         .await?;
 
         tx.commit().await?;
@@ -312,7 +314,7 @@
     pub async fn get_unsent_txs(&self) -> eyre::Result<Vec<UnsentTx>> {
         Ok(sqlx::query_as(
             r#"
-            SELECT     r.id as relayer_id, t.id, t.tx_to, t.data, t.value, t.gas_limit, t.priority, t.nonce, r.key_id, r.chain_id
+            SELECT     r.id as relayer_id, t.id, t.tx_to, t.data, t.value, t.gas_limit, t.priority, t.nonce, t.binaries, r.key_id, r.chain_id
             FROM       transactions t
             LEFT JOIN  sent_transactions s ON (t.id = s.tx_id)
             INNER JOIN relayers r ON (t.relayer_id = r.id)
@@ -763,7 +765,7 @@
         Ok(sqlx::query_as(
             r#"
             SELECT r.id as relayer_id, t.id, t.tx_to, t.data, t.value, t.gas_limit, t.nonce,
-                   r.key_id, r.chain_id,
+                   t.binaries, r.key_id, r.chain_id,
                    s.initial_max_fee_per_gas, s.initial_max_priority_fee_per_gas, s.escalation_count
             FROM   transactions t
             JOIN   sent_transactions s ON t.id = s.tx_id
@@ -847,7 +849,7 @@
         Ok(sqlx::query_as(
             r#"
             SELECT t.id as tx_id, t.tx_to as to, t.data, t.value, t.gas_limit, t.nonce,
-                   h.tx_hash, s.status
+                   t.binaries, h.tx_hash, s.status
             FROM transactions t
             LEFT JOIN sent_transactions s ON t.id = s.tx_id
             LEFT JOIN tx_hashes h ON s.valid_tx_hash = h.tx_hash
@@ -873,7 +875,7 @@
         Ok(sqlx::query_as(
             r#"
             SELECT t.id as tx_id, t.tx_to as to, t.data, t.value, t.gas_limit, t.nonce,
-                   h.tx_hash, s.status
+                   t. binaries, h.tx_hash, s.status
             FROM transactions t
             LEFT JOIN sent_transactions s ON t.id = s.tx_id
             LEFT JOIN tx_hashes h ON s.valid_tx_hash = h.tx_hash
@@ -1405,12 +1407,13 @@
         let value = U256::from(0);
         let gas_limit = U256::from(0);
         let priority = TransactionPriority::Regular;
+        let binaries = None;
 
         let tx = db.read_tx(tx_id).await?;
         assert!(tx.is_none(), "Tx has not been sent yet");
 
         db.create_transaction(
-            tx_id, to, data, value, gas_limit, priority, relayer_id,
+            tx_id, to, data, value, gas_limit, priority, binaries, relayer_id,
         )
         .await?;
 
@@ -1423,6 +1426,7 @@
         assert_eq!(tx.gas_limit.0, gas_limit);
         assert_eq!(tx.nonce, 0);
         assert_eq!(tx.tx_hash, None);
+        assert_eq!(tx.binaries, None);
 
         let unsent_txs = db.read_txs(relayer_id, None).await?;
         assert_eq!(unsent_txs.len(), 1, "1 unsent tx");

src/db/data.rs

@@ -19,6 +19,7 @@ pub struct UnsentTx {
     pub priority: TransactionPriority,
     #[sqlx(try_from = "i64")]
     pub nonce: u64,
+    pub binaries: Option<Vec<Vec<u8>>>,
     pub key_id: String,
     #[sqlx(try_from = "i64")]
     pub chain_id: u64,
@@ -34,6 +35,7 @@ pub struct TxForEscalation {
     pub gas_limit: U256Wrapper,
     #[sqlx(try_from = "i64")]
     pub nonce: u64,
+    pub binaries: Option<Vec<Vec<u8>>>,
     pub key_id: String,
     #[sqlx(try_from = "i64")]
     pub chain_id: u64,
@@ -52,6 +54,7 @@ pub struct ReadTxData {
     pub gas_limit: U256Wrapper,
     #[sqlx(try_from = "i64")]
     pub nonce: u64,
+    pub binaries: Option<Vec<Vec<u8>>>,
 
     // Sent tx data
     pub tx_hash: Option<H256Wrapper>,

src/serde_utils.rs

@@ -1 +1,2 @@
+pub mod base64_binary;
 pub mod decimal_u256;

src/serde_utils/base64_binary.rs

@@ -0,0 +1,47 @@
+use base64::engine::general_purpose;
+use base64::Engine as _;
+use serde::Deserialize;
+
+pub fn serialize<S>(
+    binaries: &Option<Vec<Vec<u8>>>,
+    serializer: S,
+) -> Result<S::Ok, S::Error>
+where
+    S: serde::Serializer,
+{
+    match binaries {
+        Some(binaries) => {
+            let base64_vec: Vec<String> = binaries
+                .iter()
+                .map(|binary| general_purpose::STANDARD.encode(binary))
+                .collect();
+
+            serializer.serialize_some(&base64_vec)
+        }
+        None => serializer.serialize_none(),
+    }
+}
+
+pub fn deserialize<'de, D>(
+    deserializer: D,
+) -> Result<Option<Vec<Vec<u8>>>, D::Error>
+where
+    D: serde::Deserializer<'de>,
+{
+    let base64_strings: Option<Vec<String>> =
+        Option::deserialize(deserializer)?;
+
+    match base64_strings {
+        Some(base64_vec) => {
+            let decoded_vec: Vec<Vec<u8>> = base64_vec
+                .into_iter()
+                .map(|base64_str| {
+                    general_purpose::STANDARD.decode(base64_str).unwrap()
+                })
+                .collect();
+
+            Ok(Some(decoded_vec))
+        }
+        None => Ok(None),
+    }
+}

src/server/routes/transaction.rs

@@ -25,6 +25,8 @@ pub struct SendTxRequest {
     pub priority: TransactionPriority,
     #[serde(default)]
     pub tx_id: Option<String>,
+    #[serde(default, with = "crate::serde_utils::base64_binary")]
+    pub binaries: Option<Vec<Vec<u8>>>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -116,6 +118,7 @@ pub async fn send_tx(
             req.value,
             req.gas_limit,
             req.priority,
+            req.binaries,
             api_token.relayer_id(),
         )
         .await?;

tests/send_too_many_txs.rs

@@ -59,6 +59,7 @@ async fn send_too_many_txs() -> eyre::Result<()> {
                     gas_limit: U256::from(21_000),
                     priority: TransactionPriority::Regular,
                     tx_id: None,
+                    binaries: None,
                 },
             )
             .await?;
@@ -75,6 +76,7 @@ async fn send_too_many_txs() -> eyre::Result<()> {
                 gas_limit: U256::from(21_000),
                 priority: TransactionPriority::Regular,
                 tx_id: None,
+                binaries: None,
             },
         )
         .await;
@@ -102,6 +104,7 @@ async fn send_too_many_txs() -> eyre::Result<()> {
                 gas_limit: U256::from(21_000),
                 priority: TransactionPriority::Regular,
                 tx_id: None,
+                binaries: None,
             },
         )
         .await?;