Skip to content

fix: use collection_id for database queries instead of allocation_id #835

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

Merged
merged 2 commits into from
Sep 11, 2025
Merged

fix: use collection_id for database queries instead of allocation_id #835

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d577471
fix: use collection_id for database queries instead of allocation_id
tmigone Sep 11, 2025
c0c0109
ci: make cargo fmt happy
tmigone Sep 11, 2025
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
13 changes: 8 additions & 5 deletions crates/tap-agent/src/agent/sender_allocation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ use tap_core::{
},
signed_message::Eip712SignedMessage,
};
use thegraph_core::alloy::{hex::ToHexExt, primitives::Address, sol_types::Eip712Domain};
use thegraph_core::{
alloy::{hex::ToHexExt, primitives::Address, sol_types::Eip712Domain},
CollectionId,
};
use thiserror::Error;
use tokio::sync::watch::Receiver;

Expand Down Expand Up @@ -1263,7 +1266,7 @@ impl DatabaseInteractions for SenderAllocationState<Horizon> {
"#,
BigDecimal::from(min_timestamp),
BigDecimal::from(max_timestamp),
self.allocation_id.to_string(),
CollectionId::from(self.allocation_id).encode_hex(),
self.indexer_address.encode_hex(),
&signers,
)
Expand All @@ -1288,7 +1291,7 @@ impl DatabaseInteractions for SenderAllocationState<Horizon> {
collection_id = $1
AND signer_address IN (SELECT unnest($2::text[]))
"#,
self.allocation_id.to_string(),
CollectionId::from(self.allocation_id).encode_hex(),
&signers
)
.fetch_one(&self.pgpool)
Expand Down Expand Up @@ -1337,7 +1340,7 @@ impl DatabaseInteractions for SenderAllocationState<Horizon> {
AND signer_address IN (SELECT unnest($4::text[]))
AND timestamp_ns > $5
"#,
self.allocation_id.to_string(),
CollectionId::from(self.allocation_id).encode_hex(),
self.indexer_address.encode_hex(),
last_id,
&signers,
Expand Down Expand Up @@ -1388,7 +1391,7 @@ impl DatabaseInteractions for SenderAllocationState<Horizon> {
AND payer = $2
AND service_provider = $3
"#,
self.allocation_id.to_string(),
CollectionId::from(self.allocation_id).encode_hex(),
self.sender.encode_hex(),
self.indexer_address.encode_hex(),
)
Expand Down
Loading