From a7d1f4e3b08f66aa8511179989de7ad0b2d14c69 Mon Sep 17 00:00:00 2001 From: Assaf Morami Date: Mon, 3 Oct 2022 19:58:00 +0300 Subject: [PATCH] Update some deps --- .gitignore | 3 +- .vscode/settings.json | 7 +- cosmwasm/Cargo.lock | 4 +- cosmwasm/enclaves/Cargo.lock | 146 ++-- cosmwasm/enclaves/Xargo.toml | 46 +- cosmwasm/enclaves/execute/Cargo.toml | 38 +- cosmwasm/enclaves/query/Cargo.toml | 23 +- .../shared/contract-engine/Cargo.toml | 4 +- .../enclaves/shared/cosmos-types/Cargo.toml | 2 +- .../shared/cosmwasm-types/v0.10/Cargo.toml | 2 +- .../shared/cosmwasm-types/v1.0/Cargo.toml | 2 +- cosmwasm/enclaves/shared/crypto/Cargo.toml | 6 +- cosmwasm/enclaves/shared/utils/Cargo.toml | 6 +- cosmwasm/enclaves/test/Cargo.lock | 282 +++---- cosmwasm/enclaves/xargo/sgx_tstd/cargo.toml | 16 +- cosmwasm/packages/sgx-vm/Cargo.lock | 755 ------------------ cosmwasm/packages/sgx-vm/Cargo.toml | 5 +- go-cosmwasm/Cargo.lock | 6 +- go-cosmwasm/Cargo.toml | 10 +- third_party/build/Cargo.lock | 4 +- third_party/build/Cargo.toml | 2 +- 21 files changed, 302 insertions(+), 1067 deletions(-) delete mode 100644 cosmwasm/packages/sgx-vm/Cargo.lock diff --git a/.gitignore b/.gitignore index 57427ff66..9f8a1c814 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,5 @@ x/compute/internal/keeper/testdata/ibc.wasm x/compute/internal/keeper/testdata/static-too-high-initial-memory.wasm x/compute/internal/keeper/testdata/too-high-initial-memory.wasm x/compute/internal/keeper/testdata/v1-contract.wasm -/github.com \ No newline at end of file +/github.com +third_party/build \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index f19751d70..acf03e7a5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,13 +1,16 @@ { "rust-analyzer.linkedProjects": [ "cosmwasm/Cargo.toml", + "cosmwasm/enclaves/test/Cargo.toml", + "cosmwasm/packages/sgx-vm/Cargo.toml", + "go-cosmwasm/Cargo.toml", + "third_party/build/Cargo.toml", "cosmwasm/enclaves/Cargo.toml", "cosmwasm/contracts/v1/compute-tests/test-compute-contract/Cargo.toml", "cosmwasm/contracts/v1/compute-tests/ibc-test-contract/Cargo.toml", "cosmwasm/contracts/v010/compute-tests/test-compute-contract/Cargo.toml", "integration-tests/contract-v1/Cargo.toml", - "integration-tests/contract-v0.10/Cargo.toml", - "go-cosmwasm/Cargo.toml" + "integration-tests/contract-v0.10/Cargo.toml" ], "rust-analyzer.diagnostics.experimental.enable": true, "rust-analyzer.rustfmt.rangeFormatting.enable": true, diff --git a/cosmwasm/Cargo.lock b/cosmwasm/Cargo.lock index db2953ab7..dc70a4676 100644 --- a/cosmwasm/Cargo.lock +++ b/cosmwasm/Cargo.lock @@ -547,12 +547,12 @@ dependencies = [ [[package]] name = "sgx_types" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" [[package]] name = "sgx_urts" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" dependencies = [ "libc", "sgx_types", diff --git a/cosmwasm/enclaves/Cargo.lock b/cosmwasm/enclaves/Cargo.lock index 9ff578ec6..0c2108146 100644 --- a/cosmwasm/enclaves/Cargo.lock +++ b/cosmwasm/enclaves/Cargo.lock @@ -346,7 +346,7 @@ dependencies = [ "log", "serde 1.0.118", "serde_json 1.0.60", - "sgx_tstd 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", + "sgx_tstd 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", ] [[package]] @@ -361,7 +361,7 @@ dependencies = [ "log", "serde 1.0.118", "serde_json 1.0.60", - "sgx_tstd 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", + "sgx_tstd 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", "thiserror", "uint", ] @@ -488,8 +488,8 @@ dependencies = [ "secp256k1", "serde 1.0.118", "serde_json 1.0.60", - "sgx_tstd 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_types 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", + "sgx_tstd 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_types 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", "sha2 0.8.2", "wasmi", ] @@ -508,7 +508,7 @@ dependencies = [ "prost", "protobuf", "serde 1.0.118", - "sgx_tstd 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", + "sgx_tstd 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", "sha2 0.8.2", ] @@ -526,9 +526,9 @@ dependencies = [ "ring", "ripemd160", "secp256k1", - "sgx_trts 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_tstd 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_types 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", + "sgx_trts 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_tstd 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_types 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", "sha2 0.8.2", "sha3", "x25519-dalek", @@ -541,9 +541,9 @@ dependencies = [ "enclave-ffi-types", "lazy_static", "log", - "sgx_trts 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_tstd 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_types 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", + "sgx_trts 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_tstd 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_types 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", ] [[package]] @@ -605,12 +605,12 @@ dependencies = [ [[package]] name = "hashbrown_tstd" version = "0.9.0" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0" [[package]] name = "hashbrown_tstd" version = "0.9.0" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" [[package]] name = "hermit-abi" @@ -1066,8 +1066,8 @@ dependencies = [ "sgx_rand", "sgx_tcrypto", "sgx_tse", - "sgx_tstd 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_types 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", + "sgx_tstd 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_types 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", "simple_logger", "uuid", "webpki", @@ -1085,8 +1085,8 @@ dependencies = [ "lazy_static", "log", "sgx_edl", - "sgx_tstd 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_types 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", + "sgx_tstd 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_types 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", "simple_logger", ] @@ -1160,99 +1160,90 @@ dependencies = [ [[package]] name = "sgx_alloc" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0" [[package]] name = "sgx_alloc" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" [[package]] name = "sgx_backtrace_sys" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0" dependencies = [ "cc", - "sgx_build_helper 0.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_libc 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", + "sgx_build_helper 0.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3)", + "sgx_libc 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3)", ] [[package]] name = "sgx_backtrace_sys" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" dependencies = [ "cc", - "sgx_build_helper 0.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3)", - "sgx_libc 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3)", + "sgx_build_helper 0.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_libc 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", ] [[package]] name = "sgx_build_helper" version = "0.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0" [[package]] name = "sgx_build_helper" version = "0.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" [[package]] name = "sgx_demangle" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0" [[package]] name = "sgx_demangle" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" [[package]] name = "sgx_edl" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" [[package]] name = "sgx_libc" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0" dependencies = [ - "sgx_types 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", + "sgx_types 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3)", ] [[package]] name = "sgx_libc" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" dependencies = [ - "sgx_types 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3)", + "sgx_types 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", ] [[package]] name = "sgx_rand" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" dependencies = [ - "sgx_trts 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_tstd 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_types 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", + "sgx_trts 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_tstd 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_types 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", ] [[package]] name = "sgx_tcrypto" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" -dependencies = [ - "sgx_types 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", -] - -[[package]] -name = "sgx_tprotected_fs" -version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" dependencies = [ - "sgx_trts 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_types 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", + "sgx_types 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", ] [[package]] @@ -1265,12 +1256,12 @@ dependencies = [ ] [[package]] -name = "sgx_trts" +name = "sgx_tprotected_fs" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" dependencies = [ - "sgx_libc 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_types 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", + "sgx_trts 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_types 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", ] [[package]] @@ -1283,27 +1274,20 @@ dependencies = [ ] [[package]] -name = "sgx_tse" +name = "sgx_trts" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" dependencies = [ - "sgx_types 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", + "sgx_libc 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_types 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", ] [[package]] -name = "sgx_tstd" +name = "sgx_tse" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" dependencies = [ - "hashbrown_tstd 0.9.0 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_alloc 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_backtrace_sys 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_demangle 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_libc 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_tprotected_fs 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_trts 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_types 1.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", - "sgx_unwind 0.1.1 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", + "sgx_types 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", ] [[package]] @@ -1323,29 +1307,45 @@ dependencies = [ ] [[package]] -name = "sgx_types" +name = "sgx_tstd" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" +dependencies = [ + "hashbrown_tstd 0.9.0 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_alloc 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_backtrace_sys 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_demangle 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_libc 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_tprotected_fs 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_trts 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_types 1.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", + "sgx_unwind 0.1.1 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", +] [[package]] name = "sgx_types" version = "1.1.3" source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0" +[[package]] +name = "sgx_types" +version = "1.1.3" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" + [[package]] name = "sgx_unwind" version = "0.1.1" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0" dependencies = [ - "sgx_build_helper 0.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269)", + "sgx_build_helper 0.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3)", ] [[package]] name = "sgx_unwind" version = "0.1.1" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" dependencies = [ - "sgx_build_helper 0.1.3 (git+https://github.com/apache/teaclave-sgx-sdk.git?rev=v1.1.3)", + "sgx_build_helper 0.1.3 (git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret)", ] [[package]] diff --git a/cosmwasm/enclaves/Xargo.toml b/cosmwasm/enclaves/Xargo.toml index 559df97b4..0fec47754 100644 --- a/cosmwasm/enclaves/Xargo.toml +++ b/cosmwasm/enclaves/Xargo.toml @@ -1,29 +1,29 @@ [dependencies] alloc = { } -sgx_types = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 1 } -sgx_alloc = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 1 } -sgx_unwind = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 1 } -sgx_demangle = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 1 } -panic_abort = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 1 } -sgx_libc = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 2 } -sgx_tkey_exchange = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 2 } -sgx_tse = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 2 } -sgx_tcrypto = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 2 } -sgx_trts = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 3 } -sgx_backtrace_sys = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 3 } -panic_unwind = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 3 } -sgx_tdh = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 4 } -sgx_tseal = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 4 } -sgx_tprotected_fs = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 4 } -std = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 5, features = [ +sgx_types = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 1 } +sgx_alloc = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 1 } +sgx_unwind = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 1 } +sgx_demangle = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 1 } +panic_abort = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 1 } +sgx_libc = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 2 } +sgx_tkey_exchange = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 2 } +sgx_tse = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 2 } +sgx_tcrypto = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 2 } +sgx_trts = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 3 } +sgx_backtrace_sys = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 3 } +panic_unwind = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 3 } +sgx_tdh = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 4 } +sgx_tseal = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 4 } +sgx_tprotected_fs = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 4 } +std = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 5, features = [ "net", "backtrace", "untrusted_fs", ] } -sgx_no_tstd = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 5 } -sgx_rand = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 6 } -sgx_serialize = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 6 } -sgx_tunittest = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 6 } -sgx_backtrace = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 7 } -sgx_cov = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 7 } -sgx_signal = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", stage = 7 } +sgx_no_tstd = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 5 } +sgx_rand = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 6 } +sgx_serialize = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 6 } +sgx_tunittest = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 6 } +sgx_backtrace = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 7 } +sgx_cov = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 7 } +sgx_signal = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret", stage = 7 } diff --git a/cosmwasm/enclaves/execute/Cargo.toml b/cosmwasm/enclaves/execute/Cargo.toml index ea0c04650..1292094be 100644 --- a/cosmwasm/enclaves/execute/Cargo.toml +++ b/cosmwasm/enclaves/execute/Cargo.toml @@ -13,43 +13,47 @@ crate-type = ["staticlib"] default = ["SGX_MODE_SW"] SGX_MODE_SW = [] SGX_MODE_HW = [] -production = ["SGX_MODE_HW", "enclave_crypto/production", "enclave_utils/production", "log/max_level_warn", "log/release_max_level_warn"] +production = [ + "SGX_MODE_HW", + "enclave_crypto/production", + "enclave_utils/production", + "log/max_level_warn", + "log/release_max_level_warn" +] debug-print = ["enclave_contract_engine/debug-print"] -test = ["enclave_contract_engine/test", "enclave_crypto/test", "enclave_cosmos_types/test"] +test = [ + "enclave_contract_engine/test", + "enclave_crypto/test", + "enclave_cosmos_types/test" +] # This annotation is here to trick the IDE into showing us type information about this crate. # We always compile to the "sgx" target, so this will always be false. # when compiling to the "sgx" target, we pull this from the target root with an "extern crate" directive [target.'cfg(not(target_env = "sgx"))'.dependencies] -sgx_tstd = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git", features = [ - "backtrace" +sgx_tstd = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", features = [ + "backtrace" ] } -sgx_types = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git" } +sgx_types = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git" } [dependencies] -sgx_tse = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git" } -sgx_rand = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git" } -sgx_tcrypto = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git" } - +sgx_tse = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git" } +sgx_rand = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git" } +sgx_tcrypto = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git" } enclave-ffi-types = { path = "../ffi-types" } - enclave_contract_engine = { path = "../shared/contract-engine" } enclave_crypto = { path = "../shared/crypto" } enclave_utils = { path = "../shared/utils" } enclave_cosmos_types = { path = "../shared/cosmos-types", optional = true } - serde = { git = "https://github.com/mesalock-linux/serde-sgx", features = [ "derive" ] } serde_json = { git = "https://github.com/mesalock-linux/serde-json-sgx" } ctor = "0.1.13" derive_more = "0.99" - pwasm-utils = { version = "0.12.0", default-features = false } parity-wasm = { version = "0.41.0", default-features = false } - base64 = { rev = "dc7389e10817b078f289386b3b6a852ab6c4c021", git = "https://github.com/mesalock-linux/rust-base64-sgx" } - # for attestation chrono = { git = "https://github.com/mesalock-linux/chrono-sgx" } num-bigint = { git = "https://github.com/mesalock-linux/num-bigint-sgx" } @@ -60,7 +64,9 @@ bit-vec = { version = "0.6", default-features = false } lazy_static = "1.4" hex = "0.4.2" log = "0.4.17" -simple_logger = { version = "2.3.0", default-features = false, features = ["stderr"] } +simple_logger = { version = "2.3.0", default-features = false, features = [ + "stderr" +] } [dependencies.webpki] git = "https://github.com/mesalock-linux/webpki" @@ -83,4 +89,4 @@ default-features = false features = ["dangerous_configuration", "mesalock_sgx"] [dev-dependencies] -sgx_edl = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git" } +sgx_edl = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git" } diff --git a/cosmwasm/enclaves/query/Cargo.toml b/cosmwasm/enclaves/query/Cargo.toml index 5f4858d30..02f33eda7 100644 --- a/cosmwasm/enclaves/query/Cargo.toml +++ b/cosmwasm/enclaves/query/Cargo.toml @@ -13,27 +13,34 @@ crate-type = ["staticlib"] default = ["SGX_MODE_SW"] SGX_MODE_SW = [] SGX_MODE_HW = [] -production = ["SGX_MODE_HW", "enclave_utils/production", "log/max_level_warn", "log/release_max_level_warn"] +production = [ + "SGX_MODE_HW", + "enclave_utils/production", + "log/max_level_warn", + "log/release_max_level_warn" +] debug-print = ["enclave_contract_engine/debug-print"] # This annotation is here to trick the IDE into showing us type information about this crate. # We always compile to the "sgx" target, so this will always be false. # when compiling to the "sgx" target, we pull this from the target root with an "extern crate" directive [target.'cfg(not(target_env = "sgx"))'.dependencies] -sgx_tstd = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git", features = [ +sgx_tstd = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", features = [ "backtrace" ] } -sgx_types = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git" } +sgx_types = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git" } [dependencies] -enclave_contract_engine = { path = "../shared/contract-engine", features = ["query-only"] } +enclave_contract_engine = { path = "../shared/contract-engine", features = [ + "query-only" +] } enclave_utils = { path = "../shared/utils", features = ["query-only"] } - log = "0.4.17" -simple_logger = { version = "2.3.0", default-features = false, features = ["stderr"] } +simple_logger = { version = "2.3.0", default-features = false, features = [ + "stderr" +] } ctor = "0.1.13" [dev-dependencies] -sgx_edl = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git" } - +sgx_edl = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git" } lazy_static = "1.4" diff --git a/cosmwasm/enclaves/shared/contract-engine/Cargo.toml b/cosmwasm/enclaves/shared/contract-engine/Cargo.toml index fdff6391f..e9f44b8df 100644 --- a/cosmwasm/enclaves/shared/contract-engine/Cargo.toml +++ b/cosmwasm/enclaves/shared/contract-engine/Cargo.toml @@ -13,10 +13,10 @@ test = [] # We always compile to the "sgx" target, so this will always be false. # when compiling to the "sgx" target, we pull this from the target root with an "extern crate" directive [target.'cfg(not(target_env = "sgx"))'.dependencies] -sgx_tstd = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git", features = [ +sgx_tstd = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", features = [ "backtrace" ] } -sgx_types = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git" } +sgx_types = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git" } [dependencies] enclave-ffi-types = { path = "../../ffi-types" } diff --git a/cosmwasm/enclaves/shared/cosmos-types/Cargo.toml b/cosmwasm/enclaves/shared/cosmos-types/Cargo.toml index e9c5ece00..0010365d4 100644 --- a/cosmwasm/enclaves/shared/cosmos-types/Cargo.toml +++ b/cosmwasm/enclaves/shared/cosmos-types/Cargo.toml @@ -11,7 +11,7 @@ test = [] # We always compile to the "sgx" target, so this will always be false. # when compiling to the "sgx" target, we pull this from the target root with an "extern crate" directive [target.'cfg(not(target_env = "sgx"))'.dependencies] -sgx_tstd = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git", features = [ +sgx_tstd = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", features = [ "backtrace" ] } diff --git a/cosmwasm/enclaves/shared/cosmwasm-types/v0.10/Cargo.toml b/cosmwasm/enclaves/shared/cosmwasm-types/v0.10/Cargo.toml index ecbde79fe..a24efd061 100644 --- a/cosmwasm/enclaves/shared/cosmwasm-types/v0.10/Cargo.toml +++ b/cosmwasm/enclaves/shared/cosmwasm-types/v0.10/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" # We always compile to the "sgx" target, so this will always be false. # when compiling to the "sgx" target, we pull this from the target root with an "extern crate" directive [target.'cfg(not(target_env = "sgx"))'.dependencies] -sgx_tstd = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git", features = [ +sgx_tstd = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", features = [ "backtrace" ] } diff --git a/cosmwasm/enclaves/shared/cosmwasm-types/v1.0/Cargo.toml b/cosmwasm/enclaves/shared/cosmwasm-types/v1.0/Cargo.toml index 10794b5b2..4787df3d8 100644 --- a/cosmwasm/enclaves/shared/cosmwasm-types/v1.0/Cargo.toml +++ b/cosmwasm/enclaves/shared/cosmwasm-types/v1.0/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" # We always compile to the "sgx" target, so this will always be false. # when compiling to the "sgx" target, we pull this from the target root with an "extern crate" directive [target.'cfg(not(target_env = "sgx"))'.dependencies] -sgx_tstd = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git", features = [ +sgx_tstd = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", features = [ "backtrace" ] } diff --git a/cosmwasm/enclaves/shared/crypto/Cargo.toml b/cosmwasm/enclaves/shared/crypto/Cargo.toml index 8730879cf..dba08be2e 100644 --- a/cosmwasm/enclaves/shared/crypto/Cargo.toml +++ b/cosmwasm/enclaves/shared/crypto/Cargo.toml @@ -12,13 +12,13 @@ test = [] # We always compile to the "sgx" target, so this will always be false. # when compiling to the "sgx" target, we pull this from the target root with an "extern crate" directive [target.'cfg(not(target_env = "sgx"))'.dependencies] -sgx_tstd = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git", features = [ +sgx_tstd = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", features = [ "backtrace" ] } -sgx_types = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git" } +sgx_types = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git" } [dependencies] -sgx_trts = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git" } +sgx_trts = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git" } enclave-ffi-types = { path = "../../ffi-types" } log = "0.4.8" derive_more = "0.99" diff --git a/cosmwasm/enclaves/shared/utils/Cargo.toml b/cosmwasm/enclaves/shared/utils/Cargo.toml index d98fa6a90..52cdd8991 100644 --- a/cosmwasm/enclaves/shared/utils/Cargo.toml +++ b/cosmwasm/enclaves/shared/utils/Cargo.toml @@ -12,13 +12,13 @@ query-only = [] # We always compile to the "sgx" target, so this will always be false. # when compiling to the "sgx" target, we pull this from the target root with an "extern crate" directive [target.'cfg(not(target_env = "sgx"))'.dependencies] -sgx_tstd = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git", features = [ +sgx_tstd = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", features = [ "backtrace" ] } -sgx_types = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git" } +sgx_types = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git" } [dependencies] -sgx_trts = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git" } +sgx_trts = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git" } enclave-ffi-types = { path = "../../ffi-types" } log = "0.4.17" lazy_static = "1.4" diff --git a/cosmwasm/enclaves/test/Cargo.lock b/cosmwasm/enclaves/test/Cargo.lock index afdd7cc94..ad8a7b54b 100644 --- a/cosmwasm/enclaves/test/Cargo.lock +++ b/cosmwasm/enclaves/test/Cargo.lock @@ -2,9 +2,9 @@ # It is not intended for manual editing. [[package]] name = "ansi_term" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ "winapi", ] @@ -20,6 +20,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + [[package]] name = "base64" version = "0.11.0" @@ -34,9 +40,9 @@ checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "block-buffer" @@ -64,12 +70,6 @@ dependencies = [ "toml", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -78,9 +78,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "2.33.1" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ "ansi_term", "atty", @@ -91,6 +91,12 @@ dependencies = [ "vec_map", ] +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + [[package]] name = "cosmwasm-sgx-vm" version = "0.10.0" @@ -115,19 +121,24 @@ dependencies = [ ] [[package]] -name = "cpuid-bool" -version = "0.1.2" +name = "cpufeatures" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] [[package]] name = "derive_more" -version = "0.99.9" +version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298998b1cf6b5b2c8a7b023dfd45821825ce3ba8a8af55c921a0e734e4653f76" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ + "convert_case", "proc-macro2", "quote", + "rustc_version", "syn", ] @@ -163,40 +174,38 @@ dependencies = [ ] [[package]] -name = "generic-array" -version = "0.14.4" +name = "fastrand" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" dependencies = [ - "typenum", - "version_check", + "instant", ] [[package]] -name = "getrandom" -version = "0.1.14" +name = "generic-array" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ - "cfg-if 0.1.10", - "libc", - "wasi", + "typenum", + "version_check", ] [[package]] name = "hermit-abi" -version = "0.1.15" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] [[package]] name = "hex" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "instant" @@ -204,14 +213,14 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] name = "itoa" -version = "0.4.6" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" +checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" [[package]] name = "lazy_static" @@ -221,26 +230,27 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.116" +version = "0.2.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74" +checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb" [[package]] name = "lock_api" -version = "0.4.6" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ + "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.11" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", ] [[package]] @@ -292,90 +302,37 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "instant", "libc", - "redox_syscall 0.2.10", + "redox_syscall", "smallvec", "winapi", ] -[[package]] -name = "ppv-lite86" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" - [[package]] name = "proc-macro2" -version = "1.0.19" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" +checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] name = "quote" -version = "1.0.7" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - [[package]] name = "redox_syscall" -version = "0.2.10" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ "bitflags", ] @@ -389,11 +346,20 @@ dependencies = [ "winapi", ] +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + [[package]] name = "ryu" -version = "1.0.5" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" [[package]] name = "schemars" @@ -426,7 +392,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "secret-cosmwasm-std" -version = "0.10.0" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4b8fed972d924458d9c3c0e6c9fbf6c4c5e30655571e3d2b78be056d316e9" dependencies = [ "base64 0.11.0", "schemars", @@ -435,29 +403,35 @@ dependencies = [ "snafu", ] +[[package]] +name = "semver" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" + [[package]] name = "serde" -version = "1.0.117" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a" +checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" dependencies = [ "serde_derive", ] [[package]] name = "serde-json-wasm" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7294d94d390f1d2334697c065ea591d7074c676e2d20aa6f1df752fced29823f" +checksum = "120bad73306616e91acd7ceed522ba96032a51cffeef3cc813de7f367df71e37" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.117" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e" +checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" dependencies = [ "proc-macro2", "quote", @@ -477,9 +451,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.57" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" +checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" dependencies = [ "itoa", "ryu", @@ -489,12 +463,12 @@ dependencies = [ [[package]] name = "sgx_types" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" [[package]] name = "sgx_urts" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" dependencies = [ "libc", "sgx_types", @@ -502,28 +476,28 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.1" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer", - "cfg-if 0.1.10", - "cpuid-bool", + "cfg-if", + "cpufeatures", "digest", "opaque-debug", ] [[package]] name = "smallvec" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "snafu" -version = "0.6.8" +version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f5aed652511f5c9123cf2afbe9c244c29db6effa2abb05c866e965c82405ce" +checksum = "eab12d3c261b2308b0d80c26fffb58d17eba81a4be97890101f416b478c79ca7" dependencies = [ "doc-comment", "snafu-derive", @@ -531,9 +505,9 @@ dependencies = [ [[package]] name = "snafu-derive" -version = "0.6.8" +version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebf8f7d5720104a9df0f7076a8682024e958bba0fe9848767bb44f251f3648e9" +checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b" dependencies = [ "proc-macro2", "quote", @@ -548,25 +522,25 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "syn" -version = "1.0.36" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cdb98bcb1f9d81d07b536179c269ea15999b5d14ea958196413869445bb5250" +checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] name = "tempfile" -version = "3.1.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ - "cfg-if 0.1.10", + "cfg-if", + "fastrand", "libc", - "rand", - "redox_syscall 0.1.57", + "redox_syscall", "remove_dir_all", "winapi", ] @@ -582,18 +556,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.20" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.20" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ "proc-macro2", "quote", @@ -602,30 +576,30 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.6" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "serde", ] [[package]] name = "typenum" -version = "1.12.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] -name = "unicode-width" -version = "0.1.8" +name = "unicode-ident" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" [[package]] -name = "unicode-xid" -version = "0.2.1" +name = "unicode-width" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "vec_map" @@ -635,15 +609,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "winapi" diff --git a/cosmwasm/enclaves/xargo/sgx_tstd/cargo.toml b/cosmwasm/enclaves/xargo/sgx_tstd/cargo.toml index c006017b0..7a5852fa7 100644 --- a/cosmwasm/enclaves/xargo/sgx_tstd/cargo.toml +++ b/cosmwasm/enclaves/xargo/sgx_tstd/cargo.toml @@ -21,14 +21,14 @@ untrusted_fs = [] untrusted_time = [] [target.'cfg(not(target_env = "sgx"))'.dependencies] -sgx_types = { git = "https://github.com/apache/teaclave-sgx-sdk.git", ref = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269" } -sgx_libc = { git = "https://github.com/apache/teaclave-sgx-sdk.git", ref = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269" } -sgx_trts = { git = "https://github.com/apache/teaclave-sgx-sdk.git", ref = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269" } -sgx_alloc = { git = "https://github.com/apache/teaclave-sgx-sdk.git", ref = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269" } -sgx_tprotected_fs = { git = "https://github.com/apache/teaclave-sgx-sdk.git", ref = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269" } -sgx_backtrace_sys = { git = "https://github.com/apache/teaclave-sgx-sdk.git", ref = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269" } -sgx_demangle = { git = "https://github.com/apache/teaclave-sgx-sdk.git", ref = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269" } -sgx_unwind = { git = "https://github.com/apache/teaclave-sgx-sdk.git", ref = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269" } +sgx_types = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret" } +sgx_libc = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret" } +sgx_trts = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret" } +sgx_alloc = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret" } +sgx_tprotected_fs = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret" } +sgx_backtrace_sys = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret" } +sgx_demangle = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret" } +sgx_unwind = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret" } [dependencies.hashbrown] package = "hashbrown_tstd" diff --git a/cosmwasm/packages/sgx-vm/Cargo.lock b/cosmwasm/packages/sgx-vm/Cargo.lock deleted file mode 100644 index 62bed248a..000000000 --- a/cosmwasm/packages/sgx-vm/Cargo.lock +++ /dev/null @@ -1,755 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "addr2line" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "backtrace" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] -name = "cbindgen" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2db2df1ebc842c41fd2c4ae5b5a577faf63bd5151b953db752fc686812bee318" -dependencies = [ - "clap", - "log", - "proc-macro2", - "quote", - "serde", - "serde_json", - "syn", - "tempfile", - "toml", -] - -[[package]] -name = "cc" -version = "1.0.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "2.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "cmake" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855" -dependencies = [ - "cc", -] - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "cosmwasm-sgx-vm" -version = "0.10.0" -dependencies = [ - "base64 0.12.3", - "cosmwasm-std", - "enclave-ffi-types", - "hex", - "lazy_static", - "log", - "memmap", - "parity-wasm", - "schemars", - "serde", - "serde_json", - "sgx_types", - "sgx_urts", - "sha2", - "snafu", - "tempfile", - "wabt", -] - -[[package]] -name = "cosmwasm-std" -version = "0.10.0" -source = "git+https://github.com/enigmampc/SecretNetwork?tag=v1.0.4-debug-print#004c6bca6f2b7f31a6594abe4f44f2e41b1456b3" -dependencies = [ - "base64 0.11.0", - "schemars", - "serde", - "serde-json-wasm", - "snafu", -] - -[[package]] -name = "cpufeatures" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" -dependencies = [ - "libc", -] - -[[package]] -name = "derive_more" -version = "0.99.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40eebddd2156ce1bb37b20bbe5151340a31828b1f2d22ba4141f3531710e38df" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version", - "syn", -] - -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "enclave-ffi-types" -version = "0.1.0" -dependencies = [ - "cbindgen", - "derive_more", - "thiserror", -] - -[[package]] -name = "generic-array" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" - -[[package]] -name = "glob" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.101" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21" - -[[package]] -name = "log" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "memchr" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" - -[[package]] -name = "memmap" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - -[[package]] -name = "object" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f37e50073ccad23b6d09bcb5b263f4e76d3bb6038e4a3c08e52162ffa8abc2" -dependencies = [ - "memchr", -] - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "parity-wasm" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc878dac00da22f8f61e7af3157988424567ab01d9920b962ef7dcbd7cd865" - -[[package]] -name = "pest" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" -dependencies = [ - "ucd-trie", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - -[[package]] -name = "proc-macro2" -version = "1.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quote" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core", -] - -[[package]] -name = "redox_syscall" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" -dependencies = [ - "bitflags", -] - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver", -] - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "schemars" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be77ed66abed6954aabf6a3e31a84706bedbf93750d267e92ef4a6d90bbd6a61" -dependencies = [ - "schemars_derive", - "serde", - "serde_json", -] - -[[package]] -name = "schemars_derive" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11af7a475c9ee266cfaa9e303a47c830ebe072bf3101ab907a7b7b9d816fa01d" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - -[[package]] -name = "serde" -version = "1.0.130" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-json-wasm" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120bad73306616e91acd7ceed522ba96032a51cffeef3cc813de7f367df71e37" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.130" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_derive_internals" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dbab34ca63057a1f15280bdf3c39f2b1eb1b54c17e98360e511637aef7418c6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.67" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f9e390c27c3c0ce8bc5d725f6e4d30a29d26659494aa4b17535f7522c5c950" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sgx_types" -version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" - -[[package]] -name = "sgx_urts" -version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" -dependencies = [ - "libc", - "sgx_types", -] - -[[package]] -name = "sha2" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" -dependencies = [ - "block-buffer", - "cfg-if", - "cpufeatures", - "digest", - "opaque-debug", -] - -[[package]] -name = "snafu" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab12d3c261b2308b0d80c26fffb58d17eba81a4be97890101f416b478c79ca7" -dependencies = [ - "backtrace", - "doc-comment", - "snafu-derive", -] - -[[package]] -name = "snafu-derive" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "syn" -version = "1.0.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "tempfile" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" -dependencies = [ - "cfg-if", - "libc", - "rand", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "toml" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" -dependencies = [ - "serde", -] - -[[package]] -name = "typenum" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" - -[[package]] -name = "ucd-trie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version_check" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" - -[[package]] -name = "wabt" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b5f5d6984ca42df66280baa8a15ac188a173ddaf4580b574a98931c01920e7" -dependencies = [ - "serde", - "serde_derive", - "serde_json", - "wabt-sys", -] - -[[package]] -name = "wabt-sys" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b064c81821100adb4b71923cecfc67fef083db21c3bbd454b0162c7ffe63eeaa" -dependencies = [ - "cc", - "cmake", - "glob", -] - -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/cosmwasm/packages/sgx-vm/Cargo.toml b/cosmwasm/packages/sgx-vm/Cargo.toml index af624fa89..1da1f448f 100644 --- a/cosmwasm/packages/sgx-vm/Cargo.toml +++ b/cosmwasm/packages/sgx-vm/Cargo.toml @@ -58,14 +58,13 @@ sha2 = "0.9.1" hex = "0.4" memmap = "0.7" parity-wasm = "0.41" - # requirements specific to Secret Network lazy_static = "1.4" enclave-ffi-types = { path = "../../enclaves/ffi-types", features = [ "build_headers" ] } -sgx_types = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269" } -sgx_urts = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269" } +sgx_types = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret" } +sgx_urts = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret" } log = "0.4.8" base64 = "0.12.0" parking_lot = "0.11" diff --git a/go-cosmwasm/Cargo.lock b/go-cosmwasm/Cargo.lock index ca93f84c4..8bb7a3766 100644 --- a/go-cosmwasm/Cargo.lock +++ b/go-cosmwasm/Cargo.lock @@ -627,17 +627,17 @@ dependencies = [ [[package]] name = "sgx_edl" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" [[package]] name = "sgx_types" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" [[package]] name = "sgx_urts" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" dependencies = [ "libc", "sgx_types", diff --git a/go-cosmwasm/Cargo.toml b/go-cosmwasm/Cargo.toml index af09298a1..b3081ef63 100644 --- a/go-cosmwasm/Cargo.toml +++ b/go-cosmwasm/Cargo.toml @@ -36,7 +36,9 @@ debug-print = ["cosmwasm-sgx-vm/debug-print"] query-node = ["cosmwasm-sgx-vm/query-node"] [dependencies] -cosmwasm-std = { package = "secret-cosmwasm-std", features = ["iterator"], version = "0.10.1"} +cosmwasm-std = { package = "secret-cosmwasm-std", features = [ + "iterator" +], version = "0.10.1" } cosmwasm-sgx-vm = { path = "../cosmwasm/packages/sgx-vm", features = [ "iterator" ] } @@ -44,7 +46,9 @@ errno = "0.2" snafu = "0.6.3" serde_json = "1.0" ctor = "0.1.13" -simple_logger = { version = "2.3.0", default-features = false, features = ["stderr"] } +simple_logger = { version = "2.3.0", default-features = false, features = [ + "stderr" +] } log = "0.4.17" [dev-dependencies] @@ -53,7 +57,7 @@ tempfile = "3.1.0" [build-dependencies] cbindgen = { version = "0.14" } -sgx_edl = { git = "https://github.com/apache/teaclave-sgx-sdk.git", rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269" } +sgx_edl = { git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git", branch = "secret" } [profile.release] opt-level = 3 diff --git a/third_party/build/Cargo.lock b/third_party/build/Cargo.lock index c2f2ae500..9a997240a 100644 --- a/third_party/build/Cargo.lock +++ b/third_party/build/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "eng_edl" version = "0.0.0" @@ -10,4 +12,4 @@ dependencies = [ [[package]] name = "sgx_edl" version = "1.1.3" -source = "git+https://github.com/apache/teaclave-sgx-sdk.git?rev=a37ffb9449ba6d5b6e4a9d586bbab864ae732269#a37ffb9449ba6d5b6e4a9d586bbab864ae732269" +source = "git+https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git?branch=secret#29e29a2b2bafec2caa54d3bd55416567cfc620dc" diff --git a/third_party/build/Cargo.toml b/third_party/build/Cargo.toml index da3c66d16..f56a0bc43 100644 --- a/third_party/build/Cargo.toml +++ b/third_party/build/Cargo.toml @@ -9,4 +9,4 @@ edition = "2018" name = "eng_edl" [dependencies] -sgx_edl = { rev = "a37ffb9449ba6d5b6e4a9d586bbab864ae732269", git = "https://github.com/apache/teaclave-sgx-sdk.git" } +sgx_edl = { branch = "secret", git = "https://github.com/scrtlabs/incubator-teaclave-sgx-sdk.git" }