fix: change price types

Author: mangas

crates/config/maximal-config-example.toml

@@ -160,11 +160,11 @@ host = "0.0.0.0"
 port = "7601"
 allowed_payers = ["0x3333333333333333333333333333333333333333"]
 
-price_per_entity = 1000
+price_per_entity = "1000"
 
 [dips.price_per_epoch]
-mainnet = 100
-hardhat = 100
+mainnet = "100"
+hardhat = "100"
 
 [dips.additional_networks]
 "eip155:1337" = "hardhat"

crates/config/src/config.rs

@@ -20,7 +20,10 @@ use regex::Regex;
 use serde::Deserialize;
 use serde_repr::Deserialize_repr;
 use serde_with::{serde_as, DurationSecondsWithFrac};
-use thegraph_core::{alloy::primitives::Address, DeploymentId};
+use thegraph_core::{
+    alloy::primitives::{Address, U256},
+    DeploymentId,
+};
 use url::Url;
 
 use crate::NonZeroGRT;
@@ -397,8 +400,8 @@ pub struct DipsConfig {
     pub port: String,
     pub allowed_payers: Vec<Address>,
 
-    pub price_per_entity: u64,
-    pub price_per_epoch: BTreeMap<String, u64>,
+    pub price_per_entity: U256,
+    pub price_per_epoch: BTreeMap<String, U256>,
     pub additional_networks: HashMap<String, String>,
 }
 
@@ -408,7 +411,7 @@ impl Default for DipsConfig {
             host: "0.0.0.0".to_string(),
             port: "7601".to_string(),
             allowed_payers: vec![],
-            price_per_entity: 100,
+            price_per_entity: U256::from(100),
             price_per_epoch: BTreeMap::new(),
             additional_networks: HashMap::new(),
         }
@@ -453,7 +456,7 @@ mod tests {
 
     use figment::value::Uncased;
     use sealed_test::prelude::*;
-    use thegraph_core::alloy::primitives::{address, Address, FixedBytes};
+    use thegraph_core::alloy::primitives::{address, Address, FixedBytes, U256};
     use tracing_test::traced_test;
 
     use super::{DatabaseConfig, SHARED_PREFIX};
@@ -482,10 +485,10 @@ mod tests {
             allowed_payers: vec![Address(
                 FixedBytes::<20>::from_str("0x3333333333333333333333333333333333333333").unwrap(),
             )],
-            price_per_entity: 1000,
+            price_per_entity: U256::from(1000),
             price_per_epoch: BTreeMap::from_iter(vec![
-                ("mainnet".to_string(), 100),
-                ("hardhat".to_string(), 100),
+                ("mainnet".to_string(), U256::from(100)),
+                ("hardhat".to_string(), U256::from(100)),
             ]),
             additional_networks: HashMap::from([(
                 "eip155:1337".to_string(),

crates/dips/src/lib.rs

@@ -149,11 +149,11 @@ pub enum DipsError {
     #[error("chainId {0} is not supported")]
     UnsupportedChainId(String),
     #[error("price per epoch is below configured price for chain {0}, minimum: {1}, offered: {2}")]
-    PricePerEpochTooLow(String, u64, String),
+    PricePerEpochTooLow(String, U256, String),
     #[error(
         "price per entity is below configured price for chain {0}, minimum: {1}, offered: {2}"
     )]
-    PricePerEntityTooLow(String, u64, String),
+    PricePerEntityTooLow(String, U256, String),
     // cancellation
     #[error("cancelled_by is expected to match the signer")]
     UnexpectedSigner,
@@ -816,12 +816,12 @@ mod test {
             )),
             Err(DipsError::PricePerEntityTooLow(
                 "mainnet".to_string(),
-                100,
+                U256::from(100),
                 "10".to_string(),
             )),
             Err(DipsError::PricePerEpochTooLow(
                 "mainnet".to_string(),
-                200,
+                U256::from(200),
                 "10".to_string(),
             )),
             Err(DipsError::SignerNotAuthorised(signer.address())),

crates/dips/src/price.rs

@@ -3,14 +3,16 @@
 
 use std::collections::BTreeMap;
 
+use thegraph_core::alloy::primitives::U256;
+
 #[derive(Debug, Default)]
 pub struct PriceCalculator {
-    base_price_per_epoch: BTreeMap<String, u64>,
-    price_per_entity: u64,
+    base_price_per_epoch: BTreeMap<String, U256>,
+    price_per_entity: U256,
 }
 
 impl PriceCalculator {
-    pub fn new(base_price_per_epoch: BTreeMap<String, u64>, price_per_entity: u64) -> Self {
+    pub fn new(base_price_per_epoch: BTreeMap<String, U256>, price_per_entity: U256) -> Self {
         Self {
             base_price_per_epoch,
             price_per_entity,
@@ -20,19 +22,22 @@ impl PriceCalculator {
     #[cfg(test)]
     pub fn for_testing() -> Self {
         Self {
-            base_price_per_epoch: BTreeMap::from_iter(vec![("mainnet".to_string(), 200)]),
-            price_per_entity: 100,
+            base_price_per_epoch: BTreeMap::from_iter(vec![(
+                "mainnet".to_string(),
+                U256::from(200),
+            )]),
+            price_per_entity: U256::from(100),
         }
     }
 
     pub fn is_supported(&self, chain_id: &str) -> bool {
         self.get_minimum_price(chain_id).is_some()
     }
-    pub fn get_minimum_price(&self, chain_id: &str) -> Option<u64> {
+    pub fn get_minimum_price(&self, chain_id: &str) -> Option<U256> {
         self.base_price_per_epoch.get(chain_id).copied()
     }
 
-    pub fn entity_price(&self) -> u64 {
+    pub fn entity_price(&self) -> U256 {
         self.price_per_entity
     }
 }