diff --git a/Cargo.lock b/Cargo.lock index 2b0dac74..9114a560 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1693,17 +1693,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "num-format" version = "0.4.4" @@ -2265,26 +2254,6 @@ dependencies = [ "cc", ] -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "quote" version = "1.0.33" @@ -2463,41 +2432,16 @@ dependencies = [ [[package]] name = "ring" version = "0.16.20" -source = "git+https://github.com/betrusted-io/ring-xous?branch=0.16.20-cleanup#4296c2e7904898766cf7d8d589759a129794783b" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" dependencies = [ "cc", "libc", - "log", "once_cell", - "rkyv", "spin", "untrusted 0.7.1", + "web-sys", "winapi", - "xous", - "xous-api-names", - "xous-ipc", -] - -[[package]] -name = "rkyv" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70de01b38fe7baba4ecdd33b777096d2b326993d8ea99bc5b6ede691883d3010" -dependencies = [ - "memoffset", - "ptr_meta", - "rkyv_derive", -] - -[[package]] -name = "rkyv_derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a169f6bc5a81033e86ed39d0f4150e2608160b73d2b93c6e8e6a3efa873f14" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", ] [[package]] @@ -4047,6 +3991,16 @@ dependencies = [ "wasmparser", ] +[[package]] +name = "web-sys" +version = "0.3.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "wide" version = "0.7.13" @@ -4313,54 +4267,6 @@ dependencies = [ "xcm", ] -[[package]] -name = "xous" -version = "0.9.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a9f0a696320940ab2652fa1d20c98dc59eb7ba4591eeb91a3b8e40bc9255a1" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "xous-api-log" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e07c190c743d6d9e076f715333e94c48de41b99078343d174c707803df28c7" -dependencies = [ - "log", - "num-derive", - "num-traits", - "xous", - "xous-ipc", -] - -[[package]] -name = "xous-api-names" -version = "0.9.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d8361077e67966d25922056284d17d042cbb1c96a7ebc2584eb8181427cbb0" -dependencies = [ - "log", - "num-derive", - "num-traits", - "rkyv", - "xous", - "xous-api-log", - "xous-ipc", -] - -[[package]] -name = "xous-ipc" -version = "0.9.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee1d318dacbd6242e4e2291dee7c4532249e5a0845de05d264c20fc871a0a1a" -dependencies = [ - "bitflags 1.3.2", - "rkyv", - "xous", -] - [[package]] name = "zerocopy" version = "0.7.26" diff --git a/Cargo.toml b/Cargo.toml index 1fa43ddd..ef62c903 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,4 @@ members = [ "primitives/teeracle", "primitives/common", "primitives/xcm-transactor", -] - -[patch.crates-io] -ring = { git = "https://github.com/betrusted-io/ring-xous", branch = "0.16.20-cleanup" } \ No newline at end of file +] \ No newline at end of file diff --git a/teerex/sgx-verify/Cargo.toml b/teerex/sgx-verify/Cargo.toml index a156fad5..6e13b051 100644 --- a/teerex/sgx-verify/Cargo.toml +++ b/teerex/sgx-verify/Cargo.toml @@ -16,7 +16,7 @@ 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/betrusted-io/ring-xous", branch = "0.16.20-cleanup", default-features = false, features = ["alloc"] } +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"] }