Skip to content
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

Jump to bottom

Clean up cargo dependencies #1503

Merged
merged 5 commits into from
Nov 28, 2023
Merged

Clean up cargo dependencies #1503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb11455
remove comments
Kailai-Wang Nov 26, 2023
c5bc15c
fix cargo and clippy
Kailai-Wang Nov 26, 2023
91ce16b
a bit more
Kailai-Wang Nov 26, 2023
97c0c49
taplo fmt
Kailai-Wang Nov 26, 2023
c67af3e
revert some comments
Kailai-Wang Nov 27, 2023
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
227 changes: 14 additions & 213 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,6 @@ sgx_types = { version = "1.1.6", git = "https://github.com/apache/incubator-teac
sgx_ucrypto = { version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "master" }
sgx_urts = { version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "master" }

#[patch."https://github.com/integritee-network/sgx-runtime"]
#sgx-runtime = { path = "../sgx-runtime/runtime"}
#sp-io = { path = "../sgx-runtime/substrate-sgx/sp-io"}
#sgx-externalities = { path = "../sgx-runtime/substrate-sgx/externalities"}

#[patch."https://github.com/integritee-network/integritee-node"]
#my-node-runtime = { package = "integritee-node-runtime", git = "https://github.com/integritee-network//integritee-node", branch = "ab/integrate-pallet-teerex-refactoring" }

Expand All @@ -108,6 +103,3 @@ sgx_urts = { version = "1.1.6", git = "https://github.com/apache/incubator-teacl
#teerex-primitives = { git = "https://github.com/integritee-network//pallets", branch = "ab/shard-config-upgradability-2" }
#teeracle-primitives = { git = "https://github.com/integritee-network//pallets", branch = "ab/shard-config-upgradability-2" }
#common-primitives = { git = "https://github.com/integritee-network//pallets", branch = "ab/shard-config-upgradability-2" }

#[patch."https://github.com/integritee-network/http_req"]
#http_req = {path = '..//http_req' }
2 changes: 0 additions & 2 deletions app-libs/oracle/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
lazy_static = { version = "1.1.0", features = ["spin_no_std"] }
log = { version = "0.4", default-features = false }
serde = { version = "1.0", default-features = false, features = ["derive", "alloc"] }
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
substrate-fixed = { default-features = false, git = "https://github.com/encointer/substrate-fixed", tag = "v0.5.9" }

# internal dependencies
Expand All @@ -36,7 +35,6 @@ std = [
"itp-ocall-api/std",
"log/std",
"serde/std",
"serde_json/std",
"substrate-fixed/std",
"thiserror",
"url",
Expand Down
24 changes: 0 additions & 24 deletions app-libs/parentchain-interface/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,39 +7,23 @@ edition = "2021"
[dependencies]
# sgx dependencies
sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
sgx_types = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git" }

# local dependencies
ita-sgx-runtime = { path = "../sgx-runtime", default-features = false }
ita-stf = { path = "../stf", default-features = false }
itc-parentchain-indirect-calls-executor = { path = "../../core/parentchain/indirect-calls-executor", default-features = false }
itp-api-client-types = { path = "../../core-primitives/node-api/api-client-types", default-features = false }
itp-node-api = { path = "../../core-primitives/node-api", default-features = false }
itp-ocall-api = { path = "../../core-primitives/ocall-api", default-features = false }
itp-sgx-crypto = { path = "../../core-primitives/sgx/crypto", default-features = false }
itp-sgx-runtime-primitives = { path = "../../core-primitives/sgx-runtime-primitives", default-features = false }
itp-stf-executor = { path = "../../core-primitives/stf-executor", default-features = false }
itp-stf-primitives = { path = "../../core-primitives/stf-primitives", default-features = false }
itp-top-pool-author = { path = "../../core-primitives/top-pool-author", default-features = false }
itp-types = { path = "../../core-primitives/types", default-features = false }
itp-utils = { path = "../../core-primitives/utils", default-features = false }

# sgx enabled external libraries
futures_sgx = { package = "futures", git = "https://github.com/mesalock-linux/futures-rs-sgx", optional = true }
thiserror_sgx = { package = "thiserror", git = "https://github.com/mesalock-linux/thiserror-sgx", tag = "sgx_1.1.3", optional = true }

# std compatible external libraries (make sure these versions match with the sgx-enabled ones above)
futures = { version = "0.3.8", optional = true }
thiserror = { version = "1.0", optional = true }

# no-std compatible libraries
bs58 = { version = "0.4.0", default-features = false, features = ["alloc"] }
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
log = { version = "0.4", default-features = false }

# substrate dep
binary-merkle-tree = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }

Expand All @@ -58,36 +42,28 @@ default = ["std"]
std = [
"bs58/std",
"codec/std",
"futures",
"ita-sgx-runtime/std",
"ita-stf/std",
"itc-parentchain-indirect-calls-executor/std",
"itp-api-client-types/std",
"itp-node-api/std",
"itp-ocall-api/std",
"itp-sgx-crypto/std",
"itp-sgx-runtime-primitives/std",
"itp-stf-executor/std",
"itp-stf-primitives/std",
"itp-top-pool-author/std",
"itp-types/std",
"itp-utils/std",
"log/std",
#substrate
"binary-merkle-tree/std",
"sp-core/std",
"sp-runtime/std",
"frame-support/std",
"thiserror",
]
sgx = [
"sgx_tstd",
"futures_sgx",
"ita-stf/sgx",
"itc-parentchain-indirect-calls-executor/sgx",
"itp-node-api/sgx",
"itp-sgx-crypto/sgx",
"itp-stf-executor/sgx",
"itp-top-pool-author/sgx",
"thiserror_sgx",
]
5 changes: 0 additions & 5 deletions app-libs/sgx-runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ edition = "2021"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
hex-literal = { version = "0.3.4", optional = true }
serde = { version = "1.0", optional = true, features = ["derive"] }
# alias "parity-scale-code" to "codec"
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }

Expand Down Expand Up @@ -59,7 +56,6 @@ evm_std = [
"pallet-evm/std",
]
runtime-benchmarks = [
"hex-literal",
"frame-benchmarking",
"frame-support/runtime-benchmarks",
"frame-system-benchmarking",
Expand All @@ -71,7 +67,6 @@ runtime-benchmarks = [
std = [
"codec/std",
"scale-info/std",
"serde",
"itp-sgx-runtime-primitives/std",
"frame-executive/std",
"frame-support/std",
Expand Down
15 changes: 1 addition & 14 deletions app-libs/stf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ edition = "2021"
[dependencies]
# crates.io
codec = { version = "3.0.0", default-features = false, features = ["derive"], package = "parity-scale-codec" }
derive_more = { version = "0.99.5" }
hex = { version = "0.4", default-features = false }
log = { version = "0.4", default-features = false }
rlp = { version = "0.5", default-features = false }
sha3 = { version = "0.10", default-features = false }
Expand All @@ -18,11 +16,9 @@ sgx_tstd = { branch = "master", features = ["untrusted_fs", "net", "backtrace"],

# local crates
ita-sgx-runtime = { default-features = false, path = "../sgx-runtime" }
itc-parentchain-indirect-calls-executor = { path = "../../core/parentchain/indirect-calls-executor", default-features = false }
itp-hashing = { default-features = false, path = "../../core-primitives/hashing" }
itp-node-api = { default-features = false, path = "../../core-primitives/node-api" }
itp-node-api-metadata = { default-features = false, path = "../../core-primitives/node-api/metadata" }
itp-node-api-metadata-provider = { default-features = false, path = "../../core-primitives/node-api/metadata-provider" }
itp-sgx-externalities = { default-features = false, path = "../../core-primitives/substrate-sgx/externalities" }
itp-stf-interface = { default-features = false, path = "../../core-primitives/stf-interface" }
itp-stf-primitives = { default-features = false, path = "../../core-primitives/stf-primitives" }
Expand All @@ -35,16 +31,12 @@ sp-io = { default-features = false, features = ["disable_oom", "disable_panic_ha
frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
pallet-parentchain = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.0-polkadot-v0.9.42" }
pallet-sudo = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
sp-application-crypto = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }

# scs / integritee
my-node-runtime = { package = "integritee-node-runtime", optional = true, git = "https://github.com/integritee-network/integritee-node.git", branch = "sdk-v0.12.0-polkadot-v0.9.42" }
pallet-parentchain = { default-features = false, git = "https://github.com/integritee-network/pallets.git", branch = "sdk-v0.12.0-polkadot-v0.9.42" }


[dev-dependencies]
sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
Expand All @@ -58,7 +50,6 @@ sgx = [
"itp-sgx-externalities/sgx",
"sp-io/sgx",
"itp-node-api/sgx",
"itp-node-api-metadata-provider/sgx",
]
std = [
# crates.io
Expand All @@ -67,25 +58,21 @@ std = [
"rlp/std",
# local
"ita-sgx-runtime/std",
"itc-parentchain-indirect-calls-executor/std",
"itp-hashing/std",
"itp-sgx-externalities/std",
"itp-stf-interface/std",
"itp-storage/std",
"itp-types/std",
"itp-node-api/std",
"itp-node-api-metadata/std",
"itp-node-api-metadata-provider/std",
# substrate
"sp-core/std",
"pallet-balances/std",
"pallet-sudo/std",
"frame-system/std",
"frame-support/std",
"sp-application-crypto/std",
"sp-runtime/std",
# scs/integritee
"my-node-runtime",
"pallet-parentchain/std",
"sp-io/std",
]
Expand Down
5 changes: 0 additions & 5 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@ edition = "2021"
[dependencies]
array-bytes = { version = "6.0.0" }
base58 = "0.2"
blake2-rfc = { version = "0.2.18" }
chrono = "*"
clap = { version = "3.1.6", features = ["derive"] }
codec = { version = "3.0.0", package = "parity-scale-codec", features = ["derive"] }
env_logger = "0.9"
hdrhistogram = "7.5.0"
hex = "0.4.2"
log = "0.4"
primitive-types = { version = "0.12.1", features = ["codec"] }
rand = "0.8.5"
rayon = "1.5.1"
regex = "1.9.5"
Expand All @@ -25,7 +23,6 @@ serde_json = "1.0"
sgx_crypto_helper = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
thiserror = "1.0"
urlencoding = "2.1.3"
ws = { version = "0.9.1", features = ["ssl"] }

# scs / integritee
my-node-runtime = { package = "integritee-node-runtime", git = "https://github.com/integritee-network/integritee-node.git", branch = "sdk-v0.12.0-polkadot-v0.9.42" }
Expand All @@ -39,9 +36,7 @@ substrate-api-client = { default-features = false, features = ["std", "sync-api"
substrate-client-keystore = { git = "https://github.com/scs/substrate-api-client.git", branch = "polkadot-v0.9.42-tag-v0.14.0" }

# substrate dependencies
frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
sc-keystore = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
Expand Down
4 changes: 0 additions & 4 deletions core-primitives/attestation-handler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,12 @@ itp-settings = { path = "../settings" }
itp-sgx-crypto = { path = "../sgx/crypto", default-features = false }
itp-sgx-io = { path = "../sgx/io", default-features = false }
itp-time-utils = { path = "../time-utils", default-features = false }
itp-types = { path = "../types", default-features = false }

# integritee
httparse = { default-features = false, git = "https://github.com/integritee-network/httparse-sgx", branch = "sgx-experimental" }

# substrate deps
sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }

[features]
default = ["std"]
Expand All @@ -74,10 +72,8 @@ std = [
"itp-ocall-api/std",
"itp-sgx-io/std",
"itp-sgx-crypto/std",
"itp-types/std",
# substrate
"sp-core/std",
"sp-runtime/std",
# integritee
"httparse/std",
]
Expand Down
1 change: 0 additions & 1 deletion core-primitives/enclave-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ sgx_types = { branch = "master", git = "https://github.com/apache/teaclave-sgx-s
sgx_urts = { optional = true, branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git" }

frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
sp-consensus-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }

Expand Down
3 changes: 1 addition & 2 deletions core-primitives/enclave-bridge-storage/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ sp-std = { default-features = false, git = "https://github.com/paritytech/substr

#local deps
itp-storage = { path = "../storage", default-features = false }
itp-types = { path = "../types", default-features = false }

[features]
default = ["std"]
std = [
"codec/std",
"sp-std/std",
"itp-storage/std",
"itp-types/std",
]
2 changes: 0 additions & 2 deletions core-primitives/extrinsics-factory/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ thiserror = { version = "1.0", optional = true }

# no-std dependencies
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
log = { version = "0.4", default-features = false }
sp-core = { default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }

Expand All @@ -33,7 +32,6 @@ std = [
"itp-node-api/std",
"itp-nonce-cache/std",
"itp-types/std",
"log/std",
"substrate-api-client/std",
"thiserror",
]
Expand Down
4 changes: 0 additions & 4 deletions core-primitives/node-api/api-client-extensions/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,10 @@ authors = ["Integritee AG <hello@integritee.network>"]
edition = "2021"

[dependencies]
# crates.io
codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"] }
log = { version = "0.4" }
thiserror = { version = "1.0" }

# substrate
sp-consensus-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }

# scs
Expand Down
2 changes: 0 additions & 2 deletions core-primitives/node-api/api-client-types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ my-node-runtime = { package = "integritee-node-runtime", optional = true, git =
substrate-api-client = { default-features = false, features = ["sync-api"], git = "https://github.com/scs/substrate-api-client.git", branch = "polkadot-v0.9.42-tag-v0.14.0" }

# substrate
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }

# local
Expand All @@ -25,7 +24,6 @@ std = [
"itp-types/std",
"substrate-api-client/std",
"substrate-api-client/tungstenite-client",
"sp-core/std",
"sp-runtime/std",
"my-node-runtime",
]
3 changes: 0 additions & 3 deletions core-primitives/nonce-cache/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ thiserror_sgx = { package = "thiserror", git = "https://github.com/mesalock-linu
# std compatible external libraries (make sure these versions match with the sgx-enabled ones above)
thiserror = { version = "1.0", optional = true }

# no-std dependencies
lazy_static = { version = "1.1.0", features = ["spin_no_std"] }

[features]
default = ["std"]
std = [
Expand Down
7 changes: 1 addition & 6 deletions core-primitives/sgx/crypto/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,19 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
derive_more = { version = "0.99.5" }
log = { version = "0.4", default-features = false }
ofb = { version = "0.4.0" }
serde = { version = "1.0", default-features = false, features = ["alloc"], optional = true }
serde_json = { version = "1.0", default-features = false, features = ["alloc"], optional = true }

# sgx deps
serde-sgx = { package = "serde", tag = "sgx_1.1.3", git = "https://github.com/mesalock-linux/serde-sgx", optional = true }
serde_json-sgx = { package = "serde_json", tag = "sgx_1.1.3", git = "https://github.com/mesalock-linux/serde-json-sgx", optional = true }
sgx-crypto-helper = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", package = "sgx_crypto_helper", default-features = false }
sgx_rand = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
sgx_types = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git" }

# substrate deps
# substrate
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }

# local deps
itp-settings = { path = "../../settings" }
itp-sgx-io = { path = "../io", default-features = false }

# test sgx deps
Expand All @@ -39,7 +36,6 @@ std = [
"log/std",
"itp-sgx-io/std",
"sp-core/std",
"serde/std",
"serde_json/std",
"sgx-crypto-helper/default",
]
Expand All @@ -49,7 +45,6 @@ sgx = [
"sgx_rand",
"itp-sgx-io/sgx",
"serde_json-sgx",
"serde-sgx",
]
mocks = []
test = [
Expand Down
1 change: 0 additions & 1 deletion core-primitives/sgx/crypto/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ extern crate sgx_tstd as std;
#[cfg(all(not(feature = "std"), feature = "sgx"))]
pub mod sgx_reexport_prelude {
pub use serde_json_sgx as serde_json;
pub use serde_sgx as serde;
}

pub mod aes;
Expand Down
Loading
Loading