Merge pull request #2265 from oasisprotocol/kostko/feature/rofl-app-refactor-core

rofl-app-core: Extract ROFL app core to its own crate

Author: kostko

Cargo.lock

@@ -17,6 +17,7 @@ members = [
     "contract-sdk-macros",
 
     # ROFL.
+    "rofl-app-core",
     "rofl-utils",
     "rofl-appd",
     "rofl-containers",

Cargo.toml

@@ -0,0 +1,29 @@
+[package]
+name = "rofl-app-core"
+version = "0.0.0"
+edition = "2021"
+
+[dependencies]
+cbor = { version = "0.5.1", package = "oasis-cbor" }
+oasis-runtime-sdk = { path = "../runtime-sdk" }
+oasis-runtime-sdk-rofl-market = { path = "../runtime-sdk/modules/rofl-market" }
+
+# Third party.
+anyhow = "1.0.86"
+async-trait = "0.1.77"
+base64 = "0.22.1"
+rand = "0.8.5"
+slog = "2.7.0"
+tokio = { version = "1.38", features = [
+    "rt",
+    "rt-multi-thread",
+    "sync",
+    "time",
+    "macros",
+] }
+
+[features]
+# TDX build.
+tdx = ["oasis-runtime-sdk/tdx"]
+# Enables mock SGX in non-SGX builds.
+debug-mock-sgx = ["oasis-runtime-sdk/debug-mock-sgx"]

rofl-app-core/Cargo.toml

@@ -11,7 +11,7 @@ use anyhow::{anyhow, Context as _, Result};
 use rand::{rngs::OsRng, Rng};
 use tokio::sync::{mpsc, oneshot};
 
-use crate::{
+use oasis_runtime_sdk::{
     core::{
         common::crypto::{hash::Hash, mrae::deoxysii},
         consensus::{

…ntime-sdk/src/modules/rofl/app/client.rs rofl-app-core/src/client.rsruntime-sdk/src/modules/rofl/app/client.rs renamed to rofl-app-core/src/client.rs runtime-sdk/src/modules/rofl/app/client.rs renamed to rofl-app-core/src/client.rs

@@ -3,7 +3,7 @@ use std::{collections::BTreeMap, sync::Arc};
 use anyhow::{anyhow, Result};
 use tokio::sync::mpsc;
 
-use crate::{
+use oasis_runtime_sdk::{
     core::{common::namespace::Namespace, host::Host, identity::Identity, protocol::Protocol},
     crypto::signature::Signer,
 };

runtime-sdk/src/modules/rofl/app/env.rs rofl-app-core/src/env.rsruntime-sdk/src/modules/rofl/app/env.rs renamed to rofl-app-core/src/env.rs

@@ -4,17 +4,16 @@ use std::{collections::BTreeMap, sync::Arc};
 use anyhow::Result;
 use async_trait::async_trait;
 use base64::prelude::*;
-use oasis_core_runtime::Protocol;
 use tokio::sync::mpsc;
 
-use crate::{
+use oasis_runtime_sdk::{
     core::{
         app,
         common::version,
         config::Config,
         consensus::{roothash, verifier::TrustRoot},
         dispatcher::{PostInitState, PreInitState},
-        start_runtime,
+        start_runtime, Protocol,
     },
     crypto,
     types::transaction,
@@ -29,9 +28,9 @@ mod processor;
 mod registration;
 mod watchdog;
 
-pub use crate::modules::rofl::app_id::AppId;
 pub use client::Client;
 pub use env::Environment;
+pub use oasis_runtime_sdk::modules::rofl::app_id::AppId;
 
 /// ROFL component application.
 #[allow(unused_variables)]

…ime-sdk/src/modules/rofl/app/init/mod.rs rofl-app-core/src/init/mod.rsruntime-sdk/src/modules/rofl/app/init/mod.rs renamed to rofl-app-core/src/init/mod.rs runtime-sdk/src/modules/rofl/app/init/mod.rs renamed to rofl-app-core/src/init/mod.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 use anyhow::Result;
 use tokio::sync::mpsc;
 
-use crate::core::common::logger::get_logger;
+use oasis_runtime_sdk::core::common::logger::get_logger;
 
 use super::{processor, App, Environment};
 

…ime-sdk/src/modules/rofl/app/init/tdx.rs rofl-app-core/src/init/tdx.rsruntime-sdk/src/modules/rofl/app/init/tdx.rs renamed to rofl-app-core/src/init/tdx.rs runtime-sdk/src/modules/rofl/app/init/tdx.rs renamed to rofl-app-core/src/init/tdx.rs

@@ -5,6 +5,6 @@ pub use anyhow::Result;
 pub use async_trait::async_trait;
 pub use slog;
 
-pub use crate::{self as sdk, core::consensus::verifier::TrustRoot, Version};
+pub use oasis_runtime_sdk::{self as sdk, core::consensus::verifier::TrustRoot, Version};
 
 pub use super::{App, AppId, Environment};