diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 0e62251c91..bdf9d3990b 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -170,10 +170,10 @@ jobs: with: github_token: ${{secrets.GITHUB_TOKEN}} workflow: ci.yml - name: integritee-node-dev-5b2868e0269181e7bd31f4e3970bf7b6fd5166de + name: integritee-node-dev-a97ddbce0048a9b48eef76799f3e42e37690c334 # in fact this action should download the latest artifact, but sometimes fails. Then we need to # set the `run_id` to force a download of an updated binary. - run_id: 1503342881 + run_id: 1544655658 path: node repo: integritee-network/integritee-node diff --git a/Cargo.lock b/Cargo.lock index 4620eddf8c..041156898c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,6 +12,50 @@ dependencies = [ "regex 1.5.4", ] +[[package]] +name = "ac-compose-macros" +version = "0.1.0" +source = "git+https://github.com/scs/substrate-api-client?branch=master#a4d931c85f30ba22ff1f982c47caf57fe43ebc90" +dependencies = [ + "ac-primitives", + "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-scale-codec", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "ac-node-api" +version = "0.1.0" +source = "git+https://github.com/scs/substrate-api-client?branch=master#a4d931c85f30ba22ff1f982c47caf57fe43ebc90" +dependencies = [ + "ac-primitives", + "frame-metadata 14.2.0 (git+https://github.com/paritytech/frame-metadata.git?branch=main)", + "frame-support", + "frame-system", + "hex", + "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-scale-codec", + "scale-info", + "serde 1.0.130", + "serde_json 1.0.72", + "sp-core", + "sp-runtime", + "thiserror 1.0.30", +] + +[[package]] +name = "ac-primitives" +version = "0.1.0" +source = "git+https://github.com/scs/substrate-api-client?branch=master#a4d931c85f30ba22ff1f982c47caf57fe43ebc90" +dependencies = [ + "hex", + "parity-scale-codec", + "sp-core", + "sp-runtime", + "sp-std", +] + [[package]] name = "addr2line" version = "0.17.0" @@ -107,9 +151,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.45" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee10e43ae4a853c0a3591d4e2ada1719e553be18199d9da9d4a83f5927c2f5c7" +checksum = "62e1f47f7dc0422027a4e370dd4548d4d66b26782e513e98dca1e689e058a80e" [[package]] name = "approx" @@ -208,6 +252,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5024ee8015f02155eee35c711107ddd9a9bf3cb689cf2a9089c97e79b6e1ae83" +[[package]] +name = "base58" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581" + [[package]] name = "base64" version = "0.11.0" @@ -278,9 +328,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" -version = "0.19.5" +version = "0.19.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" +checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33" dependencies = [ "funty", "radium 0.5.3", @@ -475,16 +525,15 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.13.1" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081e3f0755c1f380c2d010481b6fa2e02973586d5f2b24eebb7a2a1d98b143d8" +checksum = "ba2ae6de944143141f6155a473a6b02f66c7c3f9f47316f802f80204ebfe6e12" dependencies = [ "camino", "cargo-platform", - "semver 0.11.0", - "semver-parser 0.10.2", + "semver 1.0.4", "serde 1.0.130", - "serde_json 1.0.70", + "serde_json 1.0.72", ] [[package]] @@ -550,6 +599,20 @@ dependencies = [ "generic-array 0.14.4", ] +[[package]] +name = "claims-primitives" +version = "0.1.0" +source = "git+https://github.com/integritee-network/pallets.git?branch=master#31cf747a0240a319b141580eabadb52794d3e509" +dependencies = [ + "parity-scale-codec", + "rustc-hex", + "scale-info", + "serde 1.0.130", + "sp-io 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", + "sp-runtime", + "sp-std", +] + [[package]] name = "clang-sys" version = "1.3.0" @@ -602,7 +665,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76d0a7a42b9c13f2b2a1a7e64b949a19bcb56a49b190076e60261001ceaa5304" dependencies = [ "bytes 1.1.0", - "futures 0.3.17", + "futures 0.3.18", "http 0.2.5", "mime", "mime_guess", @@ -862,9 +925,9 @@ checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf" [[package]] name = "ed25519" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4620d40f6d2601794401d6dd95a5cf69b6c157852539470eeda433a99b3c0efc" +checksum = "74e1069e39f1454367eb2de793ed062fac4c35c2934b76a81d90dd9abcd28816" dependencies = [ "signature", ] @@ -933,15 +996,6 @@ version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68b91989ae21441195d7d9b9993a2f9295c7e1a8c96255d8b729accddc124797" -[[package]] -name = "erased-serde" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3de9ad4541d99dc22b59134e7ff8dc3d6c988c89ecd7324bf10a8362b07a2afa" -dependencies = [ - "serde 1.0.130", -] - [[package]] name = "failure" version = "0.1.8" @@ -977,7 +1031,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" dependencies = [ "either", - "futures 0.3.17", + "futures 0.3.18", "futures-timer", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.14", @@ -1055,7 +1109,7 @@ checksum = "69a039c3498dc930fe810151a34ba0c1c70b02b8625035592e74432f678591f2" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", @@ -1063,6 +1117,7 @@ dependencies = [ "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", "paste", + "scale-info", "sp-api", "sp-io 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", "sp-runtime", @@ -1074,11 +1129,12 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "sp-core", "sp-io 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", "sp-runtime", @@ -1088,13 +1144,14 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "14.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +version = "14.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ed5e5c346de62ca5c184b4325a6600d1eaca210666e4606fe4e449574978d0" dependencies = [ + "cfg-if 1.0.0", "parity-scale-codec", + "scale-info", "serde 1.0.130", - "sp-core", - "sp-std", ] [[package]] @@ -1111,20 +1168,22 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "bitflags", - "frame-metadata 14.0.0-dev", + "frame-metadata 14.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "frame-support-procedural", "impl-trait-for-tuples", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell 1.8.0", "parity-scale-codec", "paste", + "scale-info", "serde 1.0.130", "smallvec 1.7.0", "sp-arithmetic", "sp-core", + "sp-core-hashing-proc-macro", "sp-inherents", "sp-io 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", "sp-runtime", @@ -1132,12 +1191,13 @@ dependencies = [ "sp-state-machine", "sp-std", "sp-tracing", + "tt-call", ] [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -1149,7 +1209,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1161,7 +1221,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "proc-macro2", "quote", @@ -1171,11 +1231,12 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", + "scale-info", "serde 1.0.130", "sp-core", "sp-io 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", @@ -1187,7 +1248,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", "sp-api", @@ -1238,17 +1299,17 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca" +checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e" dependencies = [ - "futures-channel 0.3.17", - "futures-core 0.3.17", - "futures-executor 0.3.17", - "futures-io 0.3.17", - "futures-sink 0.3.17", - "futures-task 0.3.17", - "futures-util 0.3.17", + "futures-channel 0.3.18", + "futures-core 0.3.18", + "futures-executor 0.3.18", + "futures-io 0.3.18", + "futures-sink 0.3.18", + "futures-task 0.3.18", + "futures-util 0.3.18", ] [[package]] @@ -1263,12 +1324,12 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" +checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27" dependencies = [ - "futures-core 0.3.17", - "futures-sink 0.3.17", + "futures-core 0.3.18", + "futures-sink 0.3.18", ] [[package]] @@ -1281,9 +1342,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" +checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445" [[package]] name = "futures-executor" @@ -1298,13 +1359,13 @@ dependencies = [ [[package]] name = "futures-executor" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c" +checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97" dependencies = [ - "futures-core 0.3.17", - "futures-task 0.3.17", - "futures-util 0.3.17", + "futures-core 0.3.18", + "futures-task 0.3.18", + "futures-util 0.3.18", "num_cpus", ] @@ -1318,9 +1379,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" +checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11" [[package]] name = "futures-macro" @@ -1335,12 +1396,10 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" +checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd" dependencies = [ - "autocfg 1.0.1", - "proc-macro-hack", "proc-macro2", "quote", "syn", @@ -1353,9 +1412,9 @@ source = "git+https://github.com/mesalock-linux/futures-rs-sgx#d54882f24ddf7d613 [[package]] name = "futures-sink" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" +checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af" [[package]] name = "futures-task" @@ -1368,9 +1427,9 @@ dependencies = [ [[package]] name = "futures-task" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" +checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12" [[package]] name = "futures-timer" @@ -1400,22 +1459,19 @@ dependencies = [ [[package]] name = "futures-util" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" +checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e" dependencies = [ - "autocfg 1.0.1", - "futures-channel 0.3.17", - "futures-core 0.3.17", - "futures-io 0.3.17", - "futures-macro 0.3.17", - "futures-sink 0.3.17", - "futures-task 0.3.17", + "futures-channel 0.3.18", + "futures-core 0.3.18", + "futures-io 0.3.18", + "futures-macro 0.3.18", + "futures-sink 0.3.18", + "futures-task 0.3.18", "memchr 2.4.1", "pin-project-lite", "pin-utils", - "proc-macro-hack", - "proc-macro-nested", "slab 0.4.5", ] @@ -1461,7 +1517,7 @@ checksum = "e4ac03428b3276fc7f1756eba0c76c7c0c91ef77e1c43fbdd47a460238419cb9" dependencies = [ "num-traits 0.2.14", "serde 1.0.130", - "serde_json 1.0.70", + "serde_json 1.0.72", ] [[package]] @@ -1532,9 +1588,9 @@ checksum = "7fd819562fcebdac5afc5c113c3ec36f902840b70fd4fc458799c8ce4607ae55" dependencies = [ "bytes 1.1.0", "fnv 1.0.7", - "futures-core 0.3.17", - "futures-sink 0.3.17", - "futures-util 0.3.17", + "futures-core 0.3.18", + "futures-sink 0.3.18", + "futures-util 0.3.18", "http 0.2.5", "indexmap", "slab 0.4.5", @@ -1743,9 +1799,9 @@ checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" [[package]] name = "httpdate" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "humantime" @@ -1773,14 +1829,14 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.14" +version = "0.14.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b91bb1f221b6ea1f1e4371216b70f40748774c2fb5971b450c07773fb92d26b" +checksum = "436ec0091e4f20e655156a30a0df3770fe2900aa301e548e08446ec794b6953c" dependencies = [ "bytes 1.1.0", - "futures-channel 0.3.17", - "futures-core 0.3.17", - "futures-util 0.3.17", + "futures-channel 0.3.18", + "futures-core 0.3.18", + "futures-util 0.3.18", "h2", "http 0.2.5", "http-body", @@ -1803,7 +1859,7 @@ checksum = "3538ce6aeb81f7cd0d547a42435944d2283714a3f696630318bc47bd839fcfc9" dependencies = [ "bytes 1.1.0", "common-multipart-rfc7578", - "futures 0.3.17", + "futures 0.3.18", "http 0.2.5", "hyper", ] @@ -1815,7 +1871,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ "ct-logs", - "futures-util 0.3.17", + "futures-util 0.3.18", "hyper", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustls 0.19.1", @@ -1841,13 +1897,14 @@ dependencies = [ [[package]] name = "ias-verify" version = "0.1.4" -source = "git+https://github.com/integritee-network/pallets.git?branch=master#2dbe761f0bb09fcb731e5ce16b25d6fff1b9e85b" +source = "git+https://github.com/integritee-network/pallets.git?branch=master#31cf747a0240a319b141580eabadb52794d3e509" dependencies = [ "base64 0.11.0", "chrono", "frame-support", "parity-scale-codec", - "serde_json 1.0.70", + "scale-info", + "serde_json 1.0.72", "sp-core", "sp-io 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", "sp-std", @@ -1931,7 +1988,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca80fdd4829ab7569b7a72db4784b2f819d42f124e189c47dba0f72861c3888a" dependencies = [ "async-trait", - "futures 0.3.17", + "futures 0.3.18", ] [[package]] @@ -1947,7 +2004,7 @@ dependencies = [ name = "integritee-cli" version = "0.8.0" dependencies = [ - "base58", + "base58 0.1.0", "blake2-rfc", "chrono", "clap", @@ -1968,7 +2025,7 @@ dependencies = [ "primitive-types", "sc-keystore", "serde 1.0.130", - "serde_json 1.0.70", + "serde_json 1.0.72", "sgx_crypto_helper", "sp-application-crypto", "sp-core", @@ -1977,14 +2034,15 @@ dependencies = [ "substrate-api-client", "substrate-bip39", "substrate-client-keystore", + "teerex-primitives", "tiny-bip39 0.6.2", "ws", ] [[package]] name = "integritee-node-runtime" -version = "0.9.3" -source = "git+https://github.com/integritee-network/integritee-node?branch=master#cdd2ce5a3938b1a41cb0578d034f742d368bd963" +version = "1.0.5" +source = "git+https://github.com/integritee-network/integritee-node?branch=master#a97ddbce0048a9b48eef76799f3e42e37690c334" dependencies = [ "frame-executive", "frame-support", @@ -2008,6 +2066,7 @@ dependencies = [ "pallet-utility", "pallet-vesting", "parity-scale-codec", + "scale-info", "sp-api", "sp-block-builder", "sp-consensus-aura", @@ -2028,7 +2087,7 @@ version = "0.8.0" dependencies = [ "anyhow", "async-trait", - "base58", + "base58 0.1.0", "cid", "clap", "dashmap", @@ -2036,7 +2095,7 @@ dependencies = [ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "frame-support", "frame-system", - "futures 0.3.17", + "futures 0.3.18", "hex", "integritee-node-runtime", "ipfs-api", @@ -2061,7 +2120,7 @@ dependencies = [ "rust-crypto", "serde 1.0.130", "serde_derive 1.0.130", - "serde_json 1.0.70", + "serde_json 1.0.72", "sgx_crypto_helper", "sgx_types", "sgx_urts", @@ -2071,6 +2130,7 @@ dependencies = [ "sp-keyring", "sp-runtime", "substrate-api-client", + "teerex-primitives", "thiserror 1.0.30", "tokio", "ws", @@ -2102,14 +2162,14 @@ dependencies = [ "bytes 1.1.0", "dirs 3.0.2", "failure", - "futures 0.3.17", + "futures 0.3.18", "http 0.2.5", "hyper", "hyper-multipart-rfc7578", "hyper-tls", "parity-multiaddr", "serde 1.0.130", - "serde_json 1.0.70", + "serde_json 1.0.72", "serde_urlencoded", "tokio", "tokio-util", @@ -2122,7 +2182,7 @@ dependencies = [ name = "ita-stf" version = "0.8.0" dependencies = [ - "base58", + "base58 0.1.0", "clap", "clap-nested", "derive_more", @@ -2163,7 +2223,7 @@ dependencies = [ "jsonrpc-core 18.0.0", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", - "serde_json 1.0.70", + "serde_json 1.0.72", "sgx_tstd", "sgx_types", "sp-runtime", @@ -2293,7 +2353,7 @@ dependencies = [ "http_req 0.7.2 (git+https://github.com/mesalock-linux/http_req-sgx?tag=sgx_1.1.3)", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.130", - "serde_json 1.0.70", + "serde_json 1.0.72", "sgx_tstd", "sgx_types", "thiserror 1.0.30", @@ -2311,7 +2371,7 @@ dependencies = [ "openssl", "parity-scale-codec", "serde_derive 1.0.130", - "serde_json 1.0.70", + "serde_json 1.0.72", "sgx_crypto_helper", "url 2.2.2", "ws", @@ -2329,7 +2389,7 @@ dependencies = [ "jsonrpsee", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", - "serde_json 1.0.70", + "serde_json 1.0.72", "sp-core", "tokio", ] @@ -2405,7 +2465,7 @@ dependencies = [ "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "mockall", "parity-scale-codec", - "serde_json 1.0.70", + "serde_json 1.0.72", "sgx_crypto_helper", "sgx_types", "sgx_urts", @@ -2480,7 +2540,7 @@ dependencies = [ "serde 1.0.118 (git+https://github.com/mesalock-linux/serde-sgx?tag=sgx_1.1.3)", "serde 1.0.130", "serde_json 1.0.60 (git+https://github.com/mesalock-linux/serde-json-sgx?tag=sgx_1.1.3)", - "serde_json 1.0.70", + "serde_json 1.0.72", "sgx_crypto_helper", "sgx_rand", "sgx_tstd", @@ -2543,7 +2603,7 @@ name = "itp-storage" version = "0.8.0" dependencies = [ "derive_more", - "frame-metadata 14.2.0", + "frame-metadata 14.2.0 (git+https://github.com/paritytech/frame-metadata.git?branch=main)", "frame-support", "hash-db", "parity-scale-codec", @@ -2621,7 +2681,7 @@ dependencies = [ "parity-scale-codec", "primitive-types", "serde 1.0.130", - "serde_json 1.0.70", + "serde_json 1.0.72", "sgx_tstd", "sp-core", "sp-keyring", @@ -2939,13 +2999,13 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" dependencies = [ - "futures 0.3.17", - "futures-executor 0.3.17", - "futures-util 0.3.17", + "futures 0.3.18", + "futures-executor 0.3.18", + "futures-util 0.3.18", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.130", "serde_derive 1.0.130", - "serde_json 1.0.70", + "serde_json 1.0.72", ] [[package]] @@ -2977,7 +3037,7 @@ dependencies = [ "jsonrpsee-utils", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.130", - "serde_json 1.0.70", + "serde_json 1.0.72", "thiserror 1.0.30", "url 2.2.2", ] @@ -2988,8 +3048,8 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d22372378f63f7d16de453e786afc740fca5ee80bd260be024a616b6ac2cefe5" dependencies = [ - "futures-channel 0.3.17", - "futures-util 0.3.17", + "futures-channel 0.3.18", + "futures-util 0.3.18", "globset", "hyper", "jsonrpsee-types", @@ -2997,7 +3057,7 @@ dependencies = [ "lazy_static", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.130", - "serde_json 1.0.70", + "serde_json 1.0.72", "socket2", "thiserror 1.0.30", "tokio", @@ -3025,12 +3085,12 @@ checksum = "c0cf7bd4e93b3b56e59131de7f24afbea871faf914e97bcdd942c86927ab0172" dependencies = [ "async-trait", "beef", - "futures-channel 0.3.17", - "futures-util 0.3.17", + "futures-channel 0.3.18", + "futures-util 0.3.18", "hyper", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.130", - "serde_json 1.0.70", + "serde_json 1.0.72", "soketto", "thiserror 1.0.30", ] @@ -3041,8 +3101,8 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47554ecaacb479285da68799d9b6afc258c32b332cc8b85829c6a9304ee98776" dependencies = [ - "futures-channel 0.3.17", - "futures-util 0.3.17", + "futures-channel 0.3.18", + "futures-util 0.3.18", "hyper", "jsonrpsee-types", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3050,7 +3110,7 @@ dependencies = [ "rand 0.8.4", "rustc-hash", "serde 1.0.130", - "serde_json 1.0.70", + "serde_json 1.0.72", "thiserror 1.0.30", ] @@ -3062,14 +3122,14 @@ checksum = "6ec51150965544e1a4468f372bdab8545243a1b045d4ab272023aac74c60de32" dependencies = [ "async-trait", "fnv 1.0.7", - "futures 0.3.17", + "futures 0.3.18", "jsonrpsee-types", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "pin-project", "rustls 0.19.1", "rustls-native-certs", "serde 1.0.130", - "serde_json 1.0.70", + "serde_json 1.0.72", "soketto", "thiserror 1.0.30", "tokio", @@ -3084,14 +3144,14 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b512c3c679a89d20f97802f69188a2d01f6234491b7513076e21e8424efccafe" dependencies = [ - "futures-channel 0.3.17", - "futures-util 0.3.17", + "futures-channel 0.3.18", + "futures-util 0.3.18", "jsonrpsee-types", "jsonrpsee-utils", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hash", "serde 1.0.130", - "serde_json 1.0.70", + "serde_json 1.0.72", "soketto", "thiserror 1.0.30", "tokio", @@ -3132,9 +3192,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.107" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219" +checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119" [[package]] name = "libloading" @@ -3174,15 +3234,34 @@ dependencies = [ "base64 0.12.3", "digest 0.9.0", "hmac-drbg", - "libsecp256k1-core", - "libsecp256k1-gen-ecmult", - "libsecp256k1-gen-genmult", + "libsecp256k1-core 0.2.2", + "libsecp256k1-gen-ecmult 0.2.1", + "libsecp256k1-gen-genmult 0.2.1", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.130", "sha2 0.9.8", "typenum 1.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "libsecp256k1" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0452aac8bab02242429380e9b2f94ea20cea2b37e2c1777a1358799bbe97f37" +dependencies = [ + "arrayref", + "base64 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "digest 0.9.0", + "hmac-drbg", + "libsecp256k1-core 0.3.0", + "libsecp256k1-gen-ecmult 0.3.0", + "libsecp256k1-gen-genmult 0.3.0", + "rand 0.8.4", + "serde 1.0.130", + "sha2 0.9.8", + "typenum 1.14.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "libsecp256k1-core" version = "0.2.2" @@ -3194,13 +3273,33 @@ dependencies = [ "subtle 2.4.1", ] +[[package]] +name = "libsecp256k1-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" +dependencies = [ + "crunchy", + "digest 0.9.0", + "subtle 2.4.1", +] + [[package]] name = "libsecp256k1-gen-ecmult" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3" dependencies = [ - "libsecp256k1-core", + "libsecp256k1-core 0.2.2", +] + +[[package]] +name = "libsecp256k1-gen-ecmult" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809" +dependencies = [ + "libsecp256k1-core 0.3.0", ] [[package]] @@ -3209,7 +3308,16 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d" dependencies = [ - "libsecp256k1-core", + "libsecp256k1-core 0.2.2", +] + +[[package]] +name = "libsecp256k1-gen-genmult" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c" +dependencies = [ + "libsecp256k1-core 0.3.0", ] [[package]] @@ -3245,15 +3353,6 @@ dependencies = [ "scopeguard 0.3.3", ] -[[package]] -name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard 1.1.0", -] - [[package]] name = "lock_api" version = "0.4.5" @@ -3312,9 +3411,9 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "matrixmultiply" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a8a15b776d9dfaecd44b03c5828c2199cddff5247215858aac14624f8d6b741" +checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84" dependencies = [ "rawpointer", ] @@ -3627,7 +3726,7 @@ version = "6.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" dependencies = [ - "bitvec 0.19.5", + "bitvec 0.19.6", "funty", "memchr 2.4.1", "version_check", @@ -3908,9 +4007,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-sys" -version = "0.9.70" +version = "0.9.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6517987b3f8226b5da3661dad65ff7f300cc59fb5ea8333ca191fc65fde3edf" +checksum = "7df13d165e607909b363a4757a6f133f8a818a74e9d3a98d09c6128e15fa4c73" dependencies = [ "autocfg 1.0.1", "cc", @@ -3922,12 +4021,13 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "pallet-timestamp", "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-consensus-aura", "sp-runtime", @@ -3937,12 +4037,13 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", + "scale-info", "sp-authorship", "sp-runtime", "sp-std", @@ -3951,13 +4052,14 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] @@ -3965,8 +4067,9 @@ dependencies = [ [[package]] name = "pallet-claims" version = "0.9.12" -source = "git+https://github.com/integritee-network/pallets.git?branch=master#2dbe761f0bb09fcb731e5ce16b25d6fff1b9e85b" +source = "git+https://github.com/integritee-network/pallets.git?branch=master#31cf747a0240a319b141580eabadb52794d3e509" dependencies = [ + "claims-primitives", "frame-support", "frame-system", "parity-scale-codec", @@ -3982,7 +4085,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-benchmarking", "frame-support", @@ -3991,6 +4094,7 @@ dependencies = [ "pallet-authorship", "pallet-session", "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-core", "sp-finality-grandpa", @@ -4004,11 +4108,12 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "sp-io 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", "sp-runtime", "sp-std", @@ -4017,12 +4122,13 @@ dependencies = [ [[package]] name = "pallet-parentchain" version = "0.9.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=teaclave-1.1.3#1a529c857854a8569c367fdbd8fe6fb416cbd483" +source = "git+https://github.com/integritee-network/pallets.git?branch=master#31cf747a0240a319b141580eabadb52794d3e509" dependencies = [ "frame-support", "frame-system", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", + "scale-info", "sp-core", "sp-io 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", "sp-runtime", @@ -4032,11 +4138,12 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "sp-io 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", "sp-runtime", "sp-std", @@ -4045,12 +4152,13 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "safe-mix", + "scale-info", "sp-runtime", "sp-std", ] @@ -4058,13 +4166,14 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", + "scale-info", "sp-io 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", "sp-runtime", "sp-std", @@ -4073,7 +4182,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", @@ -4081,6 +4190,7 @@ dependencies = [ "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "pallet-timestamp", "parity-scale-codec", + "scale-info", "sp-core", "sp-io 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", "sp-runtime", @@ -4093,11 +4203,12 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "sp-io 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", "sp-runtime", "sp-std", @@ -4106,28 +4217,29 @@ dependencies = [ [[package]] name = "pallet-teeracle" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=master#2dbe761f0bb09fcb731e5ce16b25d6fff1b9e85b" +source = "git+https://github.com/integritee-network/pallets.git?branch=master#31cf747a0240a319b141580eabadb52794d3e509" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", - "pallet-balances", "pallet-teerex", "pallet-timestamp", "parity-scale-codec", + "scale-info", "sp-core", "sp-io 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", "sp-runtime", "sp-std", "substrate-fixed", + "teeracle-primitives", "test-utils", ] [[package]] name = "pallet-teerex" version = "0.9.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=master#2dbe761f0bb09fcb731e5ce16b25d6fff1b9e85b" +source = "git+https://github.com/integritee-network/pallets.git?branch=master#31cf747a0240a319b141580eabadb52794d3e509" dependencies = [ "frame-benchmarking", "frame-support", @@ -4137,24 +4249,27 @@ dependencies = [ "pallet-balances", "pallet-timestamp", "parity-scale-codec", + "scale-info", "serde 1.0.130", "sp-core", "sp-io 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", "sp-runtime", "sp-std", + "teerex-primitives", "test-utils", ] [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", + "scale-info", "sp-inherents", "sp-runtime", "sp-std", @@ -4164,11 +4279,12 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "serde 1.0.130", "smallvec 1.7.0", "sp-core", @@ -4180,7 +4296,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -4191,13 +4307,14 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "pallet-balances", "parity-scale-codec", + "scale-info", "serde 1.0.130", "sp-runtime", "sp-std", @@ -4206,11 +4323,12 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "sp-core", "sp-io 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", "sp-runtime", @@ -4220,12 +4338,13 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] @@ -4325,16 +4444,6 @@ dependencies = [ "parking_lot_core 0.4.0", ] -[[package]] -name = "parking_lot" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.7.2", -] - [[package]] name = "parking_lot" version = "0.11.2" @@ -4359,20 +4468,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "parking_lot_core" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "smallvec 1.7.0", - "winapi 0.3.9", -] - [[package]] name = "parking_lot_core" version = "0.8.5" @@ -4550,6 +4645,7 @@ dependencies = [ "fixed-hash", "impl-codec", "impl-serde", + "scale-info", "uint", ] @@ -5226,16 +5322,6 @@ dependencies = [ "security-framework", ] -[[package]] -name = "ruzstd" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cada0ef59efa6a5f4dc5e491f93d9f31e3fc7758df421ff1de8a706338e1100" -dependencies = [ - "byteorder 1.4.3", - "twox-hash", -] - [[package]] name = "ryu" version = "1.0.5" @@ -5263,13 +5349,13 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "async-trait", "derive_more", "hex", "parking_lot 0.11.2", - "serde_json 1.0.70", + "serde_json 1.0.72", "sp-application-crypto", "sp-core", "sp-keystore", @@ -5363,9 +5449,9 @@ dependencies = [ [[package]] name = "secrecy" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0673d6a6449f5e7d12a1caf424fd9363e2af3a4953023ed455e3c4beef4597c0" +checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" dependencies = [ "zeroize", ] @@ -5418,6 +5504,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ "semver-parser 0.10.2", +] + +[[package]] +name = "semver" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" +dependencies = [ "serde 1.0.130", ] @@ -5526,9 +5620,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.70" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e277c495ac6cd1a01a58d0a0c574568b4d1ddf14f59965c6a58b8d96400b54f3" +checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527" dependencies = [ "itoa 0.4.8", "ryu", @@ -5550,7 +5644,7 @@ dependencies = [ [[package]] name = "sgx-externalities" version = "0.4.0" -source = "git+https://github.com/integritee-network/sgx-runtime?branch=master#f864715987f723b27e48144c32fdf2480bf9761c" +source = "git+https://github.com/integritee-network/sgx-runtime?branch=master#a5e2d8b6bcb226acba0ca473b4fb028daa73278b" dependencies = [ "derive_more", "environmental", @@ -5565,7 +5659,7 @@ dependencies = [ [[package]] name = "sgx-runtime" version = "0.8.0" -source = "git+https://github.com/integritee-network/sgx-runtime?branch=master#f864715987f723b27e48144c32fdf2480bf9761c" +source = "git+https://github.com/integritee-network/sgx-runtime?branch=master#a5e2d8b6bcb226acba0ca473b4fb028daa73278b" dependencies = [ "frame-executive", "frame-support", @@ -5581,6 +5675,7 @@ dependencies = [ "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", + "scale-info", "sp-api", "sp-block-builder", "sp-consensus-aura", @@ -5871,15 +5966,6 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" -[[package]] -name = "slog" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06" -dependencies = [ - "erased-serde", -] - [[package]] name = "smallvec" version = "0.6.14" @@ -5921,7 +6007,7 @@ checksum = "4919971d141dbadaa0e82b5d369e2d7666c98e4625046140615ca363e50d4daa" dependencies = [ "base64 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 1.1.0", - "futures 0.3.17", + "futures 0.3.18", "httparse 1.5.1", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.8.4", @@ -5931,7 +6017,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "hash-db", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5948,7 +6034,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -5960,9 +6046,10 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", + "scale-info", "serde 1.0.130", "sp-core", "sp-io 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=master)", @@ -5972,11 +6059,12 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "integer-sqrt", "num-traits 0.2.14", "parity-scale-codec", + "scale-info", "serde 1.0.130", "sp-debug-derive", "sp-std", @@ -5986,7 +6074,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "async-trait", "parity-scale-codec", @@ -5998,7 +6086,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", "sp-api", @@ -6013,7 +6101,7 @@ version = "0.10.0-dev" source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" dependencies = [ "async-trait", - "futures 0.3.17", + "futures 0.3.18", "futures-timer", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", @@ -6029,10 +6117,11 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "async-trait", "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-consensus", @@ -6046,9 +6135,11 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", + "scale-info", + "serde 1.0.130", "sp-arithmetic", "sp-runtime", ] @@ -6056,20 +6147,21 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ - "base58", + "base58 0.2.0", + "bitflags", "blake2-rfc", "byteorder 1.4.3", "dyn-clonable", "ed25519-dalek", - "futures 0.3.17", + "futures 0.3.18", "hash-db", "hash256-std-hasher", "hex", "impl-serde", "lazy_static", - "libsecp256k1", + "libsecp256k1 0.7.0", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "merlin", "num-traits 0.2.14", @@ -6079,15 +6171,18 @@ dependencies = [ "primitive-types", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.5.4", + "scale-info", "schnorrkel", "secrecy", "serde 1.0.130", "sha2 0.9.8", + "sp-core-hashing", "sp-debug-derive", "sp-externalities", "sp-runtime-interface", "sp-std", "sp-storage", + "ss58-registry", "substrate-bip39", "thiserror 1.0.30", "tiny-bip39 0.8.2", @@ -6097,10 +6192,34 @@ dependencies = [ "zeroize", ] +[[package]] +name = "sp-core-hashing" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" +dependencies = [ + "blake2-rfc", + "byteorder 1.4.3", + "sha2 0.9.8", + "sp-std", + "tiny-keccak 2.0.2", + "twox-hash", +] + +[[package]] +name = "sp-core-hashing-proc-macro" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" +dependencies = [ + "proc-macro2", + "quote", + "sp-core-hashing", + "syn", +] + [[package]] name = "sp-debug-derive" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "proc-macro2", "quote", @@ -6110,7 +6229,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "environmental", "parity-scale-codec", @@ -6121,11 +6240,12 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "finality-grandpa", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", + "scale-info", "serde 1.0.130", "sp-api", "sp-application-crypto", @@ -6138,7 +6258,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -6152,12 +6272,12 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/integritee-network/sgx-runtime?branch=master#f864715987f723b27e48144c32fdf2480bf9761c" +source = "git+https://github.com/integritee-network/sgx-runtime?branch=master#a5e2d8b6bcb226acba0ca473b4fb028daa73278b" dependencies = [ "environmental", - "futures 0.3.17", + "futures 0.3.18", "hash-db", - "libsecp256k1", + "libsecp256k1 0.6.0", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", "parking_lot 0.11.2", @@ -6180,18 +6300,17 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ - "futures 0.3.17", + "futures 0.3.18", "hash-db", - "libsecp256k1", + "libsecp256k1 0.7.0", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", "parking_lot 0.11.2", "sp-core", "sp-externalities", "sp-keystore", - "sp-maybe-compressed-blob", "sp-runtime-interface", "sp-state-machine", "sp-std", @@ -6205,7 +6324,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "lazy_static", "sp-core", @@ -6216,11 +6335,11 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "async-trait", "derive_more", - "futures 0.3.17", + "futures 0.3.18", "merlin", "parity-scale-codec", "parking_lot 0.11.2", @@ -6232,17 +6351,16 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +version = "4.1.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ - "ruzstd", "zstd", ] [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "sp-api", "sp-core", @@ -6251,16 +6369,18 @@ dependencies = [ [[package]] name = "sp-panic-handler" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "backtrace", + "lazy_static", + "regex 1.5.4", ] [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "rustc-hash", "serde 1.0.130", @@ -6270,7 +6390,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "either", "hash256-std-hasher", @@ -6280,6 +6400,7 @@ dependencies = [ "parity-util-mem", "paste", "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "scale-info", "serde 1.0.130", "sp-application-crypto", "sp-arithmetic", @@ -6291,7 +6412,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6308,7 +6429,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "Inflector", "proc-macro-crate", @@ -6320,9 +6441,10 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", + "scale-info", "sp-api", "sp-core", "sp-runtime", @@ -6333,9 +6455,10 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] @@ -6343,7 +6466,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "hash-db", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", @@ -6366,12 +6489,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "impl-serde", "parity-scale-codec", @@ -6384,7 +6507,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "async-trait", "futures-timer", @@ -6400,15 +6523,9 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ - "erased-serde", - "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "parity-scale-codec", - "parking_lot 0.10.2", - "serde 1.0.130", - "serde_json 1.0.70", - "slog", "sp-std", "tracing", "tracing-core", @@ -6418,7 +6535,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "sp-api", "sp-runtime", @@ -6427,11 +6544,12 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "hash-db", "memory-db", "parity-scale-codec", + "scale-info", "sp-core", "sp-std", "trie-db", @@ -6441,11 +6559,12 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "impl-serde", "parity-scale-codec", "parity-wasm 0.42.2", + "scale-info", "serde 1.0.130", "sp-runtime", "sp-std", @@ -6456,7 +6575,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -6467,7 +6586,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -6481,6 +6600,20 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "ss58-registry" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78abb01d308934b82e34e9cf1f45846d31539246501745b129539176f4f3368d" +dependencies = [ + "Inflector", + "proc-macro2", + "quote", + "serde 1.0.130", + "serde_json 1.0.72", + "unicode-xid", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -6508,18 +6641,18 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "strum" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c" +checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.20.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149" +checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" dependencies = [ "heck", "proc-macro2", @@ -6530,9 +6663,12 @@ dependencies = [ [[package]] name = "substrate-api-client" version = "0.6.0" -source = "git+https://github.com/scs/substrate-api-client?branch=master#f9d3a773bb5c76a0c0689b012fc08599beb90ab7" +source = "git+https://github.com/scs/substrate-api-client?branch=master#a4d931c85f30ba22ff1f982c47caf57fe43ebc90" dependencies = [ - "frame-metadata 14.2.0", + "ac-compose-macros", + "ac-node-api", + "ac-primitives", + "frame-metadata 14.2.0 (git+https://github.com/paritytech/frame-metadata.git?branch=main)", "frame-support", "frame-system", "hex", @@ -6542,7 +6678,7 @@ dependencies = [ "parity-scale-codec", "primitive-types", "serde 1.0.130", - "serde_json 1.0.70", + "serde_json 1.0.72", "sp-application-crypto", "sp-core", "sp-rpc", @@ -6569,13 +6705,13 @@ dependencies = [ [[package]] name = "substrate-client-keystore" version = "0.6.0" -source = "git+https://github.com/scs/substrate-api-client?branch=master#f9d3a773bb5c76a0c0689b012fc08599beb90ab7" +source = "git+https://github.com/scs/substrate-api-client?branch=master#a4d931c85f30ba22ff1f982c47caf57fe43ebc90" dependencies = [ "async-trait", "hex", "parking_lot 0.11.2", "sc-keystore", - "serde_json 1.0.70", + "serde_json 1.0.72", "sp-application-crypto", "sp-core", "sp-keyring", @@ -6585,7 +6721,7 @@ dependencies = [ [[package]] name = "substrate-fixed" version = "0.5.7" -source = "git+https://github.com/encointer/substrate-fixed.git#2f353acee3c7cf7a386863a89fc6cb805048561f" +source = "git+https://github.com/encointer/substrate-fixed.git?tag=v0.5.7#2f353acee3c7cf7a386863a89fc6cb805048561f" dependencies = [ "parity-scale-codec", "scale-info", @@ -6596,7 +6732,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "ansi_term 0.12.1", "build-helper", @@ -6649,6 +6785,27 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "teeracle-primitives" +version = "0.1.0" +source = "git+https://github.com/integritee-network/pallets.git?branch=master#31cf747a0240a319b141580eabadb52794d3e509" +dependencies = [ + "sp-std", + "substrate-fixed", +] + +[[package]] +name = "teerex-primitives" +version = "0.1.0" +source = "git+https://github.com/integritee-network/pallets.git?branch=master#31cf747a0240a319b141580eabadb52794d3e509" +dependencies = [ + "ias-verify", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-std", +] + [[package]] name = "tempfile" version = "3.2.0" @@ -6689,10 +6846,11 @@ checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16" [[package]] name = "test-utils" version = "0.1.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=master#2dbe761f0bb09fcb731e5ce16b25d6fff1b9e85b" +source = "git+https://github.com/integritee-network/pallets.git?branch=master#31cf747a0240a319b141580eabadb52794d3e509" dependencies = [ "hex-literal", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", + "teerex-primitives", ] [[package]] @@ -6896,7 +7054,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" dependencies = [ - "futures-core 0.3.17", + "futures-core 0.3.18", "pin-project-lite", "tokio", ] @@ -6908,9 +7066,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" dependencies = [ "bytes 1.1.0", - "futures-core 0.3.17", - "futures-io 0.3.17", - "futures-sink 0.3.17", + "futures-core 0.3.18", + "futures-io 0.3.18", + "futures-sink 0.3.18", "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", "pin-project-lite", "tokio", @@ -6996,7 +7154,7 @@ dependencies = [ "matchers", "regex 1.5.4", "serde 1.0.130", - "serde_json 1.0.70", + "serde_json 1.0.72", "sharded-slab", "smallvec 1.7.0", "thread_local 1.1.3", @@ -7034,6 +7192,12 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +[[package]] +name = "tt-call" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055" + [[package]] name = "tungstenite" version = "0.14.0" @@ -7081,8 +7245,8 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f559b464de2e2bdabcac6a210d12e9b5a5973c251e102c44c585c71d51bd78e" dependencies = [ - "cfg-if 1.0.0", - "rand 0.8.4", + "cfg-if 0.1.10", + "rand 0.3.23", "static_assertions", ] @@ -7576,18 +7740,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.6.1+zstd.1.4.9" +version = "0.9.0+zstd.1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de55e77f798f205d8561b8fe2ef57abfb6e0ff2abe7fd3c089e119cdb5631a3" +checksum = "07749a5dc2cb6b36661290245e350f15ec3bbb304e493db54a1d354480522ccd" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "3.0.1+zstd.1.4.9" +version = "4.1.1+zstd.1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1387cabcd938127b30ce78c4bf00b30387dddf704e3f0881dbc4ff62b5566f8c" +checksum = "c91c90f2c593b003603e5e0493c837088df4469da25aafff8bce42ba48caf079" dependencies = [ "libc", "zstd-sys", @@ -7595,9 +7759,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.4.20+zstd.1.4.9" +version = "1.6.1+zstd.1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd5b733d7cf2d9447e2c3e76a5589b4f5e5ae065c22a2bc0b023cbc331b6c8e" +checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index 04eb266d89..53e79be04c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,3 +60,18 @@ sgx_ucrypto = { version = "1.1.4", git = "https://github.com/haerdib/incubator-t sgx_tcrypto = { version = "1.1.4", git = "https://github.com/haerdib/incubator-teaclave-sgx-sdk", branch = "master"} sgx_tcrypto_helper = { version = "1.1.4", git = "https://github.com/haerdib/incubator-teaclave-sgx-sdk", branch = "master"} sgx_crypto_helper = { version = "1.1.4", git = "https://github.com/haerdib/incubator-teaclave-sgx-sdk", branch = "master"} + +#[patch."https://github.com/integritee-network/sgx-runtime"] +#sgx-runtime = { path = "../sgx-runtime/runtime"} +#sp-io = { path = "../sgx-runtime/substrate-sgx/sp-io"} +#sgx-externalities = { path = "../sgx-runtime/substrate-sgx/externalities"} + +#[patch."https://github.com/integritee-network/integritee-node"] +#my-node-runtime = { package = "integritee-node-runtime", path = "../integritee-node/runtime"} + +#[patch."https://github.com/integritee-network/pallets.git"] +#pallet-claims = { path = '../pallets/claims' } +#pallet-teerex = { path = '../pallets/teerex' } +#pallet-teeracle = { path = '../pallets/teeracle' } +#teerex-primitives = {path = '../pallets/primitives/teerex'} +#pallet-parentchain = { path = '../pallets/parentchain' } diff --git a/app-libs/stf/src/stf_sgx.rs b/app-libs/stf/src/stf_sgx.rs index 4113a75540..0f5e6758e2 100644 --- a/app-libs/stf/src/stf_sgx.rs +++ b/app-libs/stf/src/stf_sgx.rs @@ -126,11 +126,11 @@ impl Stf { free_balance, reserved_balance ); - sgx_runtime::BalancesCall::::set_balance( - MultiAddress::Id(who), - free_balance, - reserved_balance, - ) + sgx_runtime::BalancesCall::::set_balance { + who: MultiAddress::Id(who), + new_free: free_balance, + new_reserved: reserved_balance, + } .dispatch_bypass_filter(sgx_runtime::Origin::root()) .map_err(|_| StfError::Dispatch("balance_set_balance".to_string()))?; Ok(()) @@ -143,9 +143,12 @@ impl Stf { } else { debug!("sender balance is zero"); } - sgx_runtime::BalancesCall::::transfer(MultiAddress::Id(to), value) - .dispatch_bypass_filter(origin) - .map_err(|_| StfError::Dispatch("balance_transfer".to_string()))?; + sgx_runtime::BalancesCall::::transfer { + dest: MultiAddress::Id(to), + value, + } + .dispatch_bypass_filter(origin) + .map_err(|_| StfError::Dispatch("balance_transfer".to_string()))?; Ok(()) }, TrustedCall::balance_unshield(account_incognito, beneficiary, value, shard) => { @@ -181,18 +184,18 @@ impl Stf { fn shield_funds(account: AccountId, amount: u128) -> StfResult<()> { match get_account_info(&account) { - Some(account_info) => sgx_runtime::BalancesCall::::set_balance( - MultiAddress::Id(account), - account_info.data.free + amount, - account_info.data.reserved, - ) + Some(account_info) => sgx_runtime::BalancesCall::::set_balance { + who: MultiAddress::Id(account), + new_free: account_info.data.free + amount, + new_reserved: account_info.data.reserved, + } .dispatch_bypass_filter(sgx_runtime::Origin::root()) .map_err(|_| StfError::Dispatch("shield_funds".to_string()))?, - None => sgx_runtime::BalancesCall::::set_balance( - MultiAddress::Id(account), - amount, - 0, - ) + None => sgx_runtime::BalancesCall::::set_balance { + who: MultiAddress::Id(account), + new_free: amount, + new_reserved: 0, + } .dispatch_bypass_filter(sgx_runtime::Origin::root()) .map_err(|_| StfError::Dispatch("shield_funds::set_balance".to_string()))?, }; @@ -206,11 +209,11 @@ impl Stf { return Err(StfError::MissingFunds) } - sgx_runtime::BalancesCall::::set_balance( - MultiAddress::Id(account), - account_info.data.free - amount, - account_info.data.reserved, - ) + sgx_runtime::BalancesCall::::set_balance { + who: MultiAddress::Id(account), + new_free: account_info.data.free - amount, + new_reserved: account_info.data.reserved, + } .dispatch_bypass_filter(sgx_runtime::Origin::root()) .map_err(|_| StfError::Dispatch("unshield_funds::set_balance".to_string()))?; Ok(()) @@ -236,7 +239,7 @@ impl Stf { header: ParentchainHeader, ) -> StfResult<()> { ext.execute_with(|| { - sgx_runtime::ParentchainCall::::set_block(header) + sgx_runtime::ParentchainCall::::set_block { header } .dispatch_bypass_filter(sgx_runtime::Origin::root()) .map_err(|_| StfError::Dispatch("update_parentchain_block".to_string())) })?; diff --git a/app-libs/stf/src/test_genesis.rs b/app-libs/stf/src/test_genesis.rs index 8a39c0b951..f1ad39ff5d 100644 --- a/app-libs/stf/src/test_genesis.rs +++ b/app-libs/stf/src/test_genesis.rs @@ -68,11 +68,11 @@ fn endow( for e in endowees.into_iter() { let account = e.0; - sgx_runtime::BalancesCall::::set_balance( - MultiAddress::Id(account.clone()), - e.1, - e.2, - ) + sgx_runtime::BalancesCall::::set_balance { + who: MultiAddress::Id(account.clone()), + new_free: e.1, + new_reserved: e.2, + } .dispatch_bypass_filter(sgx_runtime::Origin::root()) .map_err(|_| StfError::Dispatch("balance_set_balance".to_string())) .unwrap(); diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 4e0493458d..9ab71d1392 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -28,6 +28,7 @@ sgx_crypto_helper = { branch = "master", git = "https://github.com/apache/teacla substrate-api-client = { features = ["ws-client"], git = "https://github.com/scs/substrate-api-client", branch = "master" } substrate-client-keystore = { git = "https://github.com/scs/substrate-api-client", branch = "master" } my-node-runtime = { git = "https://github.com/integritee-network/integritee-node", branch = "master", package = "integritee-node-runtime" } +teerex-primitives = { git = "https://github.com/integritee-network/pallets.git", branch = "master" } # substrate dependencies sp-runtime = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" } diff --git a/cli/src/main.rs b/cli/src/main.rs index 965da57333..d2f75ae924 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -39,26 +39,20 @@ use clap::{AppSettings, Arg, ArgMatches}; use clap_nested::{Command, Commander}; use codec::{Decode, Encode}; use log::*; -use my_node_runtime::{ - pallet_teerex::Request, AccountId, BalancesCall, Call, Event, Hash, Signature, -}; - +use my_node_runtime::{AccountId, BalancesCall, Call, Event, Hash, Signature}; use sp_core::{crypto::Ss58Codec, sr25519 as sr25519_core, Pair, H256}; use sp_runtime::{ traits::{IdentifyAccount, Verify}, MultiSignature, }; -use std::{convert::TryFrom, result::Result as StdResult, sync::mpsc::channel, thread}; +use std::{result::Result as StdResult, sync::mpsc::channel, thread}; use substrate_api_client::{ compose_extrinsic, compose_extrinsic_offline, - extrinsic::xt_primitives::{GenericAddress, UncheckedExtrinsicV4}, - rpc::{ - ws_client::{EventsDecoder, Subscriber}, - WsRpcClient, - }, + rpc::{ws_client::Subscriber, WsRpcClient}, utils::FromHexString, - Api, Metadata, RpcClient, XtStatus, + Api, GenericAddress, Metadata, RpcClient, UncheckedExtrinsicV4, XtStatus, }; +use teerex_primitives::Request; use ita_stf::{ShardIdentifier, TrustedCallSigned, TrustedOperation}; use itc_rpc_client::direct_client::{DirectApi, DirectClient as DirectWorkerApi}; @@ -186,10 +180,10 @@ fn main() { #[allow(clippy::redundant_clone)] let xt: UncheckedExtrinsicV4<_> = compose_extrinsic_offline!( _api.clone().signer.unwrap(), - Call::Balances(BalancesCall::transfer( - GenericAddress::Id(to.clone()), - PREFUNDING_AMOUNT - )), + Call::Balances(BalancesCall::transfer { + dest: GenericAddress::Id(to.clone()), + value: PREFUNDING_AMOUNT + }), nonce, Era::Immortal, _api.genesis_hash, @@ -539,16 +533,12 @@ fn send_request(matches: &ArgMatches<'_>, call: TrustedCallSigned) -> Option("ShardIdentifier").unwrap(); - decoder.register_type_size::("H256").unwrap(); - loop { let ret: ProcessedParentchainBlockArgs = _chain_api .wait_for_event::( TEEREX, "ProcessedParentchainBlock", - Some(decoder.clone()), + None, &events_out, ) .unwrap(); @@ -701,10 +691,10 @@ fn listen(matches: &ArgMatches<'_>) { Event::Balances(be) => { println!(">>>>>>>>>> balances event: {:?}", be); match &be { - pallet_balances::Event::Transfer(from, to, value) => { + pallet_balances::Event::Transfer { from, to, amount } => { println!("From: {:?}", from); println!("To: {:?}", to); - println!("Value: {:?}", value); + println!("Value: {:?}", amount); }, _ => { debug!("ignoring unsupported balances event"); diff --git a/core/parentchain/indirect-calls-executor/src/indirect_calls_executor.rs b/core/parentchain/indirect-calls-executor/src/indirect_calls_executor.rs index 37beb365b0..0667abf4be 100644 --- a/core/parentchain/indirect-calls-executor/src/indirect_calls_executor.rs +++ b/core/parentchain/indirect-calls-executor/src/indirect_calls_executor.rs @@ -28,7 +28,7 @@ use log::*; use sp_core::blake2_256; use sp_runtime::traits::{Block as BlockT, Header}; use std::{sync::Arc, vec::Vec}; -use substrate_api_client::extrinsic::xt_primitives::UncheckedExtrinsicV4; +use substrate_api_client::UncheckedExtrinsicV4; /// Trait to execute the indirect calls found in the extrinsics of a block. pub trait ExecuteIndirectCalls { diff --git a/core/parentchain/light-client/src/lib.rs b/core/parentchain/light-client/src/lib.rs index a72e2adf78..79c67a40a7 100644 --- a/core/parentchain/light-client/src/lib.rs +++ b/core/parentchain/light-client/src/lib.rs @@ -43,7 +43,7 @@ use sp_finality_grandpa::{ AuthorityId, AuthorityWeight, ConsensusLog, ScheduledChange, GRANDPA_ENGINE_ID, }; use sp_runtime::{ - generic::{Digest as DigestG, OpaqueDigestItemId}, + generic::{Digest, OpaqueDigestItemId}, traits::{Block as BlockT, Hash as HashT, Header as HeaderT}, Justification, Justifications, OpaqueExtrinsic, }; @@ -454,16 +454,12 @@ impl LightClientState for LightValidation { } } -pub fn grandpa_log( - digest: &DigestG>, -) -> Option>> { +pub fn grandpa_log(digest: &Digest) -> Option>> { let id = OpaqueDigestItemId::Consensus(&GRANDPA_ENGINE_ID); digest.convert_first(|l| l.try_to::>>(id)) } -pub fn pending_change( - digest: &DigestG>, -) -> Option>> { +pub fn pending_change(digest: &Digest) -> Option>> { grandpa_log::(digest).and_then(|log| log.try_into_change()) } diff --git a/enclave-runtime/Cargo.lock b/enclave-runtime/Cargo.lock index 6b7591d46b..fd6af69a70 100644 --- a/enclave-runtime/Cargo.lock +++ b/enclave-runtime/Cargo.lock @@ -12,13 +12,28 @@ dependencies = [ "regex 1.5.4", ] +[[package]] +name = "ac-compose-macros" +version = "0.1.0" +source = "git+https://github.com/scs/substrate-api-client?branch=master#a4d931c85f30ba22ff1f982c47caf57fe43ebc90" +dependencies = [ + "ac-primitives", + "log 0.4.14 (git+https://github.com/mesalock-linux/log-sgx)", + "parity-scale-codec", + "sp-runtime", + "sp-std", +] + [[package]] name = "ac-primitives" version = "0.1.0" -source = "git+https://github.com/scs/substrate-api-client?branch=master#2edd060c0a515718d62f3a78008b4123a5acefeb" +source = "git+https://github.com/scs/substrate-api-client?branch=master#a4d931c85f30ba22ff1f982c47caf57fe43ebc90" dependencies = [ + "hex", "parity-scale-codec", "sp-core", + "sp-runtime", + "sp-std", ] [[package]] @@ -127,9 +142,9 @@ source = "git+https://github.com/whalelephant/base-x-rs?branch=no_std#906c9ac592 [[package]] name = "base64" -version = "0.12.3" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "base64" @@ -447,9 +462,9 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4620d40f6d2601794401d6dd95a5cf69b6c157852539470eeda433a99b3c0efc" +checksum = "74e1069e39f1454367eb2de793ed062fac4c35c2934b76a81d90dd9abcd28816" dependencies = [ "signature", ] @@ -581,7 +596,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" dependencies = [ "either", - "futures 0.3.17", + "futures 0.3.18", "num-traits 0.2.14", "parity-scale-codec", "scale-info", @@ -613,11 +628,12 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -627,12 +643,13 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "14.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +version = "14.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ed5e5c346de62ca5c184b4325a6600d1eaca210666e4606fe4e449574978d0" dependencies = [ + "cfg-if 1.0.0", "parity-scale-codec", - "sp-core", - "sp-std", + "scale-info", ] [[package]] @@ -647,30 +664,33 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "bitflags", - "frame-metadata 14.0.0-dev", + "frame-metadata 14.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "frame-support-procedural", "impl-trait-for-tuples", "log 0.4.14 (git+https://github.com/mesalock-linux/log-sgx)", "parity-scale-codec", "paste", + "scale-info", "smallvec 1.7.0", "sp-arithmetic", "sp-core", + "sp-core-hashing-proc-macro", "sp-inherents", "sp-io", "sp-runtime", "sp-staking", "sp-std", "sp-tracing", + "tt-call", ] [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -682,7 +702,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -694,7 +714,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "proc-macro2", "quote 1.0.10", @@ -704,11 +724,12 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "log 0.4.14 (git+https://github.com/mesalock-linux/log-sgx)", "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -719,7 +740,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", "sp-api", @@ -748,17 +769,17 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca" +checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e" dependencies = [ - "futures-channel 0.3.17", - "futures-core 0.3.17", - "futures-executor 0.3.17", - "futures-io 0.3.17", - "futures-sink 0.3.17", - "futures-task 0.3.17", - "futures-util 0.3.17", + "futures-channel 0.3.18", + "futures-core 0.3.18", + "futures-executor 0.3.18", + "futures-io 0.3.18", + "futures-sink 0.3.18", + "futures-task 0.3.18", + "futures-util 0.3.18", ] [[package]] @@ -773,12 +794,12 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" +checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27" dependencies = [ - "futures-core 0.3.17", - "futures-sink 0.3.17", + "futures-core 0.3.18", + "futures-sink 0.3.18", ] [[package]] @@ -791,9 +812,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" +checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445" [[package]] name = "futures-executor" @@ -808,13 +829,13 @@ dependencies = [ [[package]] name = "futures-executor" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c" +checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97" dependencies = [ - "futures-core 0.3.17", - "futures-task 0.3.17", - "futures-util 0.3.17", + "futures-core 0.3.18", + "futures-task 0.3.18", + "futures-util 0.3.18", ] [[package]] @@ -827,9 +848,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" +checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11" [[package]] name = "futures-macro" @@ -844,12 +865,10 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" +checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd" dependencies = [ - "autocfg 1.0.1", - "proc-macro-hack", "proc-macro2", "quote 1.0.10", "syn 1.0.81", @@ -862,9 +881,9 @@ source = "git+https://github.com/mesalock-linux/futures-rs-sgx#d54882f24ddf7d613 [[package]] name = "futures-sink" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" +checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af" [[package]] name = "futures-task" @@ -877,9 +896,9 @@ dependencies = [ [[package]] name = "futures-task" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" +checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12" [[package]] name = "futures-timer" @@ -909,22 +928,19 @@ dependencies = [ [[package]] name = "futures-util" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" +checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e" dependencies = [ - "autocfg 1.0.1", - "futures-channel 0.3.17", - "futures-core 0.3.17", - "futures-io 0.3.17", - "futures-macro 0.3.17", - "futures-sink 0.3.17", - "futures-task 0.3.17", + "futures-channel 0.3.18", + "futures-core 0.3.18", + "futures-io 0.3.18", + "futures-macro 0.3.18", + "futures-sink 0.3.18", + "futures-task 0.3.18", "memchr 2.4.1", "pin-project-lite", "pin-utils", - "proc-macro-hack", - "proc-macro-nested", "slab 0.4.5", ] @@ -1171,7 +1187,7 @@ dependencies = [ "jsonrpc-core", "log 0.4.14 (git+https://github.com/mesalock-linux/log-sgx)", "parity-scale-codec", - "serde_json 1.0.70", + "serde_json 1.0.71", "sgx_tstd", "sgx_types", "sp-runtime", @@ -1440,7 +1456,7 @@ name = "itp-storage" version = "0.8.0" dependencies = [ "derive_more", - "frame-metadata 14.2.0", + "frame-metadata 14.2.0 (git+https://github.com/paritytech/frame-metadata.git?branch=main)", "frame-support", "hash-db", "parity-scale-codec", @@ -1516,7 +1532,7 @@ dependencies = [ "parity-scale-codec", "primitive-types", "serde 1.0.130", - "serde_json 1.0.70", + "serde_json 1.0.71", "sgx_tstd", "sp-core", "sp-runtime", @@ -1784,24 +1800,24 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.107" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219" +checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119" [[package]] name = "libsecp256k1" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9d220bc1feda2ac231cb78c3d26f27676b8cf82c96971f7aeef3d0cf2797c73" +checksum = "b0452aac8bab02242429380e9b2f94ea20cea2b37e2c1777a1358799bbe97f37" dependencies = [ "arrayref", - "base64 0.12.3", + "base64 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "digest 0.9.0", "hmac-drbg", "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.8.4", "serde 1.0.130", "sha2 0.9.8", "typenum", @@ -1809,9 +1825,9 @@ dependencies = [ [[package]] name = "libsecp256k1-core" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f6ab710cec28cef759c5f18671a27dae2a5f952cdaaee1d8e2908cb2478a80" +checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" dependencies = [ "crunchy", "digest 0.9.0", @@ -1820,18 +1836,18 @@ dependencies = [ [[package]] name = "libsecp256k1-gen-ecmult" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccab96b584d38fac86a83f07e659f0deafd0253dc096dab5a36d53efe653c5c3" +checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809" dependencies = [ "libsecp256k1-core", ] [[package]] name = "libsecp256k1-gen-genmult" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67abfe149395e3aa1c48a2beb32b068e2334402df8181f818d3aee2b304c4f5d" +checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c" dependencies = [ "libsecp256k1-core", ] @@ -2101,12 +2117,13 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "pallet-timestamp", "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-consensus-aura", "sp-runtime", @@ -2116,12 +2133,13 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", + "scale-info", "sp-authorship", "sp-runtime", "sp-std", @@ -2130,12 +2148,13 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "log 0.4.14 (git+https://github.com/mesalock-linux/log-sgx)", "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] @@ -2143,7 +2162,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", @@ -2151,6 +2170,7 @@ dependencies = [ "pallet-authorship", "pallet-session", "parity-scale-codec", + "scale-info", "sp-application-crypto", "sp-core", "sp-finality-grandpa", @@ -2164,12 +2184,13 @@ dependencies = [ [[package]] name = "pallet-parentchain" version = "0.9.0" -source = "git+https://github.com/integritee-network/pallets.git?branch=teaclave-1.1.3#1a529c857854a8569c367fdbd8fe6fb416cbd483" +source = "git+https://github.com/integritee-network/pallets.git?branch=master#31cf747a0240a319b141580eabadb52794d3e509" dependencies = [ "frame-support", "frame-system", "log 0.4.14 (git+https://github.com/mesalock-linux/log-sgx)", "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -2179,12 +2200,13 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "safe-mix", + "scale-info", "sp-runtime", "sp-std", ] @@ -2192,7 +2214,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", @@ -2200,6 +2222,7 @@ dependencies = [ "log 0.4.14 (git+https://github.com/mesalock-linux/log-sgx)", "pallet-timestamp", "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-runtime", @@ -2211,11 +2234,12 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -2224,12 +2248,13 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "log 0.4.14 (git+https://github.com/mesalock-linux/log-sgx)", "parity-scale-codec", + "scale-info", "sp-inherents", "sp-runtime", "sp-std", @@ -2239,11 +2264,12 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", + "scale-info", "smallvec 1.7.0", "sp-core", "sp-io", @@ -2254,7 +2280,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -2406,6 +2432,7 @@ dependencies = [ "fixed-hash", "impl-codec", "impl-serde", + "scale-info", "uint", ] @@ -2442,15 +2469,15 @@ dependencies = [ [[package]] name = "prometheus" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8425533e7122f0c3cc7a37e6244b16ad3a2cc32ae7ac6276e2a75da0d9c200d" +checksum = "b7f64969ffd5dd8f39bd57a68ac53c163a095ed9d0fb707146da1b27025a3504" dependencies = [ "cfg-if 1.0.0", "fnv 1.0.7", "lazy_static", + "memchr 2.4.1", "parking_lot", - "regex 1.5.4", "thiserror 1.0.30", ] @@ -2511,6 +2538,15 @@ dependencies = [ "sgx_tstd", ] +[[package]] +name = "rand" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +dependencies = [ + "rand_core 0.6.3", +] + [[package]] name = "rand_chacha" version = "0.2.2" @@ -2546,6 +2582,12 @@ dependencies = [ "sgx_tstd", ] +[[package]] +name = "rand_core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" + [[package]] name = "rand_hc" version = "0.2.0" @@ -2722,9 +2764,9 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ - "futures 0.3.17", + "futures 0.3.18", "futures-timer", "lazy_static", "prometheus", @@ -2788,9 +2830,9 @@ dependencies = [ [[package]] name = "secrecy" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0673d6a6449f5e7d12a1caf424fd9363e2af3a4953023ed455e3c4beef4597c0" +checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" dependencies = [ "zeroize", ] @@ -2908,9 +2950,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e277c495ac6cd1a01a58d0a0c574568b4d1ddf14f59965c6a58b8d96400b54f3" +checksum = "063bf466a64011ac24040a49009724ee60a57da1b437617ceb32e53ad61bfb19" dependencies = [ "itoa 0.4.8", "ryu", @@ -2920,7 +2962,7 @@ dependencies = [ [[package]] name = "sgx-externalities" version = "0.4.0" -source = "git+https://github.com/integritee-network/sgx-runtime?branch=master#f864715987f723b27e48144c32fdf2480bf9761c" +source = "git+https://github.com/integritee-network/sgx-runtime?branch=master#a5e2d8b6bcb226acba0ca473b4fb028daa73278b" dependencies = [ "derive_more", "environmental", @@ -2935,7 +2977,7 @@ dependencies = [ [[package]] name = "sgx-runtime" version = "0.8.0" -source = "git+https://github.com/integritee-network/sgx-runtime?branch=master#f864715987f723b27e48144c32fdf2480bf9761c" +source = "git+https://github.com/integritee-network/sgx-runtime?branch=master#a5e2d8b6bcb226acba0ca473b4fb028daa73278b" dependencies = [ "frame-executive", "frame-support", @@ -2951,6 +2993,7 @@ dependencies = [ "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", + "scale-info", "sp-api", "sp-block-builder", "sp-consensus-aura", @@ -3232,7 +3275,7 @@ checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "log 0.4.14 (git+https://github.com/mesalock-linux/log-sgx)", "parity-scale-codec", @@ -3246,7 +3289,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -3258,9 +3301,10 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", + "scale-info", "sp-core", "sp-io", "sp-std", @@ -3269,11 +3313,12 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "integer-sqrt", "num-traits 0.2.14", "parity-scale-codec", + "scale-info", "sp-debug-derive", "sp-std", "static_assertions", @@ -3282,7 +3327,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -3293,7 +3338,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", "sp-api", @@ -3305,9 +3350,10 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-consensus-slots", @@ -3320,9 +3366,10 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", + "scale-info", "sp-arithmetic", "sp-runtime", ] @@ -3330,8 +3377,9 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ + "bitflags", "blake2-rfc", "byteorder 1.4.3", "ed25519-dalek", @@ -3345,22 +3393,49 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "primitive-types", + "scale-info", "schnorrkel", "secrecy", "sha2 0.9.8", + "sp-core-hashing", "sp-debug-derive", "sp-runtime-interface", "sp-std", "sp-storage", + "ss58-registry", "tiny-keccak", "twox-hash", "zeroize", ] +[[package]] +name = "sp-core-hashing" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" +dependencies = [ + "blake2-rfc", + "byteorder 1.4.3", + "sha2 0.9.8", + "sp-std", + "tiny-keccak", + "twox-hash", +] + +[[package]] +name = "sp-core-hashing-proc-macro" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" +dependencies = [ + "proc-macro2", + "quote 1.0.10", + "sp-core-hashing", + "syn 1.0.81", +] + [[package]] name = "sp-debug-derive" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "proc-macro2", "quote 1.0.10", @@ -3370,10 +3445,11 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "finality-grandpa", "parity-scale-codec", + "scale-info", "sp-api", "sp-application-crypto", "sp-core", @@ -3384,7 +3460,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -3395,7 +3471,7 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/integritee-network/sgx-runtime?branch=master#f864715987f723b27e48144c32fdf2480bf9761c" +source = "git+https://github.com/integritee-network/sgx-runtime?branch=master#a5e2d8b6bcb226acba0ca473b4fb028daa73278b" dependencies = [ "environmental", "hash-db", @@ -3416,7 +3492,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "sp-api", "sp-core", @@ -3426,7 +3502,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "either", "hash256-std-hasher", @@ -3435,6 +3511,7 @@ dependencies = [ "parity-scale-codec", "parity-util-mem", "paste", + "scale-info", "sp-application-crypto", "sp-arithmetic", "sp-core", @@ -3445,7 +3522,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -3461,7 +3538,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "Inflector", "proc-macro-crate", @@ -3473,9 +3550,10 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", + "scale-info", "sp-api", "sp-core", "sp-staking", @@ -3485,9 +3563,10 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", ] @@ -3495,12 +3574,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", "ref-cast", @@ -3511,7 +3590,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", "sp-api", @@ -3523,7 +3602,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", "sp-std", @@ -3534,7 +3613,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "sp-api", "sp-runtime", @@ -3543,11 +3622,12 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "hash-db", "memory-db", "parity-scale-codec", + "scale-info", "sp-core", "sp-std", "trie-db", @@ -3557,9 +3637,10 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", + "scale-info", "sp-runtime", "sp-std", "sp-version-proc-macro", @@ -3568,7 +3649,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -3579,7 +3660,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=master#b391b82954ad95a927a921035e3017c4a0aad516" +source = "git+https://github.com/paritytech/substrate.git?branch=master#7406442bea0194ffcafc4e8d48d895d4d8d11346" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -3592,6 +3673,20 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "ss58-registry" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78abb01d308934b82e34e9cf1f45846d31539246501745b129539176f4f3368d" +dependencies = [ + "Inflector", + "proc-macro2", + "quote 1.0.10", + "serde 1.0.130", + "serde_json 1.0.71", + "unicode-xid 0.2.2", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -3601,10 +3696,11 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "substrate-api-client" version = "0.6.0" -source = "git+https://github.com/scs/substrate-api-client?branch=master#2edd060c0a515718d62f3a78008b4123a5acefeb" +source = "git+https://github.com/scs/substrate-api-client?branch=master#a4d931c85f30ba22ff1f982c47caf57fe43ebc90" dependencies = [ + "ac-compose-macros", "ac-primitives", - "frame-metadata 14.2.0", + "frame-metadata 14.2.0 (git+https://github.com/paritytech/frame-metadata.git?branch=main)", "frame-support", "hex", "parity-scale-codec", @@ -3781,6 +3877,12 @@ dependencies = [ "hash-db", ] +[[package]] +name = "tt-call" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055" + [[package]] name = "tungstenite" version = "0.14.0" diff --git a/enclave-runtime/Cargo.toml b/enclave-runtime/Cargo.toml index 75096ea810..4e526abf3c 100644 --- a/enclave-runtime/Cargo.toml +++ b/enclave-runtime/Cargo.toml @@ -118,6 +118,7 @@ getrandom = { git = "https://github.com/integritee-network/getrandom-sgx", branc 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/integritee-network/sgx-runtime", branch = "master"} +#sp-io = { path = "../../sgx-runtime/substrate-sgx/sp-io"} #[patch."https://github.com/integritee-network/sgx-runtime"] #sgx-runtime = { path = "../../sgx-runtime/runtime", default-features = false} @@ -136,3 +137,6 @@ sgx_types = { version = "1.1.4", git = "https://github.com/haerdib/incubator-tea sgx_tcrypto = { version = "1.1.4", git = "https://github.com/haerdib/incubator-teaclave-sgx-sdk", branch = "master"} sgx_tcrypto_helper = { version = "1.1.4", git = "https://github.com/haerdib/incubator-teaclave-sgx-sdk", branch = "master"} sgx_crypto_helper = { version = "1.1.4", git = "https://github.com/haerdib/incubator-teaclave-sgx-sdk", branch = "master"} + +#[patch."https://github.com/integritee-network/pallets.git"] +#pallet-parentchain = { path = '../../pallets/parentchain' } diff --git a/service/Cargo.toml b/service/Cargo.toml index 2b49b56788..1d26272324 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -53,6 +53,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" } +teerex-primitives = { git = "https://github.com/integritee-network/pallets.git", branch = "master" } # Substrate dependencies sp-runtime = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate.git", branch = "master" } diff --git a/service/src/main.rs b/service/src/main.rs index aac537c994..c56bc225e4 100644 --- a/service/src/main.rs +++ b/service/src/main.rs @@ -56,7 +56,7 @@ use itp_types::SignedBlock; use its_primitives::types::SignedBlock as SignedSidechainBlock; use its_storage::{start_sidechain_pruning_loop, BlockPruner, SidechainStorageLock}; use log::*; -use my_node_runtime::{pallet_teerex::ShardIdentifier, Event, Hash, Header}; +use my_node_runtime::{Event, Hash, Header}; use sgx_types::*; use sp_core::{ crypto::{AccountId32, Ss58Codec}, @@ -77,6 +77,7 @@ use std::{ time::{Duration, Instant}, }; use substrate_api_client::{rpc::WsRpcClient, utils::FromHexString, Api, GenericAddress, XtStatus}; +use teerex_primitives::ShardIdentifier; mod config; mod enclave; @@ -505,7 +506,11 @@ fn print_events(events: Events, _sender: Sender) { info!("[+] Received balances event"); debug!("{:?}", be); match &be { - pallet_balances::Event::Transfer(transactor, dest, value) => { + pallet_balances::Event::Transfer { + from: transactor, + to: dest, + amount: value, + } => { debug!(" Transactor: {:?}", transactor.to_ss58check()); debug!(" Destination: {:?}", dest.to_ss58check()); debug!(" Value: {:?}", value); diff --git a/service/src/tests/integration_tests.rs b/service/src/tests/integration_tests.rs index 4944be7ad4..0c7fc3cff9 100644 --- a/service/src/tests/integration_tests.rs +++ b/service/src/tests/integration_tests.rs @@ -25,7 +25,7 @@ use substrate_api_client::XtStatus; use itp_types::{CallWorkerFn, Request, ShieldFundsFn}; use my_node_runtime::Header; use std::{thread::sleep, time::Duration}; -use substrate_api_client::{compose_extrinsic, extrinsic::xt_primitives::UncheckedExtrinsicV4}; +use substrate_api_client::{compose_extrinsic, UncheckedExtrinsicV4}; use crate::tests::commons::*; use itp_api_client_extensions::TEEREX; diff --git a/sidechain/top-pool/src/pool.rs b/sidechain/top-pool/src/pool.rs index 6c1530449a..522a7183f2 100644 --- a/sidechain/top-pool/src/pool.rs +++ b/sidechain/top-pool/src/pool.rs @@ -532,9 +532,9 @@ pub mod tests { /// Index of a transaction. //pub type Index = u64; /// The item of a block digest. - pub type DigestItem = sp_runtime::generic::DigestItem; + pub type DigestItem = sp_runtime::generic::DigestItem; /// The digest of a block. - pub type Digest = sp_runtime::generic::Digest; + pub type Digest = sp_runtime::generic::Digest; /// A test block's header. pub type Header = sp_runtime::generic::Header; /// A test block.