Merge in quartz-decouple and transfers app

Cargo.toml

@@ -1,12 +1,12 @@
 [workspace]
 resolver = "2"
-members = [
+members = [ "apps/mtcs/enclave",
     "core/light-client-proofs/*",
     "core/quartz",
     "cosmwasm/packages/*",
     "utils/*",
 ]
-exclude = ["apps/mtcs/contracts/cw-tee-mtcs"]
+exclude = ["apps/mtcs/contracts/cw-tee-mtcs", "apps/mtcs/enclave", "apps/transfers", "apps/transfers/enclave"]
 
 [workspace.package]
 version = "0.1.0"

apps/mtcs/enclave/Cargo.toml

@@ -0,0 +1,52 @@
+[package]
+name = "enclave"
+version = "0.1.0"
+edition = "2021"
+
+[profile.release]
+opt-level = 3
+debug = false
+rpath = false
+lto = true
+debug-assertions = false
+codegen-units = 1
+panic = 'abort'
+incremental = false
+overflow-checks = true
+
+[dependencies]
+# external
+hex = { version = "0.4.3", default-features = false }
+k256 = { version = "0.13.2", default-features = false, features = ["ecdsa"] }
+schemars = "0.8.15"
+serde = { version = "1.0.189", default-features = false, features = ["derive"] }
+thiserror = { version = "1.0.49" }
+tonic = { version = "0.11.0"}
+tonic-build = "0.11.0"
+cosmrs = { version = "0.16.0"}
+cosmwasm-std = { version = "1.5.2", default-features = false }
+serde_json = { version = "1.0.94", default-features = false }
+ecies = { version = "0.2.3", default-features = false, features = ["pure"] }
+clap = { version = "4.1.8", default-features = false, features = ["derive", "std"] }
+tokio = { version = "1.0", default-features = false, features = ["macros", "rt-multi-thread"] }
+tendermint = { version = "=0.36.0", default-features = false }
+tendermint-light-client = { version = "=0.36.0", default-features = false, features = ["rust-crypto"] }
+color-eyre = { version = "0.6.2", default-features = false }
+prost = { version = "0.12.3", default-features = false }
+
+# local
+cw-tee-mtcs.workspace = true
+cycles-sync.workspace = true
+mtcs.workspace = true
+
+# quartz
+quartz-cw = { path = "../../../cosmwasm/packages/quartz-cw" }
+quartz-proto = { path = "../../../core/quartz-proto" }
+quartz-enclave = { path = "../../../core/quartz"}
+
+[dev-dependencies]
+cw-multi-test = "0.17.0"
+serde_json = "1.0.113"
+
+[build-dependencies]
+tonic-build.workspace = true

apps/mtcs/enclave/README.md

@@ -0,0 +1 @@
+## MTCS Server

core/quartz/src/cli.rs → apps/mtcs/enclave/src/cli.rs

@@ -2,7 +2,7 @@ use std::net::SocketAddr;
 
 use clap::Parser;
 use color_eyre::eyre::{eyre, Result};
-use tendermint::Hash;
+use cosmrs::tendermint::Hash;
 use tendermint_light_client::types::{Height, TrustThreshold};
 
 fn parse_trust_threshold(s: &str) -> Result<TrustThreshold> {

core/quartz/src/main.rs → apps/mtcs/enclave/src/main.rs

@@ -13,29 +13,26 @@
     unused_qualifications
 )]
 
-mod attestor;
 mod cli;
 mod mtcs_server;
 mod proto;
-mod server;
 
 use std::{
     sync::{Arc, Mutex},
     time::Duration,
 };
 
 use clap::Parser;
+use cli::Cli;
+use mtcs_server::MtcsService;
+use proto::clearing_server::ClearingServer as MtcsServer;
 use quartz_cw::state::{Config, LightClientOpts};
-use quartz_proto::quartz::core_server::CoreServer;
-use tonic::transport::Server;
-
-use crate::{
+use quartz_enclave::{
     attestor::{Attestor, EpidAttestor},
-    cli::Cli,
-    mtcs_server::MtcsService,
-    proto::clearing_server::ClearingServer as MtcsServer,
     server::CoreService,
 };
+use quartz_proto::quartz::core_server::CoreServer;
+use tonic::transport::Server;
 
 #[tokio::main(flavor = "current_thread")]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {

core/quartz/src/mtcs_server.rs → apps/mtcs/enclave/src/mtcs_server.rs

@@ -5,9 +5,10 @@ use std::{
 
 use cosmrs::{tendermint::account::Id as TmAccountId, AccountId};
 use cosmwasm_std::HexBinary;
+//TODO: get rid of this
 use cw_tee_mtcs::{
     msg::execute::SubmitSetoffsMsg,
-    state::{RawCipherText, RawHash, SettleOff, Transfer},
+    state::{RawHash, SettleOff, Transfer},
 };
 use cycles_sync::types::RawObligation;
 use ecies::{decrypt, encrypt};
@@ -16,13 +17,14 @@ use mtcs::{
     algo::mcmf::primal_dual::PrimalDual, impls::complex_id::ComplexIdMtcs,
     obligation::SimpleObligation, prelude::DefaultMtcs, setoff::SimpleSetoff, Mtcs,
 };
+use quartz_cw::msg::execute::attested::RawAttested;
+use quartz_enclave::attestor::Attestor;
 use serde::{Deserialize, Serialize};
 use tonic::{Request, Response, Result as TonicResult, Status};
 
-use crate::{
-    attestor::Attestor,
-    proto::{clearing_server::Clearing, RunClearingRequest, RunClearingResponse},
-};
+use crate::proto::{clearing_server::Clearing, RunClearingRequest, RunClearingResponse};
+
+pub type RawCipherText = HexBinary;
 
 #[derive(Clone, Debug)]
 pub struct MtcsService<A> {
@@ -60,6 +62,23 @@ where
         &self,
         request: Request<RunClearingRequest>,
     ) -> TonicResult<Response<RunClearingResponse>> {
+        // Pass in JSON of Requests vector and the STATE
+
+        // Serialize into Requests enum
+        // Loop through, decrypt the ciphertexts
+
+        // Read the state blob from chain
+
+        // Decrypt and deserialize
+
+        // Loop through requests and apply onto state
+
+        // Encrypt state
+
+        // Create withdraw requests
+
+        // Send to chain
+
         let message: RunClearingMessage = {
             let message = request.into_inner().message;
             serde_json::from_str(&message).map_err(|e| Status::invalid_argument(e.to_string()))?
@@ -93,12 +112,12 @@ where
 
         let msg = SubmitSetoffsMsg { setoffs_enc };
 
-        let quote = self
+        let attestation = self
             .attestor
             .quote(msg.clone())
             .map_err(|e| Status::internal(e.to_string()))?;
 
-        let attested_msg = AttestedMsg { msg, quote };
+        let attested_msg = RawAttested { msg, attestation };
         let message = serde_json::to_string(&attested_msg).unwrap();
         Ok(Response::new(RunClearingResponse { message }))
     }

apps/transfers/contracts/.cargo/config

@@ -0,0 +1,5 @@
+[alias]
+wasm = "build --target wasm32-unknown-unknown --release --lib"
+wasm-debug = "build --target wasm32-unknown-unknown --lib"
+schema = "run schema"
+