Market decentralized - database models

.cargo/config

@@ -1,2 +1,7 @@
 [build]
 rustflags = ["-C", "target-feature=+crt-static"]
+
+
+[cargo-new]
+name = "Golem Factory"
+email = "contact@golem.network"

core/market/decentralized/Cargo.toml

@@ -14,22 +14,32 @@ ya-persistence = "0.2"
 ya-service-api = "0.1"
 ya-service-bus = "0.2"
 ya-service-api-interfaces = "0.1"
+ya-service-api-web = "0.1"
 
 actix-web = "2.0"
 anyhow = "1.0"
 async-trait = "0.1"
 chrono = { version = "0.4", features = ["serde"] }
 derive_more = "0.99.5"
+diesel = { version = "1.4", features = ["chrono", "sqlite", "r2d2"] }
+diesel_migrations = "1.4"
+digest = "0.8.1"
 futures = "0.3"
 lazy_static = "1.4"
+libsqlite3-sys = { version = "0.9.1", features = ["bundled"] }
 log = "0.4"
+r2d2 = "0.8"
 serde = { version = "^1.0", features = ["derive"] }
+serde_json = "^1.0"
+sha3 = "0.8.2"
 thiserror = "1.0"
 tokio = { version = "0.2", features = ["time"] }
+uuid = { version = "0.8", features = ["v4"] }
 
 [dev-dependencies]
 actix-rt = "1.0.0"
 env_logger = "0.7"
+rand = "0.7.2"
 serde_json = "1.0"
 tokio = { version = "0.2", features = ["macros"] }
 

core/market/decentralized/migrations/2020-05-15-093513_init-db/down.sql

@@ -0,0 +1,4 @@
+-- This file should undo anything in `up.sql`
+
+DROP TABLE "market_offer";
+DROP TABLE "market_demand";

core/market/decentralized/migrations/2020-05-15-093513_init-db/up.sql

@@ -0,0 +1,23 @@
+-- Your SQL goes here
+
+CREATE TABLE market_offer (
+	id VARCHAR(97) NOT NULL PRIMARY KEY,
+	properties TEXT NOT NULL,
+	constraints TEXT NOT NULL,
+	node_id VARCHAR(20) NOT NULL,
+
+	creation_ts DATETIME NOT NULL,
+	insertion_ts DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	expiration_ts DATETIME NOT NULL
+);
+
+CREATE TABLE market_demand (
+	id VARCHAR(97) NOT NULL PRIMARY KEY,
+	properties TEXT NOT NULL,
+	constraints TEXT NOT NULL,
+	node_id VARCHAR(20) NOT NULL,
+
+	creation_ts DATETIME NOT NULL,
+	insertion_ts DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+	expiration_ts DATETIME NOT NULL
+);

core/market/decentralized/readme.md

@@ -0,0 +1,21 @@
+# Decentralized market Mk1
+
+## Running yagna with decentralized market
+
+You can enable decentralized market using cargo features.
+Run yagna daemon with flags:
+```
+cargo run --no-default-features --features market-decentralized service run
+```
+
+## Running decentralized market test suite
+
+To test market-test-suite run:
+```
+cargo test --workspace --features ya-market-decentralized/market-test-suite
+```
+or for market crate only
+```
+cargo test -p ya-market-decentralized --features ya-market-decentralized/market-test-suite
+```
+

core/market/decentralized/src/api.rs

@@ -0,0 +1,58 @@
+pub mod provider;
+pub mod requestor;
+pub mod response;
+
+use serde::{Deserialize, Serialize};
+
+pub const DEFAULT_EVENT_TIMEOUT: f32 = 0.0; // seconds
+pub const DEFAULT_QUERY_TIMEOUT: f32 = 12.0;
+
+#[derive(Deserialize)]
+pub struct PathAgreement {
+    pub agreement_id: String,
+}
+
+#[derive(Deserialize)]
+pub struct PathSubscription {
+    pub subscription_id: String,
+}
+
+#[derive(Deserialize)]
+pub struct PathSubscriptionProposal {
+    pub subscription_id: String,
+    pub proposal_id: String,
+}
+
+#[derive(Deserialize)]
+pub struct QueryTimeout {
+    #[serde(rename = "timeout", default = "default_query_timeout")]
+    pub timeout: Option<f32>,
+}
+
+#[derive(Deserialize)]
+pub struct QueryTimeoutCommandIndex {
+    #[serde(rename = "timeout")]
+    pub timeout: Option<f32>,
+    #[serde(rename = "commandIndex")]
+    pub command_index: Option<usize>,
+}
+
+#[derive(Deserialize, Debug)]
+pub struct QueryTimeoutMaxEvents {
+    /// number of milliseconds to wait
+    #[serde(rename = "timeout", default = "default_event_timeout")]
+    pub timeout: Option<f32>,
+    /// maximum count of events to return
+    #[serde(rename = "maxEvents", default)]
+    pub max_events: Option<i32>,
+}
+
+#[inline(always)]
+pub(crate) fn default_query_timeout() -> Option<f32> {
+    Some(DEFAULT_QUERY_TIMEOUT)
+}
+
+#[inline(always)]
+pub(crate) fn default_event_timeout() -> Option<f32> {
+    Some(DEFAULT_EVENT_TIMEOUT)
+}

core/market/decentralized/src/api/provider.rs

@@ -0,0 +1,138 @@
+use actix_web::web::{Data, Json, Path, Query};
+use actix_web::{HttpResponse, Scope};
+use std::sync::Arc;
+
+use super::response;
+use super::{
+    PathAgreement, PathSubscription, PathSubscriptionProposal, QueryTimeout, QueryTimeoutMaxEvents,
+};
+use crate::market::MarketService;
+
+use ya_client::model::market::{Agreement, AgreementProposal, Offer, Proposal};
+use ya_service_api_web::middleware::Identity;
+
+// This file contains market REST endpoints. Responsibility of these functions
+// is calling respective functions in market modules and mapping return values
+// to http responses. No market logic is allowed here.
+
+pub fn register_endpoints(scope: Scope) -> Scope {
+    scope
+        .service(subscribe)
+        .service(get_offers)
+        .service(unsubscribe)
+        .service(collect)
+        .service(counter_proposal)
+        .service(get_proposal)
+        .service(reject_proposal)
+        .service(approve_agreement)
+        .service(reject_agreement)
+        .service(terminate_agreement)
+        .service(get_agreement)
+}
+
+#[actix_web::post("/offers")]
+async fn subscribe(
+    market: Data<Arc<MarketService>>,
+    body: Json<Offer>,
+    id: Identity,
+) -> HttpResponse {
+    match market.subscribe_offer(body.into_inner(), id).await {
+        Ok(subscription_id) => response::created(subscription_id),
+        // TODO: Translate MarketError to better HTTP response.
+        Err(error) => response::server_error(&format!("{}", error)),
+    }
+}
+
+#[actix_web::get("/offers")]
+async fn get_offers(market: Data<Arc<MarketService>>, id: Identity) -> HttpResponse {
+    response::not_implemented()
+}
+
+#[actix_web::delete("/offers/{subscription_id}")]
+async fn unsubscribe(
+    market: Data<Arc<MarketService>>,
+    path: Path<PathSubscription>,
+    id: Identity,
+) -> HttpResponse {
+    let subscription_id = path.into_inner().subscription_id;
+    match market.unsubscribe_offer(subscription_id.clone(), id).await {
+        Ok(()) => response::ok(subscription_id),
+        // TODO: Translate MatcherError to better HTTP response.
+        Err(error) => response::server_error(&format!("{}", error)),
+    }
+}
+
+#[actix_web::get("/offers/{subscription_id}/events")]
+async fn collect(
+    market: Data<Arc<MarketService>>,
+    path: Path<PathSubscription>,
+    query: Query<QueryTimeoutMaxEvents>,
+    id: Identity,
+) -> HttpResponse {
+    response::not_implemented()
+}
+
+#[actix_web::post("/offers/{subscription_id}/proposals/{proposal_id}")]
+async fn counter_proposal(
+    market: Data<Arc<MarketService>>,
+    path: Path<PathSubscriptionProposal>,
+    body: Json<Proposal>,
+    id: Identity,
+) -> HttpResponse {
+    response::not_implemented()
+}
+
+#[actix_web::get("/offers/{subscription_id}/proposals/{proposal_id}")]
+async fn get_proposal(
+    market: Data<Arc<MarketService>>,
+    path: Path<PathSubscriptionProposal>,
+    id: Identity,
+) -> HttpResponse {
+    response::not_implemented()
+}
+
+#[actix_web::delete("/offers/{subscription_id}/proposals/{proposal_id}")]
+async fn reject_proposal(
+    market: Data<Arc<MarketService>>,
+    path: Path<PathSubscriptionProposal>,
+    id: Identity,
+) -> HttpResponse {
+    response::not_implemented()
+}
+
+#[actix_web::post("/agreements/{agreement_id}/approve")]
+async fn approve_agreement(
+    market: Data<Arc<MarketService>>,
+    path: Path<PathAgreement>,
+    query: Query<QueryTimeout>,
+    id: Identity,
+) -> HttpResponse {
+    response::not_implemented()
+}
+
+#[actix_web::post("/agreements/{agreement_id}/reject")]
+async fn reject_agreement(
+    market: Data<Arc<MarketService>>,
+    path: Path<PathAgreement>,
+    id: Identity,
+) -> HttpResponse {
+    response::not_implemented()
+}
+
+#[actix_web::post("/agreements/{agreement_id}/terminate")]
+async fn terminate_agreement(
+    market: Data<Arc<MarketService>>,
+    path: Path<PathAgreement>,
+    id: Identity,
+) -> HttpResponse {
+    response::not_implemented()
+}
+
+#[actix_web::get("/agreements/{agreement_id}")]
+async fn get_agreement(
+    market: Data<Arc<MarketService>>,
+    path: Path<PathAgreement>,
+    id: Identity,
+) -> HttpResponse {
+    response::not_implemented()
+}