Update sgxruntime and wasm builder (#34)

* update sgx-runtime * wasm-builder Co-authored-by: Gaudenz Kessler <[email protected]>
ajuna-network · Mar 3, 2022 · 74ff735 · 74ff735
1 parent 00f336e
commit 74ff735
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -134,7 +134,7 @@ dependencies = [
 [[package]]
 name = "ajuna-runtime"
 version = "4.0.0-dev"
-source = "git+https://github.com/ajuna-network/ajuna-node.git?branch=update-substrate-5#e5e89cf3606ed624cb957552f52552ba38b49740"
+source = "git+https://github.com/ajuna-network/ajuna-node.git?branch=update-substrate-5#c32d74bee111ccb561e48d437ebff67539187357"
 dependencies = [
  "frame-executive",
  "frame-support",
@@ -2266,7 +2266,7 @@ dependencies = [
  "sgx_tstd",
  "sp-application-crypto",
  "sp-core",
- "sp-io 5.0.0 (git+https://github.com/ajuna-network/sgx-runtime?branch=integritee-network-master)",
+ "sp-io 5.0.0 (git+https://github.com/ajuna-network/sgx-runtime?branch=master)",
  "sp-keyring",
  "sp-runtime",
  "substrate-api-client",
@@ -2995,7 +2995,7 @@ dependencies = [
  "sgx-externalities",
  "sgx_tstd",
  "sp-core",
- "sp-io 5.0.0 (git+https://github.com/ajuna-network/sgx-runtime?branch=integritee-network-master)",
+ "sp-io 5.0.0 (git+https://github.com/ajuna-network/sgx-runtime?branch=master)",
  "sp-runtime",
  "sp-std",
  "thiserror 1.0.30",
@@ -4168,7 +4168,7 @@ dependencies = [
 [[package]]
 name = "pallet-ajuna-connectfour"
 version = "4.0.0-dev"
-source = "git+https://github.com/ajuna-network/ajuna-node.git?branch=update-substrate-5#e5e89cf3606ed624cb957552f52552ba38b49740"
+source = "git+https://github.com/ajuna-network/ajuna-node.git?branch=update-substrate-5#c32d74bee111ccb561e48d437ebff67539187357"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4183,7 +4183,7 @@ dependencies = [
 [[package]]
 name = "pallet-ajuna-gameregistry"
 version = "4.0.0-dev"
-source = "git+https://github.com/ajuna-network/ajuna-node.git?branch=update-substrate-5#e5e89cf3606ed624cb957552f52552ba38b49740"
+source = "git+https://github.com/ajuna-network/ajuna-node.git?branch=update-substrate-5#c32d74bee111ccb561e48d437ebff67539187357"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4199,7 +4199,7 @@ dependencies = [
 [[package]]
 name = "pallet-ajuna-matchmaker"
 version = "4.0.0-dev"
-source = "git+https://github.com/ajuna-network/ajuna-node.git?branch=update-substrate-5#e5e89cf3606ed624cb957552f52552ba38b49740"
+source = "git+https://github.com/ajuna-network/ajuna-node.git?branch=update-substrate-5#c32d74bee111ccb561e48d437ebff67539187357"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5811,7 +5811,7 @@ dependencies = [
 [[package]]
 name = "sgx-externalities"
 version = "0.4.0"
-source = "git+https://github.com/ajuna-network/sgx-runtime?branch=integritee-network-master#b1968d0866f53d6387606bc4d3d306f80450a021"
+source = "git+https://github.com/ajuna-network/sgx-runtime?branch=master#5063174549c1464e5a5e08ba0a8e88c837888326"
 dependencies = [
  "derive_more",
  "environmental",
@@ -5826,7 +5826,7 @@ dependencies = [
 [[package]]
 name = "sgx-runtime"
 version = "0.8.0"
-source = "git+https://github.com/ajuna-network/sgx-runtime?branch=integritee-network-master#b1968d0866f53d6387606bc4d3d306f80450a021"
+source = "git+https://github.com/ajuna-network/sgx-runtime?branch=master#5063174549c1464e5a5e08ba0a8e88c837888326"
 dependencies = [
  "frame-executive",
  "frame-support",
@@ -6452,7 +6452,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "5.0.0"
-source = "git+https://github.com/ajuna-network/sgx-runtime?branch=integritee-network-master#b1968d0866f53d6387606bc4d3d306f80450a021"
+source = "git+https://github.com/ajuna-network/sgx-runtime?branch=master#5063174549c1464e5a5e08ba0a8e88c837888326"
 dependencies = [
  "environmental",
  "futures 0.3.19",
@@ -6532,7 +6532,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?tag=devhub/latest#e6fbbd5cdf72a5ed7fd65138072ed1f8a320a33d"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#59649dd117969467d8046df86afe56810f596545"
 dependencies = [
  "zstd",
 ]
@@ -6904,12 +6904,13 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?tag=devhub/latest#e6fbbd5cdf72a5ed7fd65138072ed1f8a320a33d"
+source = "git+https://github.com/paritytech/substrate.git?branch=master#59649dd117969467d8046df86afe56810f596545"
 dependencies = [
  "ansi_term",
  "build-helper",
  "cargo_metadata",
  "sp-maybe-compressed-blob",
+ "strum",
  "tempfile",
  "toml",
  "walkdir",
@@ -7427,8 +7428,8 @@ version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0"
 dependencies = [
- "cfg-if 0.1.10",
- "rand 0.3.23",
+ "cfg-if 1.0.0",
+ "rand 0.6.5",
  "static_assertions",
 ]
 

diff --git a/app-libs/stf/Cargo.toml b/app-libs/stf/Cargo.toml
@@ -77,9 +77,9 @@ sc-keystore = { version = "4.0.0-dev", git = "https://github.com/paritytech/subs
 
 # scs / integritee / ajuna
 my-node-runtime = { package = "ajuna-runtime", git = "https://github.com/ajuna-network/ajuna-node.git", branch = "update-substrate-5", optional = true }
-sgx-externalities = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "integritee-network-master" }
-sgx-runtime = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "integritee-network-master", optional = true }
-sp-io = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "integritee-network-master", features = ["disable_oom", "disable_panic_handler", "disable_allocator"], optional = true }
+sgx-externalities = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "master" }
+sgx-runtime = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "master", optional = true }
+sp-io = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "master", features = ["disable_oom", "disable_panic_handler", "disable_allocator"], optional = true }
 substrate-api-client = { git = "https://github.com/scs/substrate-api-client", branch = "master", optional = true }
 substrate-client-keystore = { git = "https://github.com/scs/substrate-api-client", branch = "master", optional = true }
 pallet-ajuna-connectfour = { default-features = false, git = "https://github.com/ajuna-network/ajuna-node.git", branch = "update-substrate-5" }

diff --git a/core-primitives/stf-executor/Cargo.toml b/core-primitives/stf-executor/Cargo.toml
@@ -11,7 +11,7 @@ sgx_types = { branch = "master", git = "https://github.com/apache/teaclave-sgx-s
 sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true, features = ["untrusted_time"] }
 
 # integritee dependencies
-sgx-externalities = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "integritee-network-master", optional = true }
+sgx-externalities = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "master", optional = true }
 
 # local dependencies
 ita-stf = { path = "../../app-libs/stf", default-features = false }

diff --git a/core-primitives/stf-state-handler/Cargo.toml b/core-primitives/stf-state-handler/Cargo.toml
@@ -51,7 +51,7 @@ rust-base58 = { package = "rust-base58", version = "0.0.4", optional = true }
 thiserror = { version = "1.0", optional = true }
 
 # scs / integritee
-sgx-externalities = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "integritee-network-master", optional = true }
+sgx-externalities = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "master", optional = true }
 
 # no-std dependencies
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }

diff --git a/core-primitives/test/Cargo.toml b/core-primitives/test/Cargo.toml
@@ -11,7 +11,7 @@ derive_more = { version = "0.99.5" }
 sgx_types = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git" }
 sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }
 sgx-crypto-helper = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", package = "sgx_tcrypto_helper", optional = true }
-sgx-externalities = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "integritee-network-master", optional = true }
+sgx-externalities = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "master", optional = true }
 jsonrpc-core_sgx = { package = "jsonrpc-core", git = "https://github.com/scs/jsonrpc", branch = "no_std", default-features = false, optional = true }
 
 # std-only deps

diff --git a/enclave-runtime/Cargo.lock b/enclave-runtime/Cargo.lock
@@ -2213,7 +2213,7 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 [[package]]
 name = "pallet-ajuna-connectfour"
 version = "4.0.0-dev"
-source = "git+https://github.com/ajuna-network/ajuna-node.git?branch=update-substrate-5#e5e89cf3606ed624cb957552f52552ba38b49740"
+source = "git+https://github.com/ajuna-network/ajuna-node.git?branch=update-substrate-5#c32d74bee111ccb561e48d437ebff67539187357"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2227,7 +2227,7 @@ dependencies = [
 [[package]]
 name = "pallet-ajuna-gameregistry"
 version = "4.0.0-dev"
-source = "git+https://github.com/ajuna-network/ajuna-node.git?branch=update-substrate-5#e5e89cf3606ed624cb957552f52552ba38b49740"
+source = "git+https://github.com/ajuna-network/ajuna-node.git?branch=update-substrate-5#c32d74bee111ccb561e48d437ebff67539187357"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2242,7 +2242,7 @@ dependencies = [
 [[package]]
 name = "pallet-ajuna-matchmaker"
 version = "4.0.0-dev"
-source = "git+https://github.com/ajuna-network/ajuna-node.git?branch=update-substrate-5#e5e89cf3606ed624cb957552f52552ba38b49740"
+source = "git+https://github.com/ajuna-network/ajuna-node.git?branch=update-substrate-5#c32d74bee111ccb561e48d437ebff67539187357"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3094,7 +3094,7 @@ dependencies = [
 [[package]]
 name = "sgx-externalities"
 version = "0.4.0"
-source = "git+https://github.com/ajuna-network/sgx-runtime?branch=integritee-network-master#b1968d0866f53d6387606bc4d3d306f80450a021"
+source = "git+https://github.com/ajuna-network/sgx-runtime?branch=master#5063174549c1464e5a5e08ba0a8e88c837888326"
 dependencies = [
  "derive_more",
  "environmental",
@@ -3109,7 +3109,7 @@ dependencies = [
 [[package]]
 name = "sgx-runtime"
 version = "0.8.0"
-source = "git+https://github.com/ajuna-network/sgx-runtime?branch=integritee-network-master#b1968d0866f53d6387606bc4d3d306f80450a021"
+source = "git+https://github.com/ajuna-network/sgx-runtime?branch=master#5063174549c1464e5a5e08ba0a8e88c837888326"
 dependencies = [
  "frame-executive",
  "frame-support",
@@ -3616,7 +3616,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "5.0.0"
-source = "git+https://github.com/ajuna-network/sgx-runtime?branch=integritee-network-master#b1968d0866f53d6387606bc4d3d306f80450a021"
+source = "git+https://github.com/ajuna-network/sgx-runtime?branch=master#5063174549c1464e5a5e08ba0a8e88c837888326"
 dependencies = [
  "environmental",
  "hash-db",
@@ -4058,7 +4058,7 @@ version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if 0.1.10",
  "static_assertions",
 ]
 

diff --git a/enclave-runtime/Cargo.toml b/enclave-runtime/Cargo.toml
@@ -53,9 +53,9 @@ ipfs-unixfs = { default-features = false, git = "https://github.com/whalelephant
 
 # scs / integritee
 jsonrpc-core = { default-features = false, git = "https://github.com/scs/jsonrpc", branch = "no_std" }
-sgx-externalities = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime",  branch = "integritee-network-master", features = ["sgx"] }
-sgx-runtime = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "integritee-network-master"}
-sp-io = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "integritee-network-master", features = ["disable_oom", "disable_panic_handler", "disable_allocator", "sgx"], optional = true }
+sgx-externalities = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime",  branch = "master", features = ["sgx"] }
+sgx-runtime = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "master"}
+sp-io = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "master", features = ["disable_oom", "disable_panic_handler", "disable_allocator", "sgx"], optional = true }
 substrate-api-client = { default-features = false, git = "https://github.com/scs/substrate-api-client", branch = "master" }
 
 # mesalock
@@ -124,7 +124,7 @@ getrandom = { git = "https://github.com/integritee-network/getrandom-sgx", branc
 [patch."https://github.com/paritytech/substrate"]
 log = { git = "https://github.com/mesalock-linux/log-sgx" }
 env_logger = { git = "https://github.com/mesalock-linux/env_logger-sgx" }
-sp-io = { git = "https://github.com/ajuna-network/sgx-runtime", branch = "integritee-network-master" }
+sp-io = { git = "https://github.com/ajuna-network/sgx-runtime", branch = "master" }
 #sp-io = { path = "../../ajuna-sgx-runtime/substrate-sgx/sp-io"}
 
 

diff --git a/sidechain/block-composer/Cargo.toml b/sidechain/block-composer/Cargo.toml
@@ -22,7 +22,7 @@ its-state = { path = "../state", default-features = false }
 its-top-pool-rpc-author = { path = "../top-pool-rpc-author", default-features = false }
 
 # integritee dependencies
-sgx-externalities = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "integritee-network-master" }
+sgx-externalities = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "master" }
 
 # sgx enabled external libraries
 thiserror_sgx = { package = "thiserror", git = "https://github.com/mesalock-linux/thiserror-sgx", tag = "sgx_1.1.3", optional = true }

diff --git a/sidechain/consensus/aura/Cargo.toml b/sidechain/consensus/aura/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 log = { version = "0.4.14", default-features = false }
 finality-grandpa = { version = "0.14.3", default-features = false, features = ["derive-codec"] }
-sgx-externalities = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "integritee-network-master" }
+sgx-externalities = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "master" }
 
 # sgx deps
 sgx_tstd = { branch = "master", git = "https://github.com/apache/teaclave-sgx-sdk.git", optional = true }

diff --git a/sidechain/consensus/common/Cargo.toml b/sidechain/consensus/common/Cargo.toml
@@ -59,4 +59,4 @@ its-test = { path = "../../test" }
 sp-core = { version = "5.0.0", default-features = false, features = ["full_crypto"], git = "https://github.com/paritytech/substrate.git", branch = "master" }
 sp-keyring = { version = "5.0.0", git = "https://github.com/paritytech/substrate.git", branch = "master"}
 # integritee / scs
-sgx-externalities = { git = "https://github.com/ajuna-network/sgx-runtime", branch = "integritee-network-master" }
+sgx-externalities = { git = "https://github.com/ajuna-network/sgx-runtime", branch = "master" }
diff --git a/sidechain/state/Cargo.toml b/sidechain/state/Cargo.toml
@@ -63,8 +63,8 @@ itp-storage = { path = "../../core-primitives/storage", default-features = false
 its-primitives = { path = "../primitives", default-features = false }
 
 # scs deps
-sgx-externalities = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "integritee-network-master" }
-sp-io = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "integritee-network-master", features = ["disable_oom", "disable_panic_handler", "disable_allocator"], optional = true }
+sgx-externalities = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "master" }
+sp-io = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "master", features = ["disable_oom", "disable_panic_handler", "disable_allocator"], optional = true }
 
 # substrate deps
 sp-core = { version = "5.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "master"}

diff --git a/sidechain/top-pool-executor/Cargo.toml b/sidechain/top-pool-executor/Cargo.toml
@@ -20,7 +20,7 @@ its-state = { path = "../state", default-features = false }
 its-top-pool-rpc-author = { path = "../top-pool-rpc-author", default-features = false }
 
 # integritee dependencies
-sgx-externalities = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "integritee-network-master" }
+sgx-externalities = { default-features = false, git = "https://github.com/ajuna-network/sgx-runtime", branch = "master" }
 
 # sgx enabled external libraries
 thiserror_sgx = { package = "thiserror", git = "https://github.com/mesalock-linux/thiserror-sgx", tag = "sgx_1.1.3", optional = true }