Merge pull request #264 from AdExNetwork/dev

fast-forward master to dev

Author: Ivo Georgiev

Dockerfile

@@ -38,8 +38,8 @@ RUN apt update && apt-get install -y libssl-dev
 
 COPY --from=builder /usr/local/bin/validator_worker .
 
-ENTRYPOINT validator_worker -a ${ADAPTER:-ethereum} \
+CMD validator_worker -a ${ADAPTER:-ethereum} \
             ${KEYSTORE_FILE:+-k $KEYSTORE_FILE} \
             ${DUMMY_IDENTITY:+-i $DUMMY_IDENTITY} \
             ${SINGLE_TICK:+-t} \
-            ${SENTRY_URL:+-u $SENTRY_URL} ${CONFIG}
+            ${SENTRY_URL:+-u $SENTRY_URL} ${CONFIG}

README.md

@@ -45,6 +45,11 @@ you need to be running those in order to run the automated tests:
 
 TODO
 
+### Bug
+
+
+
+
 ### Run Validator Worker
 
 TODO

adapter/src/ethereum.rs

@@ -594,7 +594,10 @@ mod test {
         token_contract
             .call(
                 "setBalanceTo",
-                (Token::Address(leader_account), Token::Uint(2000.into())),
+                (
+                    Token::Address(leader_account),
+                    Token::Uint(U256::from(2000 as u64)),
+                ),
                 leader_account,
                 Options::default(),
             )
@@ -645,6 +648,7 @@ mod test {
                 nonce: None,
                 withdraw_period_start: Utc::now() + Duration::days(1),
                 ad_units: vec![],
+                pricing_bounds: None,
             },
         };
 

docs/config/prod.toml

@@ -2,9 +2,9 @@
 max_channels = 512
 
 channels_find_limit = 512
-wait_time = 500
+wait_time = 40000
 
-aggr_throttle = 5000
+aggr_throttle = 40000
 events_find_limit = 100
 msgs_find_limit = 10
 
@@ -17,7 +17,7 @@ list_timeout = 10000
 fetch_timeout = 10000
 validator_tick_timeout = 10000
 
-ip_rate_limit = { type = 'ip', timeframe = 20000 }
+ip_rate_limit = { type = 'ip', timeframe = 1200000 }
 sid_rate_limit = { type = 'sid', timeframe = 0 }
 ethereum_core_address = '0x333420fc6a897356e69b62417cd17ff012177d2b'
 ethereum_network = 'http://localhost:8545'
@@ -26,5 +26,5 @@ ethereum_adapter_relayer = 'https://relayer.adex.network'
 creators_whitelist = []
 minimal_deposit = "0"
 minimal_fee = "0"
-token_address_whitelist = ['0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359']
+token_address_whitelist = ['0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359', '0x6B175474E89094C44Da98b954EedeAC495271d0F']
 validators_whitelist = []

primitives/src/analytics.rs

@@ -1,30 +1,42 @@
+use crate::ChannelId;
 use crate::DomainError;
 use serde::{Deserialize, Serialize};
 
 pub const ANALYTICS_QUERY_LIMIT: u32 = 200;
 
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AnalyticsData {
+    pub time: f64,
+    pub value: String,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub channel_id: Option<ChannelId>,
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 pub struct AnalyticsResponse {
-    time: u32,
-    value: String,
+    pub aggr: Vec<AnalyticsData>,
+    pub limit: u32,
 }
 
 #[cfg(feature = "postgres")]
 pub mod postgres {
-    use super::AnalyticsResponse;
+    use super::AnalyticsData;
     use tokio_postgres::Row;
 
-    impl From<&Row> for AnalyticsResponse {
+    impl From<&Row> for AnalyticsData {
         fn from(row: &Row) -> Self {
             Self {
                 time: row.get("time"),
                 value: row.get("value"),
+                channel_id: row.try_get("channel_id").ok(),
             }
         }
     }
 }
 
 #[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
 pub struct AnalyticsQuery {
     #[serde(default = "default_limit")]
     pub limit: u32,
@@ -34,6 +46,7 @@ pub struct AnalyticsQuery {
     pub metric: String,
     #[serde(default = "default_timeframe")]
     pub timeframe: String,
+    pub segment_by_channel: Option<String>,
 }
 
 impl AnalyticsQuery {

primitives/src/big_num.rs

@@ -10,7 +10,19 @@ use num_derive::{Num, NumOps, One, Zero};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
 #[derive(
-    Serialize, Deserialize, Debug, Clone, PartialEq, Eq, PartialOrd, Ord, NumOps, One, Zero, Num,
+    Serialize,
+    Deserialize,
+    Debug,
+    Clone,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    NumOps,
+    One,
+    Zero,
+    Num,
+    Default,
 )]
 pub struct BigNum(
     #[serde(

primitives/src/channel.rs

@@ -63,6 +63,19 @@ pub struct Channel {
     pub spec: ChannelSpec,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct Pricing {
+    pub max: BigNum,
+    pub min: BigNum,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(rename_all = "UPPERCASE")]
+pub struct PricingBounds {
+    pub impression: Option<Pricing>,
+    pub click: Option<Pricing>,
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct ChannelSpec {
@@ -73,6 +86,8 @@ pub struct ChannelSpec {
     pub max_per_impression: BigNum,
     /// Minimum payment offered per impression
     pub min_per_impression: BigNum,
+    // Event pricing bounds
+    pub pricing_bounds: Option<PricingBounds>,
     /// An array of TargetingTag (optional)
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub targeting: Vec<TargetingTag>,
@@ -270,6 +285,12 @@ pub mod postgres {
         accepts!(TEXT, VARCHAR);
     }
 
+    impl From<&Row> for ChannelId {
+        fn from(row: &Row) -> Self {
+            row.get("id")
+        }
+    }
+
     impl ToSql for ChannelId {
         fn to_sql(
             &self,