Merge branch 'sentry-tls' into sentry-dummy-adapter-deposits

Author: elpiel

Cargo.lock

@@ -65,6 +65,11 @@ ENV KEYSTORE_PWD=
 # Only applicable if you use the `--adapter dummy`
 ENV DUMMY_IDENTITY=
 
+# To setup TLS supply both `PRIVATE_KEYS` & `CERTIFICATES`
+# Otherwise you will get an error
+ENV PRIVATE_KEYS=
+ENV CERTIFICATES=
+
 # If set it will override the configuration file used
 ENV CONFIG=
 
@@ -85,4 +90,6 @@ ENTRYPOINT ["./scripts/entrypoint.sh"]
 CMD sentry -a ${ADAPTER:-ethereum} \
             ${KEYSTORE_FILE:+-k $KEYSTORE_FILE} \
             ${DUMMY_IDENTITY:+-i $DUMMY_IDENTITY} \
+            ${PRIVATE_KEYS:+--privateKeys $PRIVATE_KEYS} \
+            ${CERTIFICATES:+--certificates $CERTIFICATES} \
             ${CONFIG}

Dockerfile-sentry

@@ -57,7 +57,13 @@ cargo run -p sentry -- --help
 
 Starting the Sentry API in will always run migrations, this will make sure the database is always up to date with the latest migrations, before starting and exposing the web server.
 
-By default, we use the `development` environment ( [`ENV` environment variable](#environment-variables) ) as it will also seed the database.
+By default, we use the `development` environment ( [`ENV` environment variable](#environment-variables) ) ~~as it will also seed the database~~ (seeding is disabled, see #514).
+
+To enable TLS for the sentry server you need to pass both `--privateKeys` and
+`--certificates` cli options (paths to `.pem` files) otherwise the cli will
+exit with an error.
+
+For full list of available addresses see [primitives/src/test_util.rs#L39-L118](./primitives/src/test_util.rs#L39-L118)
 
 #### Using the `Ethereum` adapter
 
@@ -100,7 +106,7 @@ POSTGRES_DB="sentry_follower" PORT=8006 KEYSTORE_PWD=ganache1 cargo run -p sentr
 IP_ADDR=127.0.0.1 REDIS_URL="redis://127.0.0.1:6379/1" \
 POSTGRES_DB="sentry_leader" PORT=8005 cargo run -p sentry -- \
     --adapter dummy \
-    --dummyIdentity 80690751969B234697e9059e04ed72195c3507fa \
+    --dummyIdentity 0x80690751969B234697e9059e04ed72195c3507fa \
     ./docs/config/prod.toml
 ```
 ##### Follower (`0xf3f583AEC5f7C030722Fe992A5688557e1B86ef7`)
@@ -109,19 +115,18 @@ POSTGRES_DB="sentry_leader" PORT=8005 cargo run -p sentry -- \
 IP_ADDR=127.0.0.1 REDIS_URL="redis://127.0.0.1:6379/2" \
 POSTGRES_DB="sentry_follower" PORT=8006 cargo run -p sentry -- \
     --adapter dummy \
-    --dummyIdentity f3f583AEC5f7C030722Fe992A5688557e1B86ef7 \
+    --dummyIdentity 0xf3f583AEC5f7C030722Fe992A5688557e1B86ef7 \
     ./docs/config/prod.toml
 ```
 
-For full list, check out [primitives/src/util/tests/prep_db.rs#L29-L43](./primitives/src/util/tests/prep_db.rs#L29-L43)
-
 #### Environment variables
 
 - `ENV` - `production` or `development`; *default*: `development` - passing this env. variable will use the default configuration paths - [`docs/config/dev.toml`](./docs/config/dev.toml) (for `development`) or [`docs/config/prod.toml`](./docs/config/prod.toml) (for `production`). Otherwise you can pass your own configuration file path to the binary (check `cargo run -p sentry --help` for more information). In `development` it will make sure Sentry to seed the database.
 - `PORT` - *default*: `8005` - The local port that Sentry API will be accessible at
 - `IP_ADDR` - *default*: `0.0.0.0` - the IP address that the API should be listening to
 
 ##### Adapter
+
 - `KEYSTORE_PWD` - Password for the `Keystore file`, only available when using `Ethereum` adapter (`--adapter ethereum`)
 
 ##### Redis

README.md

@@ -36,7 +36,7 @@ const IPFS_GATEWAY: &str = "https://ipfs.moonicorn.network/ipfs/";
 /// Related: <https://github.com/AdExNetwork/adex-adview-manager/issues/17>, <https://github.com/AdExNetwork/adex-adview-manager/issues/35>, <https://github.com/AdExNetwork/adex-adview-manager/issues/46>
 ///
 /// Used for JS [setTimeout](https://developer.mozilla.org/en-US/docs/Web/API/setTimeout) function
-const WAIT_FOR_IMPRESSION: u32 = 8000;
+pub const WAIT_FOR_IMPRESSION: u32 = 8000;
 // The number of impressions (won auctions) kept in history
 const HISTORY_LIMIT: u32 = 50;
 

adview-manager/src/lib.rs

@@ -10,6 +10,7 @@ use chrono::{
 use serde::{Deserialize, Serialize};
 use serde_with::with_prefix;
 
+#[doc(inline)]
 pub use {
     campaign_id::CampaignId,
     pricing::{Pricing, PricingBounds},

primitives/src/campaign.rs

@@ -1,4 +1,4 @@
-use std::{error::Error, fmt, ops::Deref, str::FromStr};
+use std::{fmt, ops::Deref, str::FromStr};
 
 use ethereum_types::U256;
 
@@ -7,7 +7,7 @@ use serde_hex::{SerHex, StrictPfx};
 
 use hex::{FromHex, FromHexError};
 
-use crate::{chain::Chain, config::TokenInfo, Address, Validator, ValidatorId};
+use crate::{Address, Validator, ValidatorId};
 
 #[derive(Serialize, Deserialize, PartialEq, Eq, Copy, Clone, Hash)]
 #[serde(transparent)]
@@ -90,12 +90,6 @@ impl FromStr for ChannelId {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct ChainContext {
-    pub token: TokenInfo,
-    pub chain: Chain,
-}
-
 #[derive(Serialize, Deserialize, Debug, Copy, Clone, PartialEq, Eq, Hash)]
 #[serde(rename_all = "camelCase")]
 pub struct Channel {
@@ -198,46 +192,6 @@ impl Serialize for Nonce {
     }
 }
 
-#[derive(Debug, PartialEq, Eq)]
-pub enum ChannelError {
-    InvalidArgument(String),
-    /// When the Adapter address is not listed in the `channel.spec.validators`
-    /// which in terms means, that the adapter shouldn't handle this Channel
-    AdapterNotIncluded,
-    /// when `channel.valid_until` has passed (< now), the channel should be handled
-    InvalidValidUntil(String),
-    UnlistedValidator,
-    UnlistedCreator,
-    UnlistedAsset,
-    MinimumValidatorFeeNotMet,
-    FeeConstraintViolated,
-}
-
-impl fmt::Display for ChannelError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            ChannelError::InvalidArgument(error) => write!(f, "{}", error),
-            ChannelError::AdapterNotIncluded => write!(f, "channel is not validated by us"),
-            ChannelError::InvalidValidUntil(error) => write!(f, "{}", error),
-            ChannelError::UnlistedValidator => write!(f, "validators are not in the whitelist"),
-            ChannelError::UnlistedCreator => write!(f, "channel.creator is not whitelisted"),
-            ChannelError::UnlistedAsset => write!(f, "channel.depositAsset is not whitelisted"),
-            ChannelError::MinimumValidatorFeeNotMet => {
-                write!(f, "channel validator fee is less than MINIMAL_FEE")
-            }
-            ChannelError::FeeConstraintViolated => {
-                write!(f, "total fees <= deposit: fee constraint violated")
-            }
-        }
-    }
-}
-
-impl Error for ChannelError {
-    fn cause(&self) -> Option<&dyn Error> {
-        None
-    }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;

primitives/src/channel.rs

@@ -5,6 +5,7 @@
 #![allow(unstable_name_collisions)]
 use std::{error, fmt};
 
+#[doc(inline)]
 pub use self::{
     ad_slot::AdSlot,
     ad_unit::AdUnit,
@@ -167,6 +168,7 @@ mod deposit {
 }
 
 pub mod util {
+    #[doc(inline)]
     pub use api::ApiUrl;
 
     pub mod api;

primitives/src/lib.rs

@@ -4,6 +4,7 @@ pub use eval::*;
 use serde_json::Number;
 use std::collections::HashMap;
 
+#[doc(inline)]
 pub use input::{field::GetField, Input};
 
 mod eval;

primitives/src/targeting.rs

@@ -129,6 +129,9 @@ pub static DUMMY_AUTH: Lazy<HashMap<Address, String>> = Lazy::new(|| {
     auth.insert(*ADVERTISER, "AUTH_awesomeAdvertiser".into());
     auth.insert(*PUBLISHER, "AUTH_awesomePublisher".into());
     auth.insert(*GUARDIAN_2, "AUTH_awesomeGuardian2".into());
+    auth.insert(*PUBLISHER_2, "AUTH_awesomePublisher2".into());
+    auth.insert(*ADVERTISER_2, "AUTH_awesomeAdvertiser2".into());
+    auth.insert(*LEADER_2, "AUTH_awesomeLeader2".into());
 
     auth
 });

primitives/src/test_util.rs

@@ -9,6 +9,7 @@ use crate::{
     Address, DomainError, ToETHChecksum, ToHex, UnifiedNum,
 };
 
+#[doc(inline)]
 pub use messages::*;
 
 #[derive(Serialize, Deserialize, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]