Skip to content

Commit d3a9f05

Browse files
authored
Merge branch 'main' into filipe/dips-ipfs-checks
2 parents ef4c587 + db93587 commit d3a9f05

10 files changed

+390
-45
lines changed

.sqlx/query-5ee76e76f4ace2dbab69fd58eaf7f0539d2ffab1289130555dba0f6fdc3065ff.json

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.sqlx/query-f02805d423945f35b93dde58db49872832048b338237c786727a6c9173e23b38.json

Lines changed: 66 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/config/src/config.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -382,9 +382,6 @@ pub struct TapConfig {
382382
pub sender_timeout_secs: Duration,
383383

384384
pub sender_aggregator_endpoints: HashMap<Address, Url>,
385-
/// Set of sender addresses that will not be added to the denylist
386-
#[serde(default)]
387-
pub trusted_senders: Vec<Address>,
388385
}
389386

390387
#[derive(Debug, Deserialize)]

crates/tap-agent/src/agent/sender_account.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,6 @@ pub struct SenderAccountConfig {
329329
pub max_amount_willing_to_lose_grt: u128,
330330
/// What value triggers a new Rav request
331331
pub trigger_value: u128,
332-
/// Set of sender addresses that will not be added to the denylist
333-
pub trusted_senders: HashSet<Address>,
334332

335333
// allocation config
336334
/// Timeout config for rav requests
@@ -357,7 +355,6 @@ impl SenderAccountConfig {
357355
escrow_polling_interval: config.subgraphs.escrow.config.syncing_interval_secs,
358356
max_amount_willing_to_lose_grt: config.tap.max_amount_willing_to_lose_grt.get_value(),
359357
trigger_value: config.tap.get_trigger_value(),
360-
trusted_senders: config.tap.trusted_senders.iter().copied().collect(),
361358
rav_request_timeout: config.tap.rav_request.request_timeout_secs,
362359
tap_sender_timeout: config.tap.sender_timeout_secs,
363360
}
@@ -552,17 +549,6 @@ impl State {
552549

553550
/// Will update [`State::denied`], as well as the denylist table in the database.
554551
async fn add_to_denylist(&mut self) {
555-
if self.config.trusted_senders.contains(&self.sender) {
556-
tracing::warn!(
557-
fee_tracker = self.sender_fee_tracker.get_total_fee(),
558-
rav_tracker = self.rav_tracker.get_total_fee(),
559-
max_amount_willing_to_lose = self.config.max_amount_willing_to_lose_grt,
560-
sender_balance = self.sender_balance.to_u128(),
561-
"Trusted sender would be denied."
562-
);
563-
return;
564-
}
565-
566552
tracing::warn!(
567553
fee_tracker = self.sender_fee_tracker.get_total_fee(),
568554
rav_tracker = self.rav_tracker.get_total_fee(),

crates/tap-agent/src/tap/context.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ pub trait NetworkVersion: Send + Sync + 'static {
7070
///
7171
/// A simple `struct Legacy;` would be able to instantiate and pass as
7272
/// value, while having size 1.
73+
#[derive(Debug)]
7374
pub enum Legacy {}
7475
/// 0-sized marker for horizon network
7576
///
@@ -79,6 +80,7 @@ pub enum Legacy {}
7980
///
8081
/// A simple `struct Legacy;` would be able to instantiate and pass as
8182
/// value, while having size 1.
83+
#[derive(Debug)]
8284
pub enum Horizon {}
8385

8486
impl NetworkVersion for Legacy {

0 commit comments

Comments
 (0)