fix: expose dips price on config file

Author: mangas

crates/config/maximal-config-example.toml

@@ -159,3 +159,9 @@ max_receipts_per_request = 10000
 host = "0.0.0.0"
 port = "7601"
 allowed_payers = ["0x3333333333333333333333333333333333333333"]
+
+price_per_entity = 1000
+
+[dips.price_per_epoch]
+mainnet = 100
+hardhat = 100

crates/config/minimal-config-example.toml

@@ -63,4 +63,3 @@ receipts_verifier_address = "0x2222222222222222222222222222222222222222"
 # Key-Value of all senders and their aggregator endpoints
 0xdeadbeefcafebabedeadbeefcafebabedeadbeef = "https://example.com/aggregate-receipts"
 0x0123456789abcdef0123456789abcdef01234567 = "https://other.example.com/aggregate-receipts"
-

crates/config/src/config.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use std::{
-    collections::{HashMap, HashSet},
+    collections::{BTreeMap, HashMap, HashSet},
     env,
     net::{Ipv4Addr, SocketAddr, SocketAddrV4},
     path::PathBuf,
@@ -396,6 +396,9 @@ pub struct DipsConfig {
     pub host: String,
     pub port: String,
     pub allowed_payers: Vec<Address>,
+
+    pub price_per_entity: u64,
+    pub price_per_epoch: BTreeMap<String, u64>,
 }
 
 impl Default for DipsConfig {
@@ -404,6 +407,8 @@ impl Default for DipsConfig {
             host: "0.0.0.0".to_string(),
             port: "7601".to_string(),
             allowed_payers: vec![],
+            price_per_entity: 100,
+            price_per_epoch: BTreeMap::new(),
         }
     }
 }
@@ -437,7 +442,12 @@ pub struct RavRequestConfig {
 
 #[cfg(test)]
 mod tests {
-    use std::{collections::HashSet, env, fs, path::PathBuf, str::FromStr};
+    use std::{
+        collections::{BTreeMap, HashMap, HashSet},
+        env, fs,
+        path::PathBuf,
+        str::FromStr,
+    };
 
     use figment::value::Uncased;
     use sealed_test::prelude::*;
@@ -470,6 +480,11 @@ mod tests {
             allowed_payers: vec![Address(
                 FixedBytes::<20>::from_str("0x3333333333333333333333333333333333333333").unwrap(),
             )],
+            price_per_entity: 1000,
+            price_per_epoch: BTreeMap::from_iter(vec![
+                ("mainnet".to_string(), 100),
+                ("hardhat".to_string(), 100),
+            ]),
             ..Default::default()
         });
 

crates/dips/src/price.rs

@@ -1,19 +1,26 @@
 // Copyright 2023-, Edge & Node, GraphOps, and Semiotic Labs.
 // SPDX-License-Identifier: Apache-2.0
 
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 
 #[derive(Debug, Default)]
 pub struct PriceCalculator {
-    base_price_per_epoch: HashMap<String, u64>,
+    base_price_per_epoch: BTreeMap<String, u64>,
     price_per_entity: u64,
 }
 
 impl PriceCalculator {
+    pub fn new(base_price_per_epoch: BTreeMap<String, u64>, price_per_entity: u64) -> Self {
+        Self {
+            base_price_per_epoch,
+            price_per_entity,
+        }
+    }
+
     #[cfg(test)]
     pub fn for_testing() -> Self {
         Self {
-            base_price_per_epoch: HashMap::from_iter(vec![("mainnet".to_string(), 200)]),
+            base_price_per_epoch: BTreeMap::from_iter(vec![("mainnet".to_string(), 200)]),
             price_per_entity: 100,
         }
     }

crates/service/src/service.rs

@@ -130,6 +130,8 @@ pub async fn run() -> anyhow::Result<()> {
             host,
             port,
             allowed_payers,
+            price_per_entity,
+            price_per_epoch,
         } = dips;
 
         let addr = format!("{}:{}", host, port)
@@ -156,7 +158,7 @@ pub async fn run() -> anyhow::Result<()> {
                 pool: database.clone(),
             }),
             ipfs_fetcher,
-            price_calculator: PriceCalculator::default(),
+            price_calculator: PriceCalculator::new(price_per_epoch.clone(), *price_per_entity),
             signer_validator: Arc::new(EscrowSignerValidator::new(watcher)),
             registry: Arc::new(registry),
         };