From b2d167c38bd930dca3d92bc21646a514fec2d05f Mon Sep 17 00:00:00 2001 From: echevrier Date: Tue, 9 Nov 2021 10:17:00 +0100 Subject: [PATCH] Set substrate-fixed version to 0.5.6 (before update to new substrate) --- Cargo.lock | 25 ++++++++++++++ enclave-runtime/Cargo.lock | 67 ++++++++++++++++++++++++++++++++++++++ enclave-runtime/Cargo.toml | 2 +- service/Cargo.toml | 2 +- 4 files changed, 94 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4cfee86d64..3d3b878dba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2313,6 +2313,7 @@ dependencies = [ "sp-keyring", "sp-runtime", "substrate-api-client", + "substrate-fixed", "thiserror 1.0.29", "tokio 1.11.0", "ws", @@ -2360,6 +2361,21 @@ dependencies = [ "walkdir", ] +[[package]] +name = "ita-exchange-oracle" +version = "0.8.0" +dependencies = [ + "itc-rest-client", + "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.130", + "serde_json 1.0.67", + "sgx_tstd", + "thiserror 1.0.29", + "thiserror 1.0.9", + "url 2.1.1", + "url 2.2.2", +] + [[package]] name = "ita-stf" version = "0.8.0" @@ -6548,6 +6564,15 @@ dependencies = [ "sp-keystore", ] +[[package]] +name = "substrate-fixed" +version = "0.5.6" +source = "git+https://github.com/encointer/substrate-fixed?tag=v0.5.6#b33d186888c60f38adafcfc0ec3a21aab263aef1" +dependencies = [ + "parity-scale-codec", + "typenum", +] + [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" diff --git a/enclave-runtime/Cargo.lock b/enclave-runtime/Cargo.lock index ee1aa116e4..3f73f3391c 100644 --- a/enclave-runtime/Cargo.lock +++ b/enclave-runtime/Cargo.lock @@ -116,6 +116,12 @@ name = "base-x" version = "0.2.6" source = "git+https://github.com/whalelephant/base-x-rs?branch=no_std#906c9ac59282ff5a2eec86efd25d50ad9927b147" +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + [[package]] name = "base64" version = "0.13.0" @@ -468,6 +474,7 @@ dependencies = [ "hex", "httparse", "ipfs-unixfs", + "ita-exchange-oracle", "ita-stf", "itc-direct-rpc-server", "itc-light-client", @@ -520,6 +527,7 @@ dependencies = [ "sp-utils", "sp-version", "substrate-api-client", + "substrate-fixed", "webpki", "webpki-roots 0.21.0 (git+https://github.com/mesalock-linux/webpki-roots?branch=mesalock_sgx)", "yasna", @@ -1018,6 +1026,18 @@ dependencies = [ "sgx_tstd", ] +[[package]] +name = "http_req" +version = "0.7.2" +source = "git+https://github.com/mesalock-linux/http_req-sgx?tag=sgx_1.1.3#5d0f7474c73b70d2dbdda69c1db2a2e31aee6eb8" +dependencies = [ + "rustls 0.19.0 (git+https://github.com/mesalock-linux/rustls?branch=mesalock_sgx)", + "sgx_tstd", + "unicase", + "webpki", + "webpki-roots 0.21.0 (git+https://github.com/mesalock-linux/webpki-roots?branch=mesalock_sgx)", +] + [[package]] name = "httparse" version = "1.4.1" @@ -1113,6 +1133,19 @@ dependencies = [ "sha2 0.9.8", ] +[[package]] +name = "ita-exchange-oracle" +version = "0.8.0" +dependencies = [ + "itc-rest-client", + "log 0.4.14 (git+https://github.com/mesalock-linux/log-sgx)", + "serde 1.0.130", + "serde_json 1.0.67", + "sgx_tstd", + "thiserror 1.0.9", + "url", +] + [[package]] name = "ita-stf" version = "0.8.0" @@ -1178,6 +1211,22 @@ dependencies = [ "thiserror 1.0.9", ] +[[package]] +name = "itc-rest-client" +version = "0.8.0" +dependencies = [ + "base64 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "http", + "http_req", + "log 0.4.14 (git+https://github.com/mesalock-linux/log-sgx)", + "serde 1.0.130", + "serde_json 1.0.67", + "sgx_tstd", + "sgx_types", + "thiserror 1.0.9", + "url", +] + [[package]] name = "itc-tls-websocket-server" version = "0.8.0" @@ -3351,6 +3400,15 @@ dependencies = [ "sp-std", ] +[[package]] +name = "substrate-fixed" +version = "0.5.6" +source = "git+https://github.com/encointer/substrate-fixed?tag=v0.5.6#b33d186888c60f38adafcfc0ec3a21aab263aef1" +dependencies = [ + "parity-scale-codec", + "typenum", +] + [[package]] name = "subtle" version = "1.0.0" @@ -3580,6 +3638,15 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "unicase" +version = "2.6.0" +source = "git+https://github.com/mesalock-linux/unicase-sgx#0b0519348572927118af47af3da4da9ffdca8ec6" +dependencies = [ + "sgx_tstd", + "version_check", +] + [[package]] name = "unicode-bidi" version = "0.3.4" diff --git a/enclave-runtime/Cargo.toml b/enclave-runtime/Cargo.toml index 06ab8bd6b8..024ad2c2a6 100644 --- a/enclave-runtime/Cargo.toml +++ b/enclave-runtime/Cargo.toml @@ -52,7 +52,7 @@ sp-io = { default-features = false, features = ["disable_oom", "disable_panic_ha substrate-api-client = { default-features = false, git = "https://github.com/scs/substrate-api-client", branch = "master" } sgx-externalities = { default-features = false, git = "https://github.com/integritee-network/sgx-runtime", branch = "master" } jsonrpc-core = { default-features = false, git = "https://github.com/scs/jsonrpc", branch = "no_std" } -substrate-fixed = { git = "https://github.com/encointer/substrate-fixed", branch = "master" } +substrate-fixed = { package = "substrate-fixed", git = "https://github.com/encointer/substrate-fixed",tag = "v0.5.6"} # mesalock linked-hash-map = { git = "https://github.com/mesalock-linux/linked-hash-map-sgx" } diff --git a/service/Cargo.toml b/service/Cargo.toml index 692a39cc13..9cdac7a06d 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -54,7 +54,7 @@ ita-stf = { path = "../app-libs/stf" } # scs / integritee substrate-api-client = { git = "https://github.com/scs/substrate-api-client", branch = "master" } my-node-runtime = { package = "integritee-node-runtime", git = "https://github.com/integritee-network/integritee-node", branch = "master" } -substrate-fixed = { git = "https://github.com/encointer/substrate-fixed", branch = "master" } +substrate-fixed = { package = "substrate-fixed", git = "https://github.com/encointer/substrate-fixed", tag = "v0.5.6" } # Substrate dependencies sp-runtime = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" }