diff --git a/Cargo.lock b/Cargo.lock
index 4f09adf351..8006bdbe00 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2492,7 +2492,7 @@ dependencies = [
  "sc-keystore",
  "serde 1.0.147",
  "serde_json 1.0.87",
- "sgx_crypto_helper 1.1.6",
+ "sgx_crypto_helper",
  "sp-application-crypto",
  "sp-core",
  "sp-keyring",
@@ -2593,7 +2593,7 @@ dependencies = [
  "serde 1.0.147",
  "serde_derive 1.0.147",
  "serde_json 1.0.87",
- "sgx_crypto_helper 1.1.6",
+ "sgx_crypto_helper",
  "sgx_types",
  "sgx_urts",
  "sha2 0.7.1",
@@ -2956,7 +2956,7 @@ dependencies = [
  "rustls 0.19.1",
  "serde_derive 1.0.147",
  "serde_json 1.0.87",
- "sgx_crypto_helper 1.1.6",
+ "sgx_crypto_helper",
  "substrate-api-client",
  "thiserror 1.0.37",
  "url 2.3.1",
@@ -2999,7 +2999,7 @@ dependencies = [
  "rcgen",
  "rustls 0.19.0 (git+https://github.com/mesalock-linux/rustls?branch=mesalock_sgx)",
  "rustls 0.19.1",
- "sgx_crypto_helper 1.1.5",
+ "sgx_crypto_helper",
  "sgx_tstd",
  "sgx_types",
  "sp-core",
@@ -3134,7 +3134,7 @@ dependencies = [
  "mockall",
  "parity-scale-codec",
  "serde_json 1.0.87",
- "sgx_crypto_helper 1.1.6",
+ "sgx_crypto_helper",
  "sgx_types",
  "sgx_urts",
  "sp-core",
@@ -3298,7 +3298,7 @@ dependencies = [
  "serde 1.0.147",
  "serde_json 1.0.60 (git+https://github.com/mesalock-linux/serde-json-sgx?tag=sgx_1.1.3)",
  "serde_json 1.0.87",
- "sgx_crypto_helper 1.1.6",
+ "sgx_crypto_helper",
  "sgx_rand",
  "sgx_tstd",
  "sgx_types",
@@ -3357,7 +3357,7 @@ dependencies = [
  "itp-types",
  "log 0.4.17",
  "parity-scale-codec",
- "sgx_crypto_helper 1.1.6",
+ "sgx_crypto_helper",
  "sgx_tstd",
  "sgx_types",
  "sp-core",
@@ -3460,7 +3460,7 @@ dependencies = [
  "jsonrpc-core 18.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 18.0.0 (git+https://github.com/scs/jsonrpc?branch=no_std_v18)",
  "parity-scale-codec",
- "sgx_crypto_helper 1.1.6",
+ "sgx_crypto_helper",
  "sgx_tstd",
  "sgx_types",
  "sp-core",
@@ -3521,7 +3521,7 @@ dependencies = [
  "jsonrpc-core 18.0.0 (git+https://github.com/scs/jsonrpc?branch=no_std_v18)",
  "log 0.4.17",
  "parity-scale-codec",
- "sgx_crypto_helper 1.1.6",
+ "sgx_crypto_helper",
  "sgx_tstd",
  "sgx_types",
  "sp-core",
@@ -6630,20 +6630,6 @@ name = "sgx_build_helper"
 version = "1.1.6"
 source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 
-[[package]]
-name = "sgx_crypto_helper"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
-dependencies = [
- "itertools",
- "serde 1.0.118 (git+https://github.com/mesalock-linux/serde-sgx)",
- "serde-big-array 0.3.0",
- "serde_derive 1.0.118",
- "sgx_tcrypto",
- "sgx_tstd",
- "sgx_types",
-]
-
 [[package]]
 name = "sgx_crypto_helper"
 version = "1.1.6"
diff --git a/core/tls-websocket-server/Cargo.toml b/core/tls-websocket-server/Cargo.toml
index 817265959b..f30cdea50a 100644
--- a/core/tls-websocket-server/Cargo.toml
+++ b/core/tls-websocket-server/Cargo.toml
@@ -13,7 +13,7 @@ rcgen = { package = "rcgen", default-features = false, git = "https://github.com
 sgx_tstd = { optional = true, features = ["net", "thread"], git = "https://github.com/apache/teaclave-sgx-sdk.git", branch = "master" }
 sgx_types = { optional = true, git = "https://github.com/apache/teaclave-sgx-sdk.git", branch = "master" }
 # Todo: should not be needed here: #848
-sgx_crypto_helper = { default-features = false, optional = true, features = ["mesalock_sgx"], version = "1.1.5", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", tag = "v1.1.5" }
+sgx_crypto_helper = { default-features = false, optional = true, features = ["mesalock_sgx"], version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "v1.1.6-testing" }
 
 # sgx enabled external libraries
 mio-extras = { optional = true, default-features = false, git = "https://github.com/OverOrion/mio-extras-sgx", branch = "teaclave-v1.1.6-testing" }
diff --git a/enclave-runtime/Cargo.lock b/enclave-runtime/Cargo.lock
index bfed3414a2..1b8fda4177 100644
--- a/enclave-runtime/Cargo.lock
+++ b/enclave-runtime/Cargo.lock
@@ -109,7 +109,7 @@ version = "0.7.10"
 source = "git+https://github.com/mesalock-linux/aho-corasick-sgx#7558a97cdf02804f38ec4edd1c0bb0dc2866267f"
 dependencies = [
  "memchr 2.2.1",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -191,7 +191,7 @@ name = "base64"
 version = "0.13.0"
 source = "git+https://github.com/mesalock-linux/rust-base64-sgx?tag=sgx_1.1.3#dc7389e10817b078f289386b3b6a852ab6c4c021"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -199,7 +199,7 @@ name = "base64"
 version = "0.13.0"
 source = "git+https://github.com/mesalock-linux/rust-base64-sgx?rev=sgx_1.1.3#dc7389e10817b078f289386b3b6a852ab6c4c021"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -207,7 +207,7 @@ name = "base64"
 version = "0.13.0"
 source = "git+https://github.com/mesalock-linux/rust-base64-sgx#dc7389e10817b078f289386b3b6a852ab6c4c021"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -374,7 +374,7 @@ name = "byteorder"
 version = "1.3.4"
 source = "git+https://github.com/mesalock-linux/byteorder-sgx?tag=sgx_1.1.3#325f392dcd294109eb05f0a3c45e4141514c7784"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -388,7 +388,7 @@ name = "bytes"
 version = "1.0.1"
 source = "git+https://github.com/integritee-network/bytes-sgx?branch=sgx-experimental#62ed3082be2e23cb9bc8cc7ee9983a523de69292"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -422,7 +422,7 @@ source = "git+https://github.com/mesalock-linux/chrono-sgx#f964ae7f5f65bd2c9cd6f
 dependencies = [
  "num-integer 0.1.41",
  "num-traits 0.2.10",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -724,12 +724,12 @@ dependencies = [
  "sgx_serialize_derive",
  "sgx_tcrypto",
  "sgx_tcrypto_helper",
- "sgx_trts 1.1.5",
+ "sgx_trts",
  "sgx_tse",
  "sgx_tseal",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "sgx_tunittest",
- "sgx_types 1.1.5",
+ "sgx_types",
  "sp-core",
  "sp-runtime",
  "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.28)",
@@ -745,7 +745,7 @@ dependencies = [
  "humantime",
  "log 0.4.17",
  "regex 1.3.1",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "termcolor",
 ]
 
@@ -753,7 +753,7 @@ dependencies = [
 name = "environmental"
 version = "1.1.3"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -1061,7 +1061,7 @@ dependencies = [
  "futures-sink 0.3.8",
  "futures-task 0.3.8",
  "futures-util 0.3.8",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -1085,7 +1085,7 @@ source = "git+https://github.com/mesalock-linux/futures-rs-sgx#d54882f24ddf7d613
 dependencies = [
  "futures-core 0.3.8",
  "futures-sink 0.3.8",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -1103,7 +1103,7 @@ name = "futures-core"
 version = "0.3.8"
 source = "git+https://github.com/mesalock-linux/futures-rs-sgx#d54882f24ddf7d61327a067b2f608d6940a36444"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -1120,7 +1120,7 @@ dependencies = [
  "futures-core 0.3.8",
  "futures-task 0.3.8",
  "futures-util 0.3.8",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -1128,7 +1128,7 @@ name = "futures-io"
 version = "0.3.8"
 source = "git+https://github.com/mesalock-linux/futures-rs-sgx#d54882f24ddf7d61327a067b2f608d6940a36444"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -1165,7 +1165,7 @@ version = "0.3.8"
 source = "git+https://github.com/mesalock-linux/futures-rs-sgx#d54882f24ddf7d61327a067b2f608d6940a36444"
 dependencies = [
  "once_cell 1.4.0",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -1190,7 +1190,7 @@ dependencies = [
  "pin-utils",
  "proc-macro-hack",
  "proc-macro-nested",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "slab 0.4.2 (git+https://github.com/mesalock-linux/slab-sgx)",
 ]
 
@@ -1232,9 +1232,9 @@ version = "0.1.14"
 source = "git+https://github.com/mesalock-linux/getrandom-sgx#0aa9cc20c7dea713ccaac2c44430d625a395ebae"
 dependencies = [
  "cfg-if 0.1.10",
- "sgx_libc 1.1.5",
- "sgx_trts 1.1.5",
- "sgx_tstd 1.1.5",
+ "sgx_libc",
+ "sgx_trts",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -1243,9 +1243,9 @@ version = "0.2.3"
 source = "git+https://github.com/integritee-network/getrandom-sgx?branch=update-v2.3#0a4af01fe1df0e6200192e7a709fd18da413466e"
 dependencies = [
  "cfg-if 1.0.0",
- "sgx_libc 1.1.5",
- "sgx_trts 1.1.5",
- "sgx_tstd 1.1.5",
+ "sgx_libc",
+ "sgx_trts",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -1289,11 +1289,6 @@ dependencies = [
  "ahash",
 ]
 
-[[package]]
-name = "hashbrown_tstd"
-version = "0.12.0"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
-
 [[package]]
 name = "hashbrown_tstd"
 version = "0.12.0"
@@ -1323,7 +1318,7 @@ dependencies = [
  "bytes 1.0.1",
  "fnv",
  "itoa 0.4.5",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -1333,7 +1328,7 @@ source = "git+https://github.com/integritee-network/http_req#3723e88235f2b29bc1a
 dependencies = [
  "log 0.4.17",
  "rustls 0.19.0 (git+https://github.com/mesalock-linux/rustls?branch=mesalock_sgx)",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "unicase",
  "webpki",
  "webpki-roots 0.21.0 (git+https://github.com/mesalock-linux/webpki-roots?branch=mesalock_sgx)",
@@ -1344,7 +1339,7 @@ name = "httparse"
 version = "1.4.1"
 source = "git+https://github.com/integritee-network/httparse-sgx?branch=sgx-experimental#cc97e4b34d2c44a1e3df5bdebef446b9771f5cc3"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -1353,7 +1348,7 @@ version = "1.3.0"
 source = "git+https://github.com/mesalock-linux/humantime-sgx#c5243dfa36002c01adbc9aade288ead1b2c411cc"
 dependencies = [
  "quick-error",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -1362,7 +1357,7 @@ version = "0.2.0"
 source = "git+https://github.com/mesalock-linux/rust-url-sgx?tag=sgx_1.1.3#23832f3191456c2d4a0faab10952e1747be58ca8"
 dependencies = [
  "matches",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "unicode-bidi",
  "unicode-normalization",
 ]
@@ -1419,7 +1414,7 @@ name = "iovec"
 version = "0.1.4"
 source = "git+https://github.com/OverOrion/iovec-sgx?branch=teaclave-v1.1.6-testing#62538bcd4287dfb8398bb36c12f3e99f7dacb6a3"
 dependencies = [
- "sgx_libc 1.1.6",
+ "sgx_libc",
 ]
 
 [[package]]
@@ -1446,7 +1441,7 @@ dependencies = [
  "parity-scale-codec",
  "serde 1.0.147",
  "serde_json 1.0.87",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "substrate-fixed",
  "thiserror 1.0.9",
  "url",
@@ -1508,7 +1503,7 @@ dependencies = [
  "pallet-sudo",
  "parity-scale-codec",
  "rlp",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "sha3 0.10.6",
  "sp-application-crypto",
  "sp-core",
@@ -1528,8 +1523,8 @@ dependencies = [
  "log 0.4.17",
  "parity-scale-codec",
  "serde_json 1.0.87",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-runtime",
  "thiserror 1.0.9",
 ]
@@ -1547,8 +1542,8 @@ dependencies = [
  "itp-top-pool-author",
  "itp-types",
  "log 0.4.17",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-core",
  "sp-runtime",
  "thiserror 1.0.9",
@@ -1571,8 +1566,8 @@ dependencies = [
  "itc-parentchain-block-importer",
  "itp-block-import-queue",
  "log 0.4.17",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-runtime",
  "thiserror 1.0.9",
 ]
@@ -1590,8 +1585,8 @@ dependencies = [
  "itp-types",
  "log 0.4.17",
  "parity-scale-codec",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-runtime",
  "thiserror 1.0.9",
 ]
@@ -1613,8 +1608,8 @@ dependencies = [
  "itp-types",
  "log 0.4.17",
  "parity-scale-codec",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-core",
  "sp-runtime",
  "substrate-api-client",
@@ -1639,8 +1634,8 @@ dependencies = [
  "log 0.4.17",
  "num-traits 0.2.15",
  "parity-scale-codec",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-application-crypto",
  "sp-core",
  "sp-finality-grandpa",
@@ -1675,8 +1670,8 @@ dependencies = [
  "log 0.4.17",
  "serde 1.0.147",
  "serde_json 1.0.87",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "thiserror 1.0.9",
  "url",
 ]
@@ -1693,8 +1688,8 @@ dependencies = [
  "rcgen",
  "rustls 0.19.0 (git+https://github.com/mesalock-linux/rustls?branch=mesalock_sgx)",
  "sgx_crypto_helper",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-core",
  "thiserror 1.0.9",
  "tungstenite",
@@ -1716,7 +1711,7 @@ name = "itoa"
 version = "0.4.5"
 source = "git+https://github.com/mesalock-linux/itoa-sgx#295ee451f5ec74f25c299552b481beb445ea3eb7"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -1757,8 +1752,8 @@ dependencies = [
  "sgx_rand",
  "sgx_tcrypto",
  "sgx_tse",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-core",
  "sp-runtime",
  "thiserror 1.0.9",
@@ -1772,8 +1767,8 @@ name = "itp-block-import-queue"
 version = "0.8.0"
 dependencies = [
  "log 0.4.17",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-runtime",
  "thiserror 1.0.9",
 ]
@@ -1782,7 +1777,7 @@ dependencies = [
 name = "itp-component-container"
 version = "0.8.0"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "thiserror 1.0.9",
 ]
 
@@ -1791,8 +1786,8 @@ name = "itp-enclave-metrics"
 version = "0.9.0"
 dependencies = [
  "parity-scale-codec",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "substrate-fixed",
 ]
 
@@ -1805,8 +1800,8 @@ dependencies = [
  "itp-types",
  "log 0.4.17",
  "parity-scale-codec",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-core",
  "sp-runtime",
  "substrate-api-client",
@@ -1844,7 +1839,7 @@ name = "itp-node-api-metadata-provider"
 version = "0.9.0"
 dependencies = [
  "itp-node-api-metadata",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "thiserror 1.0.9",
 ]
 
@@ -1854,7 +1849,7 @@ version = "0.8.0"
 dependencies = [
  "lazy_static",
  "log 0.4.17",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "thiserror 1.0.9",
 ]
 
@@ -1866,7 +1861,7 @@ dependencies = [
  "itp-storage",
  "itp-types",
  "parity-scale-codec",
- "sgx_types 1.1.5",
+ "sgx_types",
  "sp-core",
  "sp-runtime",
  "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.28)",
@@ -1878,7 +1873,7 @@ version = "0.9.0"
 dependencies = [
  "lazy_static",
  "log 0.4.17",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "thiserror 1.0.9",
 ]
 
@@ -1890,7 +1885,7 @@ dependencies = [
  "parity-scale-codec",
  "serde 1.0.147",
  "serde_json 1.0.87",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -1912,8 +1907,8 @@ dependencies = [
  "serde_json 1.0.60 (git+https://github.com/mesalock-linux/serde-json-sgx?tag=sgx_1.1.3)",
  "sgx_crypto_helper",
  "sgx_rand",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-core",
 ]
 
@@ -1928,8 +1923,8 @@ dependencies = [
  "parity-scale-codec",
  "postcard",
  "serde 1.0.147",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-core",
 ]
 
@@ -1937,7 +1932,7 @@ dependencies = [
 name = "itp-sgx-io"
 version = "0.8.0"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -1970,8 +1965,8 @@ dependencies = [
  "log 0.4.17",
  "parity-scale-codec",
  "sgx_crypto_helper",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-core",
  "sp-runtime",
  "substrate-api-client",
@@ -2004,8 +1999,8 @@ dependencies = [
  "parity-scale-codec",
  "rust-base58",
  "sgx_tcrypto",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-core",
  "thiserror 1.0.9",
 ]
@@ -2017,8 +2012,8 @@ dependencies = [
  "itp-types",
  "log 0.4.17",
  "parity-scale-codec",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "thiserror 1.0.9",
 ]
 
@@ -2032,7 +2027,7 @@ dependencies = [
  "hash-db",
  "itp-types",
  "parity-scale-codec",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "sp-core",
  "sp-runtime",
  "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.28)",
@@ -2066,8 +2061,8 @@ dependencies = [
  "jsonrpc-core",
  "parity-scale-codec",
  "sgx_crypto_helper",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-core",
  "sp-runtime",
  "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.28)",
@@ -2077,7 +2072,7 @@ dependencies = [
 name = "itp-time-utils"
 version = "0.9.0"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -2095,8 +2090,8 @@ dependencies = [
  "log 0.4.17",
  "parity-scale-codec",
  "serde 1.0.147",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-application-crypto",
  "sp-core",
  "sp-runtime",
@@ -2120,8 +2115,8 @@ dependencies = [
  "jsonrpc-core",
  "log 0.4.17",
  "parity-scale-codec",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-core",
  "sp-runtime",
  "thiserror 1.0.9",
@@ -2152,7 +2147,7 @@ dependencies = [
  "frame-support",
  "hex",
  "parity-scale-codec",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "sp-core",
  "thiserror 1.0.9",
 ]
@@ -2175,8 +2170,8 @@ dependencies = [
  "its-state",
  "log 0.4.17",
  "parity-scale-codec",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-core",
  "sp-runtime",
  "thiserror 1.0.9",
@@ -2191,7 +2186,7 @@ dependencies = [
  "itp-utils",
  "its-primitives",
  "log 0.4.17",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "sp-consensus-slots",
  "sp-core",
  "sp-runtime",
@@ -2226,7 +2221,7 @@ dependencies = [
  "its-validateer-fetch",
  "log 0.4.17",
  "parity-scale-codec",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "sp-core",
  "sp-runtime",
 ]
@@ -2249,8 +2244,8 @@ dependencies = [
  "its-state",
  "log 0.4.17",
  "parity-scale-codec",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-runtime",
  "thiserror 1.0.9",
 ]
@@ -2270,7 +2265,7 @@ dependencies = [
  "lazy_static",
  "log 0.4.17",
  "parity-scale-codec",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "sp-consensus-slots",
  "sp-runtime",
 ]
@@ -2301,8 +2296,8 @@ dependencies = [
  "log 0.4.17",
  "parity-scale-codec",
  "rust-base58",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-core",
 ]
 
@@ -2332,7 +2327,7 @@ dependencies = [
  "log 0.4.17",
  "parity-scale-codec",
  "serde 1.0.147",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "sp-core",
  "sp-io",
  "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.28)",
@@ -2458,7 +2453,7 @@ name = "linked-hash-map"
 version = "0.5.2"
 source = "git+https://github.com/mesalock-linux/linked-hash-map-sgx#03e763f7c251c16e0b85e2fb058ba47be52f2a49"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -2467,7 +2462,7 @@ version = "0.4.14"
 source = "git+https://github.com/OverOrion/log-sgx?branch=teaclave-v1.1.6-testing#2305fe91f3d9f4c3d9c07361d061d96da3a132cc"
 dependencies = [
  "cfg-if 1.0.0",
- "sgx_tstd 1.1.6",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -2476,7 +2471,7 @@ version = "0.4.17"
 source = "git+https://github.com/integritee-network/log-sgx#483383a9be3e2e900042eef9b6b2d0837411783f"
 dependencies = [
  "cfg-if 1.0.0",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -2489,9 +2484,9 @@ name = "memchr"
 version = "2.2.1"
 source = "git+https://github.com/mesalock-linux/rust-memchr-sgx#fb51ee32766cb9a2be39b7fb2b5de26bb86dcdeb"
 dependencies = [
- "sgx_libc 1.1.5",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_libc",
+ "sgx_tstd",
+ "sgx_types",
 ]
 
 [[package]]
@@ -2531,9 +2526,9 @@ dependencies = [
  "iovec",
  "log 0.4.14",
  "net2",
- "sgx_libc 1.1.6",
- "sgx_trts 1.1.6",
- "sgx_tstd 1.1.6",
+ "sgx_libc",
+ "sgx_trts",
+ "sgx_tstd",
  "slab 0.4.2 (git+https://github.com/OverOrion/slab-sgx?branch=teaclave-v1.1.6-testing)",
 ]
 
@@ -2545,8 +2540,8 @@ dependencies = [
  "lazycell",
  "log 0.4.17",
  "mio",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "slab 0.4.7",
 ]
 
@@ -2580,8 +2575,8 @@ version = "0.2.33"
 source = "git+https://github.com/OverOrion/net2-rs-sgx?branch=teaclave-v1.1.6-testing#340f9f36ca87a8155a67ff80866841590a0774bf"
 dependencies = [
  "cfg-if 0.1.10",
- "sgx_libc 1.1.6",
- "sgx_tstd 1.1.6",
+ "sgx_libc",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -2611,7 +2606,7 @@ dependencies = [
  "autocfg 1.1.0",
  "num-integer 0.1.41",
  "num-traits 0.2.10",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -2621,7 +2616,7 @@ source = "git+https://github.com/mesalock-linux/num-complex-sgx#19700ad6de079ebc
 dependencies = [
  "autocfg 0.1.8",
  "num-traits 0.2.10",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -2631,7 +2626,7 @@ source = "git+https://github.com/mesalock-linux/num-integer-sgx#404c50e5378ca635
 dependencies = [
  "autocfg 0.1.8",
  "num-traits 0.2.10",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -2651,7 +2646,7 @@ source = "git+https://github.com/mesalock-linux/num-iter-sgx#f19fc44fcad0b82a040
 dependencies = [
  "num-integer 0.1.41",
  "num-traits 0.2.10",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -2663,7 +2658,7 @@ dependencies = [
  "num-bigint",
  "num-integer 0.1.41",
  "num-traits 0.2.10",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -2672,7 +2667,7 @@ version = "0.2.10"
 source = "git+https://github.com/mesalock-linux/num-traits-sgx#af046e0b15c594c960007418097dd4ff37ec3f7a"
 dependencies = [
  "autocfg 0.1.8",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -2698,7 +2693,7 @@ name = "once_cell"
 version = "1.4.0"
 source = "git+https://github.com/mesalock-linux/once_cell-sgx#cefcaa03fed4d85276b3235d875f1b45d399cc3c"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -2980,7 +2975,7 @@ dependencies = [
  "base64 0.13.0 (git+https://github.com/mesalock-linux/rust-base64-sgx)",
  "once_cell 1.4.0",
  "regex 1.3.1",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -3151,7 +3146,7 @@ dependencies = [
  "getrandom 0.1.14",
  "rand_chacha 0.2.2 (git+https://github.com/mesalock-linux/rand-sgx?tag=sgx_1.1.3)",
  "rand_core 0.5.1 (git+https://github.com/mesalock-linux/rand-sgx?tag=sgx_1.1.3)",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -3180,7 +3175,7 @@ source = "git+https://github.com/mesalock-linux/rand-sgx?tag=sgx_1.1.3#83583f073
 dependencies = [
  "ppv-lite86 0.2.6",
  "rand_core 0.5.1 (git+https://github.com/mesalock-linux/rand-sgx?tag=sgx_1.1.3)",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -3195,7 +3190,7 @@ version = "0.5.1"
 source = "git+https://github.com/mesalock-linux/rand-sgx?tag=sgx_1.1.3#83583f073de3b4f75c3c3ef5e174d484ed941f85"
 dependencies = [
  "getrandom 0.1.14",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -3221,7 +3216,7 @@ dependencies = [
  "chrono 0.4.11",
  "pem",
  "ring",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "yasna",
 ]
 
@@ -3253,7 +3248,7 @@ dependencies = [
  "aho-corasick 0.7.10",
  "memchr 2.2.1",
  "regex-syntax 0.6.12",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "thread_local",
 ]
 
@@ -3273,7 +3268,7 @@ name = "regex-syntax"
 version = "0.6.12"
 source = "git+https://github.com/mesalock-linux/regex-sgx#76aef86f9836532d17764523d0fa23bb7d2e31cf"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -3299,7 +3294,7 @@ version = "0.16.19"
 source = "git+https://github.com/mesalock-linux/ring-sgx?tag=v0.16.5#844efe271ed78a399d803b2579f5f2424d543c9f"
 dependencies = [
  "cc",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "spin",
  "untrusted",
 ]
@@ -3331,7 +3326,7 @@ version = "0.0.4"
 source = "git+https://github.com/mesalock-linux/rust-base58-sgx?rev=sgx_1.1.3#13fb3e0a543690e6e19332f37ba85fd74c56cb2f"
 dependencies = [
  "num",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -3367,7 +3362,7 @@ dependencies = [
  "log 0.4.17",
  "ring",
  "sct",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "webpki",
 ]
 
@@ -3380,7 +3375,7 @@ dependencies = [
  "log 0.4.17",
  "ring",
  "sct",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "webpki",
 ]
 
@@ -3393,7 +3388,7 @@ dependencies = [
  "log 0.4.17",
  "ring",
  "sct",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "webpki",
 ]
 
@@ -3459,7 +3454,7 @@ version = "0.6.0"
 source = "git+https://github.com/mesalock-linux/sct.rs?branch=mesalock_sgx#c4d859cca232e6c9d88ca12048df3bc26e1ed4ad"
 dependencies = [
  "ring",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "untrusted",
 ]
 
@@ -3528,7 +3523,7 @@ name = "serde"
 version = "1.0.118"
 source = "git+https://github.com/mesalock-linux/serde-sgx?tag=sgx_1.1.3#db0226f1d5d70fca6b96af2c285851502204e21c"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -3537,7 +3532,7 @@ version = "1.0.118"
 source = "git+https://github.com/mesalock-linux/serde-sgx#db0226f1d5d70fca6b96af2c285851502204e21c"
 dependencies = [
  "serde_derive 1.0.118",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -3587,7 +3582,7 @@ dependencies = [
  "itoa 0.4.5",
  "ryu",
  "serde 1.0.118 (git+https://github.com/mesalock-linux/serde-sgx)",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -3598,7 +3593,7 @@ dependencies = [
  "itoa 0.4.5",
  "ryu",
  "serde 1.0.118 (git+https://github.com/mesalock-linux/serde-sgx)",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -3612,41 +3607,21 @@ dependencies = [
  "serde 1.0.147",
 ]
 
-[[package]]
-name = "sgx_alloc"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
-
 [[package]]
 name = "sgx_alloc"
 version = "1.1.6"
 source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 
-[[package]]
-name = "sgx_backtrace_sys"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
-dependencies = [
- "cc",
- "sgx_build_helper 1.1.5",
- "sgx_libc 1.1.5",
-]
-
 [[package]]
 name = "sgx_backtrace_sys"
 version = "1.1.6"
 source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 dependencies = [
  "cc",
- "sgx_build_helper 1.1.6",
- "sgx_libc 1.1.6",
+ "sgx_build_helper",
+ "sgx_libc",
 ]
 
-[[package]]
-name = "sgx_build_helper"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
-
 [[package]]
 name = "sgx_build_helper"
 version = "1.1.6"
@@ -3654,66 +3629,53 @@ source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6
 
 [[package]]
 name = "sgx_crypto_helper"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
+version = "1.1.6"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 dependencies = [
  "itertools",
  "serde 1.0.118 (git+https://github.com/mesalock-linux/serde-sgx)",
  "serde-big-array",
  "serde_derive 1.0.118",
  "sgx_tcrypto",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
 ]
 
-[[package]]
-name = "sgx_demangle"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
-
 [[package]]
 name = "sgx_demangle"
 version = "1.1.6"
 source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 
-[[package]]
-name = "sgx_libc"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
-dependencies = [
- "sgx_types 1.1.5",
-]
-
 [[package]]
 name = "sgx_libc"
 version = "1.1.6"
 source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 dependencies = [
- "sgx_types 1.1.6",
+ "sgx_types",
 ]
 
 [[package]]
 name = "sgx_rand"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
+version = "1.1.6"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 dependencies = [
- "sgx_trts 1.1.5",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_trts",
+ "sgx_tstd",
+ "sgx_types",
 ]
 
 [[package]]
 name = "sgx_serialize"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
+version = "1.1.6"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
 name = "sgx_serialize_derive"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
+version = "1.1.6"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 dependencies = [
  "quote 0.3.15",
  "sgx_serialize_derive_internals",
@@ -3722,53 +3684,35 @@ dependencies = [
 
 [[package]]
 name = "sgx_serialize_derive_internals"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
+version = "1.1.6"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 dependencies = [
  "syn 0.11.11",
 ]
 
 [[package]]
 name = "sgx_tcrypto"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
+version = "1.1.6"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 dependencies = [
- "sgx_types 1.1.5",
+ "sgx_types",
 ]
 
 [[package]]
 name = "sgx_tcrypto_helper"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
+version = "1.1.6"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 dependencies = [
  "sgx_crypto_helper",
 ]
 
-[[package]]
-name = "sgx_tprotected_fs"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
-dependencies = [
- "sgx_trts 1.1.5",
- "sgx_types 1.1.5",
-]
-
 [[package]]
 name = "sgx_tprotected_fs"
 version = "1.1.6"
 source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 dependencies = [
- "sgx_trts 1.1.6",
- "sgx_types 1.1.6",
-]
-
-[[package]]
-name = "sgx_trts"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
-dependencies = [
- "sgx_libc 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_trts",
+ "sgx_types",
 ]
 
 [[package]]
@@ -3776,43 +3720,27 @@ name = "sgx_trts"
 version = "1.1.6"
 source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 dependencies = [
- "sgx_libc 1.1.6",
- "sgx_types 1.1.6",
+ "sgx_libc",
+ "sgx_types",
 ]
 
 [[package]]
 name = "sgx_tse"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
+version = "1.1.6"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 dependencies = [
- "sgx_types 1.1.5",
+ "sgx_types",
 ]
 
 [[package]]
 name = "sgx_tseal"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
+version = "1.1.6"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 dependencies = [
  "sgx_tcrypto",
- "sgx_trts 1.1.5",
+ "sgx_trts",
  "sgx_tse",
- "sgx_types 1.1.5",
-]
-
-[[package]]
-name = "sgx_tstd"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
-dependencies = [
- "hashbrown_tstd 0.12.0 (git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5)",
- "sgx_alloc 1.1.5",
- "sgx_backtrace_sys 1.1.5",
- "sgx_demangle 1.1.5",
- "sgx_libc 1.1.5",
- "sgx_tprotected_fs 1.1.5",
- "sgx_trts 1.1.5",
- "sgx_types 1.1.5",
- "sgx_unwind 1.1.5",
+ "sgx_types",
 ]
 
 [[package]]
@@ -3820,49 +3748,36 @@ name = "sgx_tstd"
 version = "1.1.6"
 source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 dependencies = [
- "hashbrown_tstd 0.12.0 (git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing)",
- "sgx_alloc 1.1.6",
- "sgx_backtrace_sys 1.1.6",
- "sgx_demangle 1.1.6",
- "sgx_libc 1.1.6",
- "sgx_tprotected_fs 1.1.6",
- "sgx_trts 1.1.6",
- "sgx_types 1.1.6",
- "sgx_unwind 1.1.6",
+ "hashbrown_tstd",
+ "sgx_alloc",
+ "sgx_backtrace_sys",
+ "sgx_demangle",
+ "sgx_libc",
+ "sgx_tprotected_fs",
+ "sgx_trts",
+ "sgx_types",
+ "sgx_unwind",
 ]
 
 [[package]]
 name = "sgx_tunittest"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
+version = "1.1.6"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
-[[package]]
-name = "sgx_types"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
-
 [[package]]
 name = "sgx_types"
 version = "1.1.6"
 source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 
-[[package]]
-name = "sgx_unwind"
-version = "1.1.5"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?tag=v1.1.5#d2d339cbb005f676bb700059bd51dc689c025f6b"
-dependencies = [
- "sgx_build_helper 1.1.5",
-]
-
 [[package]]
 name = "sgx_unwind"
 version = "1.1.6"
 source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk?branch=v1.1.6-testing#dc6071e5e0050523358f80190e818acad26216ef"
 dependencies = [
- "sgx_build_helper 1.1.6",
+ "sgx_build_helper",
 ]
 
 [[package]]
@@ -3883,7 +3798,7 @@ name = "sha1"
 version = "0.6.0"
 source = "git+https://github.com/mesalock-linux/rust-sha1-sgx?tag=sgx_1.1.3#482a4d489e860d63a21662aaea988f600f8e20a4"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -3959,7 +3874,7 @@ name = "slab"
 version = "0.4.2"
 source = "git+https://github.com/OverOrion/slab-sgx?branch=teaclave-v1.1.6-testing#33bfcdc15831beff349d5df0b8400682f372ee77"
 dependencies = [
- "sgx_tstd 1.1.6",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -3967,7 +3882,7 @@ name = "slab"
 version = "0.4.2"
 source = "git+https://github.com/mesalock-linux/slab-sgx#0b0e6ec2abd588afd2f40fd082bc473d100d0f40"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -3984,7 +3899,7 @@ name = "smallvec"
 version = "1.6.1"
 source = "git+https://github.com/mesalock-linux/rust-smallvec-sgx#b5925f10aa5bc3370a0fb339140ee063f5a888dd"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -4211,8 +4126,8 @@ dependencies = [
  "libsecp256k1",
  "log 0.4.17",
  "parity-scale-codec",
- "sgx_tstd 1.1.5",
- "sgx_types 1.1.5",
+ "sgx_tstd",
+ "sgx_types",
  "sp-core",
  "sp-runtime-interface",
  "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.28)",
@@ -4522,7 +4437,7 @@ name = "termcolor"
 version = "1.0.5"
 source = "git+https://github.com/mesalock-linux/termcolor-sgx#fee5ac79b4a90197d646f3df5e1b45ac56be718b"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -4530,7 +4445,7 @@ name = "thiserror"
 version = "1.0.9"
 source = "git+https://github.com/mesalock-linux/thiserror-sgx?tag=sgx_1.1.3#c2f806b88616e06aab0af770366a76885d974fdc"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "thiserror-impl 1.0.9",
 ]
 
@@ -4570,7 +4485,7 @@ version = "1.0.0"
 source = "git+https://github.com/mesalock-linux/thread_local-rs-sgx#a8e6e6ce280c53358f7b9e6febe534cba9950547"
 dependencies = [
  "lazy_static",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -4658,7 +4573,7 @@ dependencies = [
  "log 0.4.17",
  "rand 0.7.3 (git+https://github.com/mesalock-linux/rand-sgx?tag=sgx_1.1.3)",
  "rustls 0.19.0 (git+https://github.com/mesalock-linux/rustls?tag=sgx_1.1.3)",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "sha1",
  "thiserror 1.0.9",
  "url",
@@ -4710,7 +4625,7 @@ name = "unicase"
 version = "2.6.0"
 source = "git+https://github.com/mesalock-linux/unicase-sgx#0b0519348572927118af47af3da4da9ffdca8ec6"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "version_check",
 ]
 
@@ -4720,7 +4635,7 @@ version = "0.3.4"
 source = "git+https://github.com/mesalock-linux/unicode-bidi-sgx#eb10728a635a046e75747849fbc680cbbb7832c7"
 dependencies = [
  "matches",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -4769,7 +4684,7 @@ dependencies = [
  "idna",
  "matches",
  "percent-encoding",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -4777,7 +4692,7 @@ name = "utf-8"
 version = "0.7.4"
 source = "git+https://github.com/integritee-network/rust-utf8-sgx?branch=sgx-experimental#b026700da83a2f00f0e9f36f813ef28e447a719e"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
@@ -4792,7 +4707,7 @@ version = "0.21.4"
 source = "git+https://github.com/mesalock-linux/webpki?branch=mesalock_sgx#8dbe6fbeefadf05582ae47c7fa818b04db49c61e"
 dependencies = [
  "ring",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "untrusted",
 ]
 
@@ -4801,7 +4716,7 @@ name = "webpki-roots"
 version = "0.21.0"
 source = "git+https://github.com/mesalock-linux/webpki-roots?tag=sgx_1.1.3#6ff3be547ac13ccd46ae55605ad6506ce30688ef"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "webpki",
 ]
 
@@ -4810,7 +4725,7 @@ name = "webpki-roots"
 version = "0.21.0"
 source = "git+https://github.com/mesalock-linux/webpki-roots?branch=mesalock_sgx#6ff3be547ac13ccd46ae55605ad6506ce30688ef"
 dependencies = [
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
  "webpki",
 ]
 
@@ -4853,7 +4768,7 @@ dependencies = [
  "bit-vec",
  "chrono 0.4.11",
  "num-bigint",
- "sgx_tstd 1.1.5",
+ "sgx_tstd",
 ]
 
 [[package]]
diff --git a/enclave-runtime/Cargo.toml b/enclave-runtime/Cargo.toml
index 3b94706da5..75a577aa6b 100644
--- a/enclave-runtime/Cargo.toml
+++ b/enclave-runtime/Cargo.toml
@@ -147,21 +147,21 @@ sp-io = { path = "../core-primitives/substrate-sgx/sp-io" }
 #pallet-evm = { path = "../../frontier/frame/evm"}
 
 [patch."https://github.com/apache/teaclave-sgx-sdk.git"]
-sgx_alloc = { version = "1.1.5", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", tag = "v1.1.5" }
-sgx_crypto_helper = { version = "1.1.5", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", tag = "v1.1.5" }
-sgx_libc = { version = "1.1.5", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", tag = "v1.1.5" }
-sgx_rand = { version = "1.1.5", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", tag = "v1.1.5" }
-sgx_serialize = { version = "1.1.5", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", tag = "v1.1.5" }
-sgx_serialize_derive = { version = "1.1.5", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", tag = "v1.1.5" }
-sgx_serialize_derive_internals = { version = "1.1.5", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", tag = "v1.1.5" }
-sgx_tcrypto = { version = "1.1.5", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", tag = "v1.1.5" }
-sgx_tcrypto_helper = { version = "1.1.5", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", tag = "v1.1.5" }
-sgx_trts = { version = "1.1.5", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", tag = "v1.1.5" }
-sgx_tse = { version = "1.1.5", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", tag = "v1.1.5" }
-sgx_tseal = { version = "1.1.5", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", tag = "v1.1.5" }
-sgx_tstd = { version = "1.1.5", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", tag = "v1.1.5" }
-sgx_tunittest = { version = "1.1.5", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", tag = "v1.1.5" }
-sgx_types = { version = "1.1.5", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", tag = "v1.1.5" }
+sgx_alloc = { version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "v1.1.6-testing" }
+sgx_crypto_helper = { version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "v1.1.6-testing" }
+sgx_libc = { version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "v1.1.6-testing" }
+sgx_rand = { version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "v1.1.6-testing" }
+sgx_serialize = { version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "v1.1.6-testing" }
+sgx_serialize_derive = { version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "v1.1.6-testing" }
+sgx_serialize_derive_internals = { version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "v1.1.6-testing" }
+sgx_tcrypto = { version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "v1.1.6-testing" }
+sgx_tcrypto_helper = { version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "v1.1.6-testing" }
+sgx_trts = { version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "v1.1.6-testing" }
+sgx_tse = { version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "v1.1.6-testing" }
+sgx_tseal = { version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "v1.1.6-testing" }
+sgx_tstd = { version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "v1.1.6-testing" }
+sgx_tunittest = { version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "v1.1.6-testing" }
+sgx_types = { version = "1.1.6", git = "https://github.com/apache/incubator-teaclave-sgx-sdk", branch = "v1.1.6-testing" }
 
 #[patch."https://github.com/scs/substrate-api-client"]
 #substrate-api-client = { path = "../../../scs/substrate-api-client" }