Merge branch 'dev' into issue-260-preserve-original-error-message

Author: samparsky

adapter/src/ethereum.rs

@@ -856,6 +856,8 @@ mod test {
                 withdraw_period_start: Utc::now() + Duration::days(1),
                 ad_units: vec![],
                 pricing_bounds: None,
+                price_multiplication_rules: Default::default(),
+                price_dynamic_adjustment: false,
             },
         };
 

primitives/src/channel.rs

@@ -7,6 +7,7 @@ use serde::{Deserialize, Deserializer, Serialize};
 use serde_hex::{SerHex, StrictPfx};
 
 use crate::big_num::BigNum;
+use crate::sentry::Event;
 use crate::{AdUnit, EventSubmission, TargetingTag, ValidatorDesc, ValidatorId};
 use hex::{FromHex, FromHexError};
 use std::ops::Deref;
@@ -151,6 +152,26 @@ pub struct ChannelSpec {
     /// An array of AdUnit (optional)
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub ad_units: Vec<AdUnit>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub price_multiplication_rules: Vec<PriceMultiplicationRules>,
+    pub price_dynamic_adjustment: bool,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct PriceMultiplicationRules {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    multiplier: Option<f64>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    amount: Option<BigNum>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    ev_type: Option<Vec<Event>>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    publisher: Option<Vec<ValidatorId>>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    os_type: Option<Vec<String>>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    country: Option<Vec<String>>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]

primitives/src/util/tests/prep_db.rs

@@ -81,6 +81,8 @@ lazy_static! {
                 withdraw_period_start: Utc.timestamp_millis(4_073_414_400_000),
                 ad_units: vec![],
                 pricing_bounds: Some(PricingBounds {impression: None, click: Some(Pricing { max: 0.into(), min: 0.into()})}),
+                price_multiplication_rules: Default::default(),
+                price_dynamic_adjustment: false,
             },
         }
     };