WIP

Signed-off-by: Alexis Asseman <[email protected]>
graphprotocol · Oct 4, 2023 · d1d2dee · d1d2dee
1 parent 66802fe
commit d1d2dee
Show file tree

Hide file tree

Showing 25 changed files with 592 additions and 785 deletions.
diff --git a/.sqlx/query-17c73722e03764f1bd30f11d6918c0e4df41a5504a3acc779d82fcdf7fdd4e79.json b/.sqlx/query-17c73722e03764f1bd30f11d6918c0e4df41a5504a3acc779d82fcdf7fdd4e79.json
diff --git a/.sqlx/query-1ae5d2aa752bf2e9038455d7c643bba03daa9e26c7ad23f48f9959a120e28a84.json b/.sqlx/query-1ae5d2aa752bf2e9038455d7c643bba03daa9e26c7ad23f48f9959a120e28a84.json
diff --git a/.sqlx/query-58c4216b3ce62314fa727e0f3c504bd64ca10a64a95e4eb8bd7bb822c1625ed6.json b/.sqlx/query-58c4216b3ce62314fa727e0f3c504bd64ca10a64a95e4eb8bd7bb822c1625ed6.json
diff --git a/.sqlx/query-7a3adab989a9552349dea7dbd52bcbdb40e034ee610c786a2111c493939e7e94.json b/.sqlx/query-7a3adab989a9552349dea7dbd52bcbdb40e034ee610c786a2111c493939e7e94.json
diff --git a/.sqlx/query-88901c4779fdd2c4653a2f0544a5685daaed836ef4c927afd8ae7e2804d4a9fd.json b/.sqlx/query-88901c4779fdd2c4653a2f0544a5685daaed836ef4c927afd8ae7e2804d4a9fd.json
diff --git a/.sqlx/query-a3b0fb77cb7760254342dac981bc2f9c19f96fb5748629ebf0498d3820179d97.json b/.sqlx/query-a3b0fb77cb7760254342dac981bc2f9c19f96fb5748629ebf0498d3820179d97.json
diff --git a/.sqlx/query-b3726609aaf6bbeb8a08cbcc10f3226c8a792538eed5ae1397f5515ef43f52af.json b/.sqlx/query-b3726609aaf6bbeb8a08cbcc10f3226c8a792538eed5ae1397f5515ef43f52af.json
diff --git a/.sqlx/query-c4014f5e68d5a00d47138828d941d3afe596556e730b48fb31edfaf14096d3dd.json b/.sqlx/query-c4014f5e68d5a00d47138828d941d3afe596556e730b48fb31edfaf14096d3dd.json
diff --git a/...db4b71a9db2096f6b2c9716c9116280b6352.json → ...547296e663a7ff6ae1b689af3d628609abf2.json b/...db4b71a9db2096f6b2c9716c9116280b6352.json → ...547296e663a7ff6ae1b689af3d628609abf2.json
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common/src/escrow_monitor.rs b/common/src/escrow_monitor.rs
@@ -3,7 +3,7 @@
 
 use alloy_primitives::Address;
 use anyhow::Result;
-use ethereum_types::U256;
+use ethers::types::U256;
 use log::{error, info};
 use serde::Deserialize;
 use std::collections::HashMap;
@@ -170,7 +170,12 @@ impl EscrowMonitor {
     }
 
     pub async fn get_account_balance(&self, address: &Address) -> Option<U256> {
-        self.inner.sender_accounts.read().await.get(address).copied()
+        self.inner
+            .sender_accounts
+            .read()
+            .await
+            .get(address)
+            .copied()
     }
 
     /// Returns true if the given address has a non-zero balance in the escrow contract.

diff --git a/migrations/20230912220523_tap_receipts.up.sql b/migrations/20230912220523_tap_receipts.up.sql
@@ -2,6 +2,7 @@ CREATE TABLE IF NOT EXISTS scalar_tap_receipts (
     id BIGSERIAL PRIMARY KEY,
     allocation_id CHAR(40) NOT NULL,
     timestamp_ns NUMERIC(20) NOT NULL,
+    signature CHAR(130) NOT NULL,
     receipt JSON NOT NULL
 );
 

diff --git a/migrations/20230915230734_tap_ravs.up.sql b/migrations/20230915230734_tap_ravs.up.sql
@@ -1,5 +1,6 @@
-CREATE TABLE IF NOT EXISTS scalar_tap_ravs (
-    allocation_id CHAR(40) PRIMARY KEY,
-    timestamp_ns NUMERIC(20) NOT NULL,
-    rav JSON NOT NULL
+CREATE TABLE IF NOT EXISTS scalar_tap_latest_ravs (
+    allocation_id CHAR(40) NOT NULL,
+    sender_address CHAR(40) NOT NULL,
+    rav JSON NOT NULL,
+    PRIMARY KEY (allocation_id, sender_address)
 );
diff --git a/service/src/query_processor.rs b/service/src/query_processor.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use ethers_core::types::{Signature, U256};
-use log::error;
+
 use serde::{Deserialize, Serialize};
 use tap_core::tap_manager::SignedReceipt;
 

diff --git a/service/src/tap_manager.rs b/service/src/tap_manager.rs
@@ -71,14 +71,15 @@ impl TapManager {
         // TODO: consider doing this in another async task to avoid slowing down the paid query flow.
         sqlx::query!(
             r#"
-                INSERT INTO scalar_tap_receipts (allocation_id, timestamp_ns, receipt)
-                VALUES ($1, $2, $3)
+                INSERT INTO scalar_tap_receipts (allocation_id, timestamp_ns, signature, receipt)
+                VALUES ($1, $2, $3, $4)
             "#,
             format!("{:?}", allocation_id)
                 .strip_prefix("0x")
                 .unwrap()
                 .to_owned(),
             BigDecimal::from(receipt.message.timestamp_ns),
+            receipt.signature.to_string(),
             serde_json::to_value(receipt).map_err(|e| QueryError::Other(anyhow::Error::from(e)))?
         )
         .execute(&self.pgpool)
@@ -152,8 +153,7 @@ mod test {
         .unwrap()
     }
 
-    #[ignore]
-    #[sqlx::test]
+    #[sqlx::test(migrations = "../migrations")]
     async fn test_verify_and_store_receipt(pgpool: PgPool) {
         // Listen to pg_notify events
         let mut listener = PgListener::connect_with(&pgpool).await.unwrap();