Merge branch 'dev' of https://github.com/AdExNetwork/adex-validator-stack-rust into dev

Author: samparsky

Cargo.lock

@@ -669,15 +669,17 @@ mod test {
             deposit_asset: eth_checksum::checksum(&format!("{:?}", token_contract.address())),
             deposit_amount: 2_000.into(),
             valid_until: Utc::now() + Duration::days(2),
+            targeting_rules: vec![],
             spec: ChannelSpec {
                 title: None,
                 validators: SpecValidators::new(leader_validator_desc, follower_validator_desc),
                 max_per_impression: 10.into(),
                 min_per_impression: 10.into(),
                 targeting: vec![],
+                targeting_rules: vec![],
                 min_targeting_score: None,
                 event_submission: Some(EventSubmission { allow: vec![] }),
-                created: Some(Utc::now()),
+                created: Utc::now(),
                 active_from: None,
                 nonce: None,
                 withdraw_period_start: Utc::now() + Duration::days(1),

adapter/src/ethereum.rs

@@ -225,12 +225,12 @@ mod test {
             .expect("The timestamp should be able to be converted to u64");
         BigEndian::write_uint(&mut timestamp_buf[26..], n, 6);
 
-        let merkle_tree = MerkleTree::new(&[timestamp_buf]);
+        let merkle_tree = MerkleTree::new(&[timestamp_buf]).expect("Should instantiate");
 
         let channel_id = "061d5e2a67d0a9a10f1c732bca12a676d83f79663a396f7d87b3e30b9b411088";
 
         let state_root = get_signable_state_root(
-            &hex::decode(&channel_id).expect("fialed"),
+            &hex::decode(&channel_id).expect("failed"),
             &merkle_tree.root(),
         )
         .expect("Should get state_root");

adapter/src/lib.rs

@@ -1,14 +1,12 @@
 [package]
-name = "adview-manager"
-version = "0.1.0"
 authors = ["Lachezar Lechev <lachezar@adex.network>"]
 edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+name = "adview-manager"
+version = "0.1.0"
 
 [dependencies]
 adex_primitives = {path = "../primitives", package = "primitives"}
-num-bigint = { version = "0.2", features = ["serde"] }
-serde =  {version = "^1.0", features = ['derive']}
+chrono = "0.4"
+num-bigint = {version = "0.3", features = ["serde"]}
+serde = {version = "^1.0", features = ['derive']}
 serde_json = "^1.0"
-chrono = "0.4"

adview-manager/Cargo.toml

@@ -20,12 +20,14 @@ slog = { version = "^2.5.2" , features = ["max_level_trace"] }
 slog-term = "^2.4.2"
 slog-async = "^2.3.0"
 # Domain
+thiserror = "^1.0"
 chrono = { version = "0.4", features = ["serde"] }
 time = "0.1.42"
 hex = "0.3.2"
 merkletree = "0.10.0"
 tiny-keccak = "1.5"
 rust-crypto = "0.2"
+url = { version = "2.1", features = ["serde"]}
 # Numbers - BigNum, Numbers, Traits and Derives
 num-bigint = { version = "0.2", features = ["serde"] }
 num = "0.2.0"

primitives/Cargo.toml

@@ -1,5 +1,4 @@
-use crate::{BigNum, TargetingTag, ValidatorId};
-use chrono::serde::{ts_milliseconds, ts_milliseconds_option};
+use crate::{targeting::Rule, BigNum, TargetingTag, ValidatorId};
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
@@ -22,16 +21,6 @@ pub struct AdSlot {
     /// see IAB ad unit guidelines and iab_flex_{adUnitName} (see IAB's new ad portfolio and PDF)
     #[serde(rename = "type")]
     pub ad_type: String,
-    /// A URL to the resource (usually PNG)
-    /// * must use the ipfs:// protocol, to guarantee data immutability
-    pub media_url: String,
-    /// MIME type of the media.
-    // Possible values at the moment are:
-    /// * image/jpeg
-    /// * image/png
-    pub media_mime: String,
-    /// Advertised URL
-    pub target_url: String,
     /// Array of TargetingTag
     #[serde(default)]
     pub targeting: Vec<TargetingTag>,
@@ -44,13 +33,15 @@ pub struct AdSlot {
     pub tags: Vec<TargetingTag>,
     #[serde(default)]
     pub auto_tags: Vec<TargetingTag>,
+    /// Targeting rules
+    #[serde(default)]
+    pub rules: Vec<Rule>,
     /// Valid ipfs hash for Ad Unit object. It will be used as fallback data (optional)
     #[serde(default)]
     pub fallback_unit: Option<String>,
     /// User address from the session
     pub owner: ValidatorId,
     /// UTC timestamp in milliseconds, used as nonce for escaping duplicated spec ipfs hashes
-    #[serde(with = "ts_milliseconds")]
     pub created: DateTime<Utc>,
     /// the name of the unit used in platform UI
     #[serde(default)]
@@ -64,6 +55,5 @@ pub struct AdSlot {
     #[serde(default)]
     pub archived: bool,
     /// UTC timestamp in milliseconds, changed every time modifiable property is changed
-    #[serde(default, with = "ts_milliseconds_option")]
     pub modified: Option<DateTime<Utc>>,
 }

primitives/src/ad_slot.rs

@@ -1,4 +1,3 @@
-use chrono::serde::{ts_milliseconds, ts_milliseconds_option};
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
@@ -36,7 +35,6 @@ pub struct AdUnit {
     /// user address from the session
     pub owner: ValidatorId,
     /// number, UTC timestamp in milliseconds, used as nonce for escaping duplicated spec ipfs hashes
-    #[serde(with = "ts_milliseconds")]
     pub created: DateTime<Utc>,
     /// the name of the unit used in platform UI
     pub title: Option<String>,
@@ -46,6 +44,5 @@ pub struct AdUnit {
     #[serde(default)]
     pub archived: bool,
     /// UTC timestamp in milliseconds, changed every time modifiable property is changed
-    #[serde(default, with = "ts_milliseconds_option")]
     pub modified: Option<DateTime<Utc>>,
 }

primitives/src/ad_unit.rs

@@ -32,6 +32,10 @@ impl BalancesMap {
         self.0.get(key)
     }
 
+    pub fn contains_key(&self, key: &ValidatorId) -> bool {
+        self.0.contains_key(key)
+    }
+
     pub fn entry(&mut self, key: ValidatorId) -> Entry<'_, ValidatorId, BigNum> {
         self.0.entry(key)
     }
@@ -40,6 +44,10 @@ impl BalancesMap {
         self.0.insert(key, value)
     }
 
+    pub fn len(&self) -> usize {
+        self.0.len()
+    }
+
     pub fn is_empty(&self) -> bool {
         self.0.is_empty()
     }

primitives/src/balances_map.rs

@@ -1,15 +1,16 @@
 use std::error::Error;
 use std::fmt;
+use std::ops::Deref;
 
 use chrono::serde::{ts_milliseconds, ts_milliseconds_option, ts_seconds};
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Deserializer, Serialize};
 use serde_hex::{SerHex, StrictPfx};
 
-use crate::big_num::BigNum;
-use crate::{AdUnit, EventSubmission, TargetingTag, ValidatorDesc, ValidatorId};
+use crate::{
+    targeting::Rule, AdUnit, BigNum, EventSubmission, TargetingTag, ValidatorDesc, ValidatorId,
+};
 use hex::{FromHex, FromHexError};
-use std::ops::Deref;
 
 #[derive(Serialize, Deserialize, PartialEq, Eq, Copy, Clone, Hash)]
 #[serde(transparent)]
@@ -84,6 +85,8 @@ pub struct Channel {
     pub deposit_amount: BigNum,
     #[serde(with = "ts_seconds")]
     pub valid_until: DateTime<Utc>,
+    #[serde(default)]
+    pub targeting_rules: Vec<Rule>,
     pub spec: ChannelSpec,
 }
 
@@ -116,6 +119,14 @@ impl PricingBounds {
 
         vec
     }
+
+    pub fn get(&self, event_type: &str) -> Option<&Pricing> {
+        match event_type {
+            "IMPRESSION" => self.impression.as_ref(),
+            "CLICK" => self.click.as_ref(),
+            _ => None,
+        }
+    }
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -141,14 +152,10 @@ pub struct ChannelSpec {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub event_submission: Option<EventSubmission>,
     /// A millisecond timestamp of when the campaign was created
-    #[serde(
-        default,
-        skip_serializing_if = "Option::is_none",
-        with = "ts_milliseconds_option"
-    )]
-    pub created: Option<DateTime<Utc>>,
+    #[serde(with = "ts_milliseconds")]
+    pub created: DateTime<Utc>,
     /// A millisecond timestamp representing the time you want this campaign to become active (optional)
-    /// Used by the AdViewManager
+    /// Used by the AdViewManager & Targeting AIP#31
     #[serde(
         default,
         skip_serializing_if = "Option::is_none",
@@ -167,6 +174,8 @@ pub struct ChannelSpec {
     /// An array of AdUnit (optional)
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub ad_units: Vec<AdUnit>,
+    #[serde(default)]
+    pub targeting_rules: Vec<Rule>,
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub price_multiplication_rules: Vec<PriceMultiplicationRules>,
     #[serde(default)]
@@ -335,6 +344,7 @@ impl Error for ChannelError {
 pub mod postgres {
     use super::ChannelId;
     use super::{Channel, ChannelSpec};
+    use crate::targeting::Rule;
     use bytes::BytesMut;
     use hex::FromHex;
     use postgres_types::{accepts, to_sql_checked, FromSql, IsNull, Json, ToSql, Type};
@@ -349,6 +359,7 @@ pub mod postgres {
                 deposit_asset: row.get("deposit_asset"),
                 deposit_amount: row.get("deposit_amount"),
                 valid_until: row.get("valid_until"),
+                targeting_rules: row.get::<_, Json<Vec<Rule>>>("targeting_rules").0,
                 spec: row.get::<_, Json<ChannelSpec>>("spec").0,
             }
         }

primitives/src/channel.rs

@@ -15,8 +15,10 @@ pub mod event_submission;
 pub mod market;
 pub mod merkle_tree;
 pub mod sentry;
+pub mod supermarket;
 pub mod targeting;
 pub mod targeting_tag;
+
 pub mod util {
     pub mod tests {
         pub mod prep_db;