Skip to content

Specify 'untrusted_time' feature explicitely in crates with sgx_tstd #497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
murerfel merged 2 commits into from
Nov 9, 2021
Merged

Specify 'untrusted_time' feature explicitely in crates with sgx_tstd #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9eced4b
Specify 'untrusted_time' feature explicitely in crates with sgx_tstd
Nov 8, 2021
6c68e1c
Merge branch 'master' into hotfix/sgx_tstd_untrusted_time
Nov 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core-primitives/stf-executor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ test = []
[dependencies]
# sgx dependencies
sgx_types = { rev = "v1.1.3", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
sgx_tstd = { rev = "v1.1.3", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
sgx_tstd = { rev = "v1.1.3", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true, features = ["untrusted_time"] }
sgx-externalities = { default-features = false, git = "https://github.com/integritee-network/sgx-runtime", branch = "master", optional = true }

# local dependencies
Expand Down
6 changes: 0 additions & 6 deletions core-primitives/stf-executor/src/executor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@

*/

// #[cfg(all(not(feature = "std"), feature = "sgx"))]
// use crate::sgx_reexport_prelude::*;

#[cfg(all(not(feature = "std"), feature = "sgx"))]
use std::untrusted::time::SystemTimeEx;

use crate::{
error::{Error, Result},
traits::{
Expand Down
2 changes: 1 addition & 1 deletion enclave-runtime/src/cert.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use num_bigint::BigUint;
use serde_json::Value;
use sgx_tcrypto::*;
use sgx_types::*;
use std::{io::BufReader, prelude::v1::*, ptr, str, time::*, untrusted::time::SystemTimeEx};
use std::{io::BufReader, prelude::v1::*, ptr, str, time::*};
use yasna::models::ObjectIdentifier;

type SignatureAlgorithms = &'static [&'static webpki::SignatureAlgorithm];
Expand Down
2 changes: 1 addition & 1 deletion sidechain/consensus/slots/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ derive_more = "0.99.16"
lazy_static = { version = "1.1.0", features = ["spin_no_std"] }

# sgx deps
sgx_tstd = { rev = "v1.1.3", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
sgx_tstd = { rev = "v1.1.3", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true, features = ["untrusted_time"] }

# substrate deps
sp-consensus-slots = { version = "0.10.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master"}
Expand Down
3 changes: 0 additions & 3 deletions sidechain/consensus/slots/src/slots.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ use std::time::{Duration, SystemTime};

pub use sp_consensus_slots::Slot;

#[cfg(all(not(feature = "std"), feature = "sgx"))]
use std::untrusted::time::SystemTimeEx;

/// Returns current duration since unix epoch.
pub fn duration_now() -> Duration {
let now = SystemTime::now();
Expand Down
2 changes: 1 addition & 1 deletion sidechain/top-pool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ std = [
[dependencies]
# sgx dependencies
sgx_types = { rev = "v1.1.3", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
sgx_tstd = { rev = "v1.1.3", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true, features = ["net", "thread"] }
sgx_tstd = { rev = "v1.1.3", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true, features = ["net", "thread", "untrusted_time"] }

# local dependencies
ita-stf = { path = "../../app-libs/stf", default-features = false }
Expand Down
3 changes: 0 additions & 3 deletions sidechain/top-pool/src/future.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@

pub extern crate alloc;

#[cfg(all(not(feature = "std"), feature = "sgx"))]
use std::untrusted::time::InstantEx;

use crate::base_pool::TrustedOperation;
use alloc::{boxed::Box, fmt, sync::Arc, vec, vec::Vec};
use core::hash;
Expand Down
3 changes: 0 additions & 3 deletions sidechain/top-pool/src/pool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
#[cfg(all(not(feature = "std"), feature = "sgx"))]
use crate::sgx_reexport_prelude::*;

#[cfg(all(not(feature = "std"), feature = "sgx"))]
use std::untrusted::time::InstantEx;

use crate::{
base_pool as base, error,
primitives::TrustedOperationSource,
Expand Down
3 changes: 0 additions & 3 deletions sidechain/top-pool/src/validated_pool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ use std::sync::Mutex;
#[cfg(feature = "std")]
use std::sync::RwLock;

#[cfg(all(not(feature = "std"), feature = "sgx"))]
use std::untrusted::time::InstantEx;

use crate::{
base_pool as base,
base_pool::PruneStatus,
Expand Down