Merge branch 'main' into input

.github/workflows/dusk_ci.yml

@@ -8,95 +8,22 @@ name: CI
 
 jobs:
   analyze:
-    name: Dusk Analyzer
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-      - uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: --git https://github.com/dusk-network/cargo-dusk-analyzer
-      - uses: actions-rs/cargo@v1
-        with:
-          command: dusk-analyzer
+    name: Code Analysis
+    uses: dusk-network/.github/.github/workflows/code-analysis.yml@main
+    with:
+      clippy_default: false
+      clippy_args: -- -D warnings
 
-  check:
-    name: Check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-      - run: rustup component add rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          command: check
+  dusk_analyzer:
+    name: Dusk Analyzer
+    uses: dusk-network/.github/.github/workflows/dusk-analysis.yml@main
 
   test_std:
     name: Tests std
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-      - run: rustup component add rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --release
+    uses: dusk-network/.github/.github/workflows/run-tests.yml@main
 
   test_no_std:
     name: Tests no_std
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-      - run: rustup component add rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --release --no-default-features
-
-  fmt:
-    name: Rustfmt
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly
-      - run: rustup component add rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-
-  clippy:
-    name: Clippy
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install latest stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-      - run: rustup component add clippy
-      - run: rustup component add rustfmt
-      - name: Run `cargo clippy`
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: -- -D warnings
+    uses: dusk-network/.github/.github/workflows/run-tests.yml@main
+    with:
+      test_flags: --no-default-features

integration-tests/Cargo.toml

@@ -10,7 +10,7 @@ license-provider = { path = "../license-provider" }
 [dev-dependencies]
 dusk-wallet = "0.20.1-rc.0"
 dusk-jubjub = { version = "0.13", default-features = false }
-zk-citadel = "0.5"
+zk-citadel = "0.5.2-rc.0"
 phoenix-core = { version = "0.21", features = ["alloc"] }
 poseidon-merkle = { version = "0.3", features = ["rkyv-impl"] }
 dusk-pki = { version = "0.13", default-features = false, features = ["rkyv-impl"] }

integration-tests/tests/citadel/send_request.rs

@@ -51,7 +51,7 @@ async fn send_request() -> Result<(), Error> {
         rng,
     )?;
     let request_vec = rkyv::to_bytes::<_, MAX_REQUEST_SIZE>(&request)
-        .unwrap()
+        .expect("Serializing should be infallible")
         .to_vec();
 
     let config = BlockchainAccessConfig::load_path(config_path)?;
@@ -79,7 +79,7 @@ async fn send_request() -> Result<(), Error> {
     assert_eq!(
         request_vec,
         rkyv::to_bytes::<_, MAX_REQUEST_SIZE>(&retrieved_request)
-            .unwrap()
+            .expect("Serializing should be infallible")
             .to_vec(),
         "requests not equal"
     );
@@ -89,7 +89,7 @@ async fn send_request() -> Result<(), Error> {
     assert_eq!(
         request_vec,
         rkyv::to_bytes::<_, MAX_REQUEST_SIZE>(&retrieved_request)
-            .unwrap()
+            .expect("Serializing should be infallible")
             .to_vec(),
         "requests not equal"
     );

integration-tests/tests/websocket/ws_server.rs

@@ -101,13 +101,13 @@ async fn accept_connection(stream: TcpStream) {
                 public_inputs: vec![BlsScalar::zero()],
             });
             rkyv::to_bytes::<_, MAX_RESPONSE_SIZE>(&response_data)
-                .expect("Data should serialize correctly")
+                .expect("Serializing should be infallible")
                 .to_vec()
         }
         "get_licenses" => {
             let response_data = vec![vec![1u8], vec![2u8]];
             rkyv::to_bytes::<_, MAX_RESPONSE_SIZE>(&response_data)
-                .expect("Data should serialize correctly")
+                .expect("Serializing should be infallible")
                 .to_vec()
         }
         _ => vec![],

license-provider/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 dusk-wallet = "0.20.1-rc.0"
-zk-citadel = "0.5"
+zk-citadel = "0.5.2-rc.0"
 moat-core={ path = "../moat-core" }
 wallet-accessor = { path = "../wallet-accessor" }
 dusk-poseidon = { version = "0.31", default-features = false, features = ["rkyv-impl", "alloc"] }

license-provider/src/license_issuer.rs

@@ -52,7 +52,7 @@ impl LicenseIssuer {
     ) -> Result<(BlsScalar, Vec<u8>), Error> {
         let license = License::new(attr_data, ssk_lp, request, rng);
         let license_blob = rkyv::to_bytes::<_, MAX_LICENSE_SIZE>(&license)
-            .expect("License should serialize correctly")
+            .expect("Serializing should be infallible")
             .to_vec();
         let lpk = JubJubAffine::from(license.lsa.pk_r().as_ref());
         let license_hash = sponge::hash(&[lpk.get_u(), lpk.get_v()]);

license-provider/src/reference_lp.rs

@@ -156,7 +156,7 @@ impl ReferenceLP {
     fn hash_request(request: &Request) -> [u8; OUT_LEN] {
         *blake3::hash(
             rkyv::to_bytes::<_, MAX_REQUEST_SIZE>(request)
-                .expect("Request should serialize correctly")
+                .expect("Serializing should be infallible")
                 .as_slice(),
         )
         .as_bytes()
@@ -167,7 +167,7 @@ impl ReferenceLP {
         T: rkyv::Serialize<AllocSerializer<16386>>,
     {
         let blob = rkyv::to_bytes::<_, 16386>(object)
-            .expect("type should serialize correctly")
+            .expect("Serializing should be infallible")
             .to_vec();
         Self::blob_to_hash_hex(blob.as_slice())
     }

moat-cli-lp/Cargo.toml

@@ -10,7 +10,7 @@ wallet-accessor = { path = "../wallet-accessor" }
 moat-core = { path = "../moat-core" }
 dusk-pki = "0.13"
 license-provider = { path = "../license-provider" }
-zk-citadel = "0.5"
+zk-citadel = "0.5.2-rc.0"
 rkyv = { version = "=0.7.39" }
 toml-base-config = "0.1"
 clap = { version = "4.0", features = ["derive", "env"] }

moat-cli-lp/src/run_result.rs

@@ -118,7 +118,7 @@ impl RunResult {
         T: rkyv::Serialize<AllocSerializer<16386>>,
     {
         let blob = rkyv::to_bytes::<_, 16386>(object)
-            .expect("type should serialize correctly")
+            .expect("Serializing should be infallible")
             .to_vec();
         Self::blob_to_hash_hex(blob.as_slice())
     }

moat-cli-sp/Cargo.toml

@@ -7,11 +7,15 @@ edition = "2021"
 dusk-wallet = "0.20.1-rc.0"
 wallet-accessor = { path = "../wallet-accessor" }
 moat-core = { path = "../moat-core" }
+zk-citadel = "0.5.2-rc.0"
 rkyv = { version = "=0.7.39" }
 dusk-bls12_381 = "0.12"
+dusk-jubjub = { version = "0.13", default-features = false, features = ["rkyv-impl", "alloc"] }
+dusk-pki = "0.13"
 toml-base-config = "0.1"
 clap = { version = "4.0", features = ["derive", "env"] }
 tokio = { version = "1.21", features = ["full"] }
+serde = { version = "1", features = ["derive"] }
 tracing = "0.1"
 tracing-subscriber = "0.3"
 rand = "0.8"
@@ -24,3 +28,4 @@ futures-core = "0.3"
 reqwest = "0.11"
 bytecheck = "0.6"
 sha3 = "0.10"
+thiserror = "1.0"

moat-cli-sp/config.toml

@@ -0,0 +1,3 @@
+rusk_address = "http://127.0.0.1:8080"
+prover_address = "http://127.0.0.1:8080"
+psk_lp = "136d747ff489bd06077f937508b9237ac093ff868dc2e232ab3af0ecd038873288560dbd8aa851e055bc408ebeb89509b26eb6e34b4b43214de467e3ef09594e"

moat-cli-sp/src/command.rs

@@ -4,12 +4,19 @@
 //
 // Copyright (c) DUSK NETWORK. All rights reserved.
 
-use crate::run_result::{LicenseContractSummary, RunResult, SessionSummary};
+use crate::config::SPCliConfig;
+use crate::run_result::{
+    LicenseContractSummary, RunResult, ServiceRequestSummery, SessionSummary,
+};
+use crate::Error;
 use dusk_bls12_381::BlsScalar;
 use dusk_bytes::DeserializableSlice;
+use dusk_jubjub::JubJubAffine;
+use dusk_pki::PublicSpendKey;
 use dusk_wallet::RuskHttpClient;
-use moat_core::{CitadelInquirer, Error, LicenseSessionId};
+use moat_core::{CitadelInquirer, LicenseSessionId};
 use wallet_accessor::BlockchainAccessConfig;
+use zk_citadel::license::{Session, SessionCookie};
 
 /// Commands that can be run against the Moat
 #[derive(PartialEq, Eq, Hash, Clone, Debug)]
@@ -27,11 +34,16 @@ impl Command {
     pub async fn run(
         self,
         blockchain_access_config: &BlockchainAccessConfig,
+        config: &SPCliConfig,
     ) -> Result<RunResult, Error> {
         let run_result = match self {
-            Command::RequestService { session_cookie: _ } => {
-                println!("Off-chain request service to be placed here");
-                RunResult::Empty
+            Command::RequestService { session_cookie } => {
+                Self::request_service(
+                    blockchain_access_config,
+                    &session_cookie,
+                    config,
+                )
+                .await?
             }
             Command::GetSession { session_id } => {
                 Self::get_session(blockchain_access_config, session_id).await?
@@ -43,17 +55,55 @@ impl Command {
         Ok(run_result)
     }
 
+    /// Command: Request Service
+    async fn request_service(
+        blockchain_access_config: &BlockchainAccessConfig,
+        session_cookie: &str,
+        config: &SPCliConfig,
+    ) -> Result<RunResult, Error> {
+        let client =
+            RuskHttpClient::new(blockchain_access_config.rusk_address.clone());
+
+        let bytes = hex::decode(session_cookie)
+            .map_err(|_| Error::InvalidEntry("session cookie".into()))?;
+        let sc: SessionCookie = rkyv::from_bytes(bytes.as_slice())
+            .map_err(|_| Error::InvalidEntry("session cookie".into()))?;
+        let psk_lp: &str = &config.psk_lp;
+        let psk_lp_bytes = hex::decode(psk_lp.as_bytes()).map_err(|_| {
+            Error::InvalidConfigValue("license provider psk".into())
+        })?;
+        let psk_lp = PublicSpendKey::from_slice(psk_lp_bytes.as_slice())
+            .map_err(|_| {
+                Error::InvalidConfigValue("license provider psk".into())
+            })?;
+        let pk_lp = JubJubAffine::from(*psk_lp.A());
+
+        let session_id = LicenseSessionId { id: sc.session_id };
+        let session = CitadelInquirer::get_session(&client, session_id)
+            .await?
+            .ok_or(Error::NotFound("Session not found".into()))?;
+
+        let session = Session::from(&session.public_inputs);
+        let granted = session.verifies_ok(sc, pk_lp);
+        println!("session id={}", hex::encode(session_id.id.to_bytes()));
+        let service_request_summary = ServiceRequestSummery {
+            service_granted: granted,
+        };
+        Ok(RunResult::RequestService(service_request_summary))
+    }
+
     /// Command: Get Session
     async fn get_session(
         blockchain_access_config: &BlockchainAccessConfig,
         session_id: String,
     ) -> Result<RunResult, Error> {
         let client =
             RuskHttpClient::new(blockchain_access_config.rusk_address.clone());
+        let session_id_bytes = hex::decode(session_id.clone())
+            .map_err(|_| Error::InvalidEntry("session id".into()))?;
         let id = LicenseSessionId {
-            id: BlsScalar::from_slice(
-                hex::decode(session_id.clone())?.as_slice(),
-            )?,
+            id: BlsScalar::from_slice(session_id_bytes.as_slice())
+                .map_err(|_| Error::InvalidEntry("session id".into()))?,
         };
         Ok(match CitadelInquirer::get_session(&client, id).await? {
             Some(session) => {

moat-cli-sp/src/config.rs

@@ -0,0 +1,19 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+//
+// Copyright (c) DUSK NETWORK. All rights reserved.
+
+use serde::{Deserialize, Serialize};
+use toml_base_config::BaseConfig;
+
+#[derive(Debug, Default, Deserialize, Serialize, Clone)]
+pub struct SPCliConfig {
+    pub rusk_address: String,
+    pub prover_address: String,
+    pub psk_lp: String,
+}
+
+impl BaseConfig for SPCliConfig {
+    const PACKAGE: &'static str = env!("CARGO_PKG_NAME");
+}