Skip to content

Commit

Permalink
Update webpki and ring-xous dependency (#228)
Browse files Browse the repository at this point in the history 
* update webpki, scale-info, ring

* fix tests

* update cargo lock

* update Cargo.lock

* use crate.io version of ring

* Fix taplo check

* Update teerex README
  • Loading branch information
@Kailai-Wang
Kailai-Wang authored Nov 22, 2023
1 parent 4d56f2a commit 9fba4e2
Show file tree
Hide file tree
Showing 22 changed files with 809 additions and 567 deletions.
238 changes: 66 additions & 172 deletions Cargo.lock
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion claims/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = "2021"
libsecp256k1 = { version = "0.7.0", default-features = false, optional = true }
parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] }
rustc-hex = { version = "2.1.0", default-features = false }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.13", default-features = false }
serde_derive = { version = "1.0.13", optional = true }

Expand Down
2 changes: 1 addition & 1 deletion enclave-bridge/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2021"
[dependencies]
codec = { version = "3.0.0", default-features = false, features = ["derive"], package = "parity-scale-codec" }
log = { version = "0.4.14", default-features = false }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0", features = ["derive"], optional = true }

# local
Expand Down
2 changes: 1 addition & 1 deletion parentchain/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2021"
[dependencies]
codec = { version = "3.0.0", default-features = false, features = ["derive"], package = "parity-scale-codec" }
log = { version = "0.4.14", default-features = false }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.13", features = ["derive"], optional = true }

# substrate dependencies
Expand Down
2 changes: 1 addition & 1 deletion primitives/claims/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = "2021"
[dependencies]
parity-scale-codec = { version = "3.0.0", default-features = false, features = ["derive"] }
rustc-hex = { version = "2.1.0", default-features = false }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.13", default-features = false }

# substrate dependencies
Expand Down
2 changes: 1 addition & 1 deletion primitives/common/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = "2021"
[dependencies]
codec = { version = "3.0.0", default-features = false, features = ["derive"], package = "parity-scale-codec" }
derive_more = "0.99.16"
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }

# substrate deps
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42" }
Expand Down
2 changes: 1 addition & 1 deletion primitives/enclave-bridge/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2021"
codec = { version = "3.0.0", default-features = false, features = ["derive"], package = "parity-scale-codec" }
common-primitives = { path = "../common", default-features = false }
log = { version = "0.4.14", default-features = false }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.13", default-features = false }

# substrate dependencies
Expand Down
2 changes: 1 addition & 1 deletion primitives/sidechain/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = "2021"

[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full"] }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.13", default-features = false }


Expand Down
2 changes: 1 addition & 1 deletion primitives/teerex/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ codec = { version = "3.0.0", default-features = false, features = ["derive"], pa
common-primitives = { path = "../common", default-features = false }
derive_more = "0.99.16"
log = { version = "0.4.14", default-features = false }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.13", default-features = false }

# substrate dependencies
Expand Down
2 changes: 1 addition & 1 deletion sidechain/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2021"
[dependencies]
codec = { version = "3.0.0", default-features = false, features = ["derive"], package = "parity-scale-codec" }
log = { version = "0.4.14", default-features = false }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0.13", features = ["derive"], optional = true }

# local
Expand Down
2 changes: 1 addition & 1 deletion teeracle/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2021"
[dependencies]
codec = { version = "3.0.0", default-features = false, features = ["derive"], package = "parity-scale-codec" }
log = { version = "0.4.14", default-features = false }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }

# local
pallet-teerex = { path = "../teerex", default-features = false }
Expand Down
4 changes: 3 additions & 1 deletion teerex/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ edition = "2021"
codec = { version = "3.0.0", default-features = false, features = ["derive"], package = "parity-scale-codec" }
hex = { default-features = false, version = "0.4.3", features = ["alloc"] }
log = { version = "0.4.14", default-features = false }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { version = "1.0", features = ["derive"], optional = true }
webpki = { git = "https://github.com/rustls/webpki", version = "=0.102.0-alpha.3", rev = "da923ed", package = "rustls-webpki", default-features = false, features = ["alloc", "ring"] }

# local
sgx-verify = { path = "sgx-verify", default-features = false }
Expand Down Expand Up @@ -52,6 +53,7 @@ std = [
"log/std",
"scale-info/std",
"serde",
"webpki/std",
# local
"sgx-verify/std",
"teerex-primitives/std",
Expand Down
8 changes: 8 additions & 0 deletions teerex/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,11 @@ Run all unit tests with
cargo test --all
```

## Overriding

To use this pallet (directly or indirectly) in no-std, we need to override the ring crate in the workspace root, like:

```
[patch.crates-io]
ring = { git = "https://github.com/betrusted-io/ring-xous", branch = "0.16.20-cleanup" }
```
6 changes: 3 additions & 3 deletions teerex/sgx-verify/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ der = { default-features = false, version = "0.6.0" }
hex = { default-features = false, version = "0.4.3", features = ["alloc"] }
hex-literal = { version = "0.3.2" }
log = { version = "0.4.14", default-features = false }
ring = { git = "https://github.com/Niederb/ring-xous.git", branch = "0.16.20-cleanup", default-features = false, features = ["alloc"] }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
ring = { version = "0.16.20", default-features = false, features = ["alloc"] }
scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
serde = { default-features = false, version = "1.0.140", features = ["derive"] }
serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
webpki = { default-features = false, git = "https://github.com/scs/webpki-nostd.git", branch = "master" }
webpki = { git = "https://github.com/rustls/webpki", version = "=0.102.0-alpha.3", rev = "da923ed", package = "rustls-webpki", default-features = false, features = ["alloc", "ring"] }
x509-cert = { default-features = false, version = "0.1.0", features = ["alloc"] }

# local
Expand Down
Loading

0 comments on commit 9fba4e2

Please sign in to comment.