changes to all spenders for loop

Author: simzzz

sentry/src/db/spendable.rs

@@ -44,6 +44,22 @@ pub async fn fetch_spendable(
     Ok(row.map(Spendable::from))
 }
 
+static GET_ALL_SPENDERS_STATEMENT: &str = "SELECT spender, channel_id, channel, total, still_on_create2 FROM spendable WHERE channel_id = $1";
+
+// TODO: Include pagination
+pub async fn get_all_spendables_for_channel(
+    pool: DbPool,
+    channel_id: &ChannelId,
+) -> Result<Vec<Spendable>, PoolError> {
+    let client = pool.get().await?;
+    let statement = client.prepare(GET_ALL_SPENDERS_STATEMENT).await?;
+
+    let rows = client.query(&statement, &[channel_id]).await?;
+    let spendables: Vec<Spendable> = rows.into_iter().map(Spendable::from).collect();
+
+    Ok(spendables)
+}
+
 static UPDATE_SPENDABLE_STATEMENT: &str = "INSERT INTO spendable(spender, channel_id, channel, total, still_on_create2) VALUES($1, $2, $3, $4, $5) ON CONFLICT ON CONSTRAINT spendable_pkey DO UPDATE SET total = $4, still_on_create2 = $5 WHERE spendable.spender = $1 AND spendable.channel_id = $2 RETURNING spender, channel_id, channel, total, still_on_create2";
 
 // Updates spendable entry deposit or inserts a new spendable entry if it doesn't exist

sentry/src/routes/channel.rs

@@ -4,7 +4,7 @@ use crate::db::{
         latest_new_state_v5,
     },
     get_channel_by_id, insert_channel, insert_validator_messages, list_channels,
-    spendable::{fetch_spendable, update_spendable},
+    spendable::{fetch_spendable, get_all_spendables_for_channel, update_spendable},
     DbPool, PoolError,
 };
 use crate::{success_response, Application, Auth, ResponseError, RouteParams};
@@ -353,30 +353,32 @@ pub async fn get_all_spender_limits<A: Adapter + 'static>(
 
     let mut all_spender_limits: HashMap<Address, Spender> = HashMap::new();
 
+    let all_spendables = get_all_spendables_for_channel(app.pool.clone(), &channel.id()).await?;
+
     // Using for loop to avoid async closures
-    for (spender_addr, balance) in new_state.msg.balances.spenders.iter() {
-        let latest_spendable =
-            match fetch_spendable(app.pool.clone(), spender_addr, &channel.id()).await? {
-                Some(spendable) => spendable,
-                None => continue, // skipping spender if not found
-            };
-
-        let total_deposited = latest_spendable.deposit.total;
-        let total_spent = total_deposited.checked_sub(balance).ok_or_else(|| {
-            ResponseError::FailedValidation("Couldn't calculate total_spent".to_string())
-        })?;
-
-        let spender_leaf = SpenderLeaf {
-            total_spent,
-            // merkle_proof: [u8; 32], // TODO
+    for spendable in all_spendables {
+        let spender = spendable.spender;
+        let spender_leaf = if new_state.msg.balances.spenders.contains_key(&spender) {
+            let balance = new_state.msg.balances.spenders.get(&spender).unwrap();
+
+            Some(SpenderLeaf {
+                total_spent: spendable
+                    .deposit
+                    .total
+                    .checked_sub(balance)
+                    .unwrap_or_default(),
+                // merkle_proof: [u8; 32], // TODO
+            })
+        } else {
+            None
         };
 
         let spender_info = Spender {
-            total_deposited,
-            spender_leaf: Some(spender_leaf),
+            total_deposited: spendable.deposit.total,
+            spender_leaf,
         };
 
-        all_spender_limits.insert(*spender_addr, spender_info);
+        all_spender_limits.insert(spender, spender_info);
     }
 
     let res = AllSpendersResponse {