Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix solver competition reading #3171

Merged
merged 2 commits into from
Dec 19, 2024
Merged

Fix solver competition reading #3171

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c61909c
Fix solver competition reading
sunce86 Dec 18, 2024
6f7af07
Merge branch 'main' into fix-solver-competition-endpoint
sunce86 Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 61 additions & 4 deletions crates/database/src/solver_competition.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,14 @@ pub async fn load_by_id(
id: AuctionId,
) -> Result<Option<LoadCompetition>, sqlx::Error> {
const QUERY: &str = r#"
SELECT sc.json, sc.id, COALESCE(ARRAY_AGG(s.tx_hash) FILTER (WHERE s.tx_hash IS NOT NULL), '{}') AS tx_hashes
SELECT sc.json, sc.id, COALESCE(ARRAY_AGG(s.tx_hash) FILTER (WHERE so.block_number IS NOT NULL), '{}') AS tx_hashes
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Return transaction hash only if settlement_observation entry exists.

FROM solver_competitions sc
-- outer joins because the data might not have been indexed yet
LEFT OUTER JOIN settlements s ON sc.id = s.auction_id
-- exclude settlements from another environment for which observation is guaranteed to not exist
LEFT OUTER JOIN settlement_observations so
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LEFT OUTER JOIN makes sure there is no change in logic whether solver competition entry is returned or not

ON s.block_number = so.block_number
AND s.log_index = so.log_index
WHERE sc.id = $1
GROUP BY sc.id
;"#;
Expand All @@ -52,10 +56,14 @@ pub async fn load_latest_competition(
ex: &mut PgConnection,
) -> Result<Option<LoadCompetition>, sqlx::Error> {
const QUERY: &str = r#"
SELECT sc.json, sc.id, COALESCE(ARRAY_AGG(s.tx_hash) FILTER (WHERE s.tx_hash IS NOT NULL), '{}') AS tx_hashes
SELECT sc.json, sc.id, COALESCE(ARRAY_AGG(s.tx_hash) FILTER (WHERE so.block_number IS NOT NULL), '{}') AS tx_hashes
FROM solver_competitions sc
-- outer joins because the data might not have been indexed yet
LEFT OUTER JOIN settlements s ON sc.id = s.auction_id
-- exclude settlements from another environment for which observation is guaranteed to not exist
LEFT OUTER JOIN settlement_observations so
ON s.block_number = so.block_number
AND s.log_index = so.log_index
GROUP BY sc.id
ORDER BY sc.id DESC
LIMIT 1
Expand All @@ -72,11 +80,17 @@ WITH competition AS (
SELECT sc.id
FROM solver_competitions sc
JOIN settlements s ON sc.id = s.auction_id
JOIN settlement_observations so
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JOIN because we don't want to return solver competition entry for a transaction that was settled in different environment.

ON s.block_number = so.block_number
AND s.log_index = so.log_index
WHERE s.tx_hash = $1
)
SELECT sc.json, sc.id, COALESCE(ARRAY_AGG(s.tx_hash) FILTER (WHERE s.tx_hash IS NOT NULL), '{}') AS tx_hashes
SELECT sc.json, sc.id, COALESCE(ARRAY_AGG(s.tx_hash) FILTER (WHERE so.block_number IS NOT NULL), '{}') AS tx_hashes
FROM solver_competitions sc
JOIN settlements s ON sc.id = s.auction_id
JOIN settlement_observations so
ON s.block_number = so.block_number
AND s.log_index = so.log_index
WHERE sc.id = (SELECT id FROM competition)
GROUP BY sc.id
;"#;
Expand Down Expand Up @@ -336,7 +350,9 @@ mod tests {
// non-existent auction returns none
assert!(load_by_id(&mut db, 1).await.unwrap().is_none());

// insert two settlement events for the same auction id
// insert three settlement events for the same auction id, with one of them not
// having observation (in practice usually meaning it's from different
// environment)
crate::events::insert_settlement(
&mut db,
&EventIndex {
Expand All @@ -350,6 +366,16 @@ mod tests {
)
.await
.unwrap();
crate::settlement_observations::upsert(
&mut db,
crate::settlement_observations::Observation {
block_number: 0,
log_index: 0,
..Default::default()
},
)
.await
.unwrap();
crate::events::insert_settlement(
&mut db,
&EventIndex {
Expand All @@ -363,12 +389,38 @@ mod tests {
)
.await
.unwrap();
crate::settlement_observations::upsert(
&mut db,
crate::settlement_observations::Observation {
block_number: 0,
log_index: 1,
..Default::default()
},
)
.await
.unwrap();
crate::events::insert_settlement(
&mut db,
&EventIndex {
block_number: 0,
log_index: 2,
},
&Settlement {
solver: Default::default(),
transaction_hash: ByteArray([2u8; 32]),
},
)
.await
.unwrap();
crate::settlements::update_settlement_auction(&mut db, 0, 0, 0)
.await
.unwrap();
crate::settlements::update_settlement_auction(&mut db, 0, 1, 0)
.await
.unwrap();
crate::settlements::update_settlement_auction(&mut db, 0, 2, 0)
.await
.unwrap();

// load by id works, and finds two hashes
let value_ = load_by_id(&mut db, 0).await.unwrap().unwrap();
Expand All @@ -389,6 +441,11 @@ mod tests {
.unwrap()
.unwrap();
assert!(value_.tx_hashes.len() == 2);
// this one should not find any hashes since it's from another environment
let value_ = load_by_tx_hash(&mut db, &ByteArray([2u8; 32]))
.await
.unwrap();
assert!(value_.is_none());
}

#[tokio::test]
Expand Down
Loading