From 04cd42b72157ebfa0b7d6b6fc442eee3a4b9518e Mon Sep 17 00:00:00 2001 From: Chengcheng Shi Date: Tue, 8 Nov 2022 18:13:51 +0800 Subject: [PATCH 01/11] update to v0.9.30 --- Cargo.lock | 1365 ++++++++++++++++------ claims/Cargo.toml | 18 +- claims/src/lib.rs | 62 +- parentchain/Cargo.toml | 16 +- parentchain/src/mock.rs | 10 +- parentchain/src/tests.rs | 4 +- primitives/claims/Cargo.toml | 6 +- primitives/common/Cargo.toml | 2 +- primitives/sidechain/Cargo.toml | 8 +- primitives/teeracle/Cargo.toml | 2 +- primitives/teerex/Cargo.toml | 6 +- sidechain/Cargo.toml | 26 +- sidechain/src/lib.rs | 2 +- sidechain/src/mock.rs | 14 +- sidechain/src/tests.rs | 12 +- teeracle/Cargo.toml | 26 +- teeracle/src/lib.rs | 2 +- teeracle/src/mock.rs | 14 +- teeracle/src/tests.rs | 78 +- teerex/Cargo.toml | 26 +- teerex/src/lib.rs | 3 +- teerex/src/mock.rs | 14 +- teerex/src/tests/skip_ias_check_tests.rs | 8 +- teerex/src/tests/test_cases.rs | 96 +- 24 files changed, 1242 insertions(+), 578 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 798129dc..6e909468 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -33,7 +33,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", "once_cell", "version_check", ] @@ -67,9 +67,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.65" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" [[package]] name = "approx" @@ -80,6 +80,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "array-bytes" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a913633b0c922e6b745072795f50d90ebea78ba31a57e2ac8c2fc7b50950949" + [[package]] name = "arrayref" version = "0.3.6" @@ -109,9 +115,9 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "async-trait" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" +checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" dependencies = [ "proc-macro2", "quote", @@ -164,9 +170,15 @@ checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64ct" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" [[package]] name = "bitflags" @@ -192,7 +204,7 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388" dependencies = [ - "digest 0.10.3", + "digest 0.10.5", ] [[package]] @@ -246,15 +258,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.0" +version = "3.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" +checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" [[package]] name = "byte-slice-cast" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c5fdd0166095e1d463fc6cc01aa8ce547ad77a4e84d42eb6762b084e28067e" +checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "byte-tools" @@ -276,9 +288,9 @@ checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574" [[package]] name = "cfg-expr" @@ -315,16 +327,26 @@ dependencies = [ "rustc-hex", "scale-info", "serde", - "sp-io", - "sp-runtime", - "sp-std", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", ] [[package]] name = "common-primitives" version = "0.1.0" dependencies = [ - "sp-std", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -367,7 +389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" dependencies = [ "generic-array 0.14.6", - "rand_core 0.6.3", + "rand_core 0.6.4", "subtle", "zeroize", ] @@ -428,6 +450,50 @@ dependencies = [ "zeroize", ] +[[package]] +name = "cxx" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97abf9f0eca9e52b7f81b945524e76710e6cb2366aead23b7d4fbf72e281f888" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cc32cc5fea1d894b77d269ddb9f192110069a8a9c1f1d441195fba90553dea3" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca220e4794c934dc6b1207c3b42856ad4c302f2df1712e9f8d2eec5afaacf1f" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b846f081361125bfc8dc9d3940c84e1fd83ba54bbca7b17cd29483c828be0704" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "der" version = "0.5.1" @@ -468,9 +534,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" dependencies = [ "block-buffer 0.10.3", "crypto-common", @@ -524,15 +590,15 @@ dependencies = [ [[package]] name = "ed25519-zebra" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "403ef3e961ab98f0ba902771d29f842058578bb1ce7e3c59dad5a6a93e784c69" +checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6" dependencies = [ "curve25519-dalek 3.2.0", + "hashbrown", "hex", - "rand_core 0.6.3", + "rand_core 0.6.4", "sha2 0.9.9", - "thiserror", "zeroize", ] @@ -554,7 +620,7 @@ dependencies = [ "ff", "generic-array 0.14.6", "group", - "rand_core 0.6.3", + "rand_core 0.6.4", "sec1", "subtle", "zeroize", @@ -562,9 +628,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ "atty", "humantime", @@ -600,7 +666,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924" dependencies = [ - "rand_core 0.6.3", + "rand_core 0.6.4", "subtle", ] @@ -619,9 +685,9 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-system", "linregress", "log", @@ -629,14 +695,14 @@ dependencies = [ "paste", "scale-info", "serde", - "sp-api", - "sp-application-crypto", - "sp-core", - "sp-io", - "sp-runtime", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -654,11 +720,42 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +dependencies = [ + "bitflags", + "frame-metadata", + "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "impl-trait-for-tuples", + "k256", + "log", + "once_cell", + "parity-scale-codec", + "paste", + "scale-info", + "serde", + "smallvec", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "tt-call", +] + +[[package]] +name = "frame-support" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "bitflags", "frame-metadata", - "frame-support-procedural", + "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "impl-trait-for-tuples", "k256", "log", @@ -668,28 +765,43 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-api", - "sp-arithmetic", - "sp-core", - "sp-core-hashing-proc-macro", - "sp-inherents", - "sp-io", - "sp-runtime", - "sp-staking", - "sp-state-machine", - "sp-std", - "sp-tracing", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-weights", "tt-call", ] [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +dependencies = [ + "Inflector", + "cfg-expr", + "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "itertools", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "frame-support-procedural" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "Inflector", "cfg-expr", - "frame-support-procedural-tools", + "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "itertools", "proc-macro2", "quote", @@ -699,9 +811,21 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +dependencies = [ + "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "frame-support-procedural-tools" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support-procedural-tools-derive", + "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "proc-macro-crate", "proc-macro2", "quote", @@ -711,7 +835,17 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "frame-support-procedural-tools-derive" +version = "3.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "proc-macro2", "quote", @@ -721,18 +855,19 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "sp-version", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-weights", ] [[package]] @@ -743,9 +878,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" +checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" dependencies = [ "futures-channel", "futures-core", @@ -758,9 +893,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" dependencies = [ "futures-core", "futures-sink", @@ -768,15 +903,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" [[package]] name = "futures-executor" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" dependencies = [ "futures-core", "futures-task", @@ -786,15 +921,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" [[package]] name = "futures-macro" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2", "quote", @@ -803,15 +938,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" [[package]] name = "futures-task" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" [[package]] name = "futures-timer" @@ -821,9 +956,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" dependencies = [ "futures-channel", "futures-core", @@ -871,9 +1006,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", @@ -893,7 +1028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" dependencies = [ "ff", - "rand_core 0.6.3", + "rand_core 0.6.4", "subtle", ] @@ -987,32 +1122,42 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "iana-time-zone" -version = "0.1.48" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237a0714f28b1ee39ccec0770ccb544eb02c9ef2c82bb096230eefcffa6468b0" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" dependencies = [ "android_system_properties", "core-foundation-sys", + "iana-time-zone-haiku", "js-sys", - "once_cell", "wasm-bindgen", "winapi", ] +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + [[package]] name = "ias-verify" version = "0.1.4" dependencies = [ "base64", "chrono", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", "hex-literal", "parity-scale-codec", "scale-info", "serde_json", - "sp-core", - "sp-io", - "sp-std", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", "webpki", ] @@ -1065,15 +1210,9 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" [[package]] name = "js-sys" @@ -1110,9 +1249,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.132" +version = "0.2.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" [[package]] name = "libm" @@ -1168,6 +1307,15 @@ dependencies = [ "libsecp256k1-core", ] +[[package]] +name = "link-cplusplus" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +dependencies = [ + "cc", +] + [[package]] name = "linregress" version = "0.4.4" @@ -1180,9 +1328,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" dependencies = [ "autocfg", "scopeguard", @@ -1247,6 +1395,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" +[[package]] +name = "memory_units" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" + [[package]] name = "merlin" version = "2.0.1" @@ -1320,6 +1474,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-complex" version = "0.4.2" @@ -1331,12 +1496,12 @@ dependencies = [ [[package]] name = "num-format" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bafe4179722c2894288ee77a9f044f02811c86af699344c498b0840c698a2465" +checksum = "54b862ff8df690cf089058c98b183676a7ed0f974cc08b426800093227cbff3b" dependencies = [ - "arrayvec 0.4.12", - "itoa 0.4.8", + "arrayvec 0.7.2", + "itoa", ] [[package]] @@ -1356,7 +1521,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" dependencies = [ "autocfg", - "num-bigint", + "num-bigint 0.2.6", "num-integer", "num-traits", ] @@ -1368,6 +1533,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", + "num-bigint 0.4.3", "num-integer", "num-traits", ] @@ -1384,9 +1550,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" dependencies = [ "hermit-abi", "libc", @@ -1403,9 +1569,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.14.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "opaque-debug" @@ -1422,16 +1588,16 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -1440,7 +1606,7 @@ version = "0.9.12" dependencies = [ "claims-primitives", "frame-benchmarking", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-system", "hex-literal", "libsecp256k1", @@ -1452,10 +1618,10 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -1463,18 +1629,18 @@ name = "pallet-parentchain" version = "0.9.0" dependencies = [ "env_logger", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-system", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keyring", - "sp-runtime", - "sp-std", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -1483,7 +1649,7 @@ version = "0.9.0" dependencies = [ "env_logger", "frame-benchmarking", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-system", "hex-literal", "log", @@ -1494,12 +1660,12 @@ dependencies = [ "scale-info", "serde", "sidechain-primitives", - "sp-core", - "sp-externalities", - "sp-io", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keyring", - "sp-runtime", - "sp-std", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "teerex-primitives", "test-utils", ] @@ -1509,7 +1675,7 @@ name = "pallet-teeracle" version = "0.1.0" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-system", "hex-literal", "log", @@ -1518,12 +1684,12 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core", - "sp-externalities", - "sp-io", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keyring", - "sp-runtime", - "sp-std", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-fixed", "teeracle-primitives", "test-utils", @@ -1535,7 +1701,7 @@ version = "0.9.0" dependencies = [ "env_logger", "frame-benchmarking", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-system", "hex-literal", "ias-verify", @@ -1545,12 +1711,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-externalities", - "sp-io", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-keyring", - "sp-runtime", - "sp-std", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "teerex-primitives", "test-utils", ] @@ -1558,40 +1724,41 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-inherents", - "sp-io", - "sp-runtime", - "sp-std", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "sp-timestamp", ] [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support", + "frame-benchmarking", + "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "parity-scale-codec" -version = "3.2.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2a2f8720963771740976525da4bb7f20544b4d5e2ef5356322b81dbb0d07b3" +checksum = "366e44391a8af4cfd6002ef6ba072bae071a96aafca98d7d448a34c5dca38b6a" dependencies = [ "arrayvec 0.7.2", "bitvec", @@ -1646,6 +1813,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" +[[package]] +name = "parity-wasm" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304" + [[package]] name = "parking_lot" version = "0.12.1" @@ -1658,9 +1831,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" dependencies = [ "cfg-if", "libc", @@ -1705,11 +1878,22 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" +dependencies = [ + "der", + "spki", + "zeroize", +] + [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "primitive-types" @@ -1737,9 +1921,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ "unicode-ident", ] @@ -1781,7 +1965,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -1801,7 +1985,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -1815,11 +1999,11 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.8", ] [[package]] @@ -1867,18 +2051,18 @@ dependencies = [ [[package]] name = "ref-cast" -version = "1.0.9" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed13bcd201494ab44900a96490291651d200730904221832b9547d24a87d332b" +checksum = "53b15debb4f9d60d767cd8ca9ef7abb2452922f3214671ff052defc7f3502c44" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.9" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5234cd6063258a5e32903b53b1b6ac043a0541c8adc1f610f67b0326c7a578fa" +checksum = "abfa8511e9e94fd3de6585a3d3cd00e01ed556dc9814829280af0e8dc72a8f36" dependencies = [ "proc-macro2", "quote", @@ -1887,9 +2071,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" dependencies = [ "aho-corasick", "memchr", @@ -1907,9 +2091,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "rfc6979" @@ -1982,9 +2166,9 @@ checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" [[package]] name = "scale-info" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "333af15b02563b8182cd863f925bd31ef8fa86a0e095d30c091956057d436153" +checksum = "88d8a765117b237ef233705cc2cc4c6a27fccd46eea6ef0c8c6dae5f3ef407f8" dependencies = [ "bitvec", "cfg-if", @@ -1996,9 +2180,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53f56acbd0743d29ffa08f911ab5397def774ad01bab3786804cf6ee057fb5e1" +checksum = "cdcd47b380d8c4541044e341dcd9475f55ba37ddc50c908d945fc036a8642496" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2030,6 +2214,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scratch" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" + [[package]] name = "sec1" version = "0.2.1" @@ -2038,24 +2228,25 @@ checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" dependencies = [ "der", "generic-array 0.14.6", + "pkcs8", "subtle", "zeroize", ] [[package]] name = "secp256k1" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7649a0b3ffb32636e60c7ce0d70511eda9c52c658cd0634e194d5a19943aeff" +checksum = "ff55dc09d460954e9ef2fa8a7ced735a964be9981fd50e870b2b3b0705e14964" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7058dc8eaf3f2810d7828680320acda0b25a288f6d288e19278e249bbf74226b" +checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b" dependencies = [ "cc", ] @@ -2071,18 +2262,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.144" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.144" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" +checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" dependencies = [ "proc-macro2", "quote", @@ -2091,11 +2282,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.85" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" dependencies = [ - "itoa 1.0.3", + "itoa", "ryu", "serde", ] @@ -2127,22 +2318,22 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9db03534dff993187064c4e0c05a5708d2a9728ace9a8959b77bedf415dac5" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.3", + "digest 0.10.5", ] [[package]] name = "sha3" -version = "0.10.4" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaedf34ed289ea47c2b741bb72e5357a209512d67bcd4bda44359e5bf0470f56" +checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" dependencies = [ - "digest 0.10.3", + "digest 0.10.5", "keccak", ] @@ -2162,10 +2353,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -2175,7 +2366,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" dependencies = [ "digest 0.9.0", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -2201,32 +2392,50 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "sp-api" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +dependencies = [ + "hash-db", + "log", + "parity-scale-codec", + "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "thiserror", +] [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "hash-db", "log", "parity-scale-codec", - "sp-api-proc-macro", - "sp-core", - "sp-runtime", - "sp-state-machine", - "sp-std", - "sp-trie", - "sp-version", + "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" dependencies = [ "blake2", "proc-macro-crate", @@ -2235,38 +2444,78 @@ dependencies = [ "syn", ] +[[package]] +name = "sp-api-proc-macro" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "blake2", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "sp-application-crypto" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", +] + [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + +[[package]] +name = "sp-arithmetic" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" dependencies = [ + "integer-sqrt", + "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-std", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "static_assertions", ] [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "static_assertions", ] [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" dependencies = [ "base58", "bitflags", @@ -2295,49 +2544,130 @@ dependencies = [ "secp256k1", "secrecy", "serde", - "sp-core-hashing", - "sp-debug-derive", - "sp-externalities", - "sp-runtime-interface", - "sp-std", - "sp-storage", + "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "ss58-registry", + "substrate-bip39", + "thiserror", + "tiny-bip39", + "wasmi 0.9.1", + "zeroize", +] + +[[package]] +name = "sp-core" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "array-bytes", + "base58", + "bitflags", + "blake2", + "byteorder", + "dyn-clonable", + "ed25519-zebra", + "futures", + "hash-db", + "hash256-std-hasher", + "impl-serde", + "lazy_static", + "libsecp256k1", + "log", + "merlin", + "num-traits", + "parity-scale-codec", + "parity-util-mem", + "parking_lot", + "primitive-types", + "rand 0.7.3", + "regex", + "scale-info", + "schnorrkel", + "secp256k1", + "secrecy", + "serde", + "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "ss58-registry", "substrate-bip39", "thiserror", "tiny-bip39", - "wasmi", + "wasmi 0.13.2", "zeroize", ] [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +dependencies = [ + "blake2", + "byteorder", + "digest 0.10.5", + "sha2 0.10.6", + "sha3", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "twox-hash", +] + +[[package]] +name = "sp-core-hashing" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "blake2", "byteorder", - "digest 0.10.3", - "sha2 0.10.5", + "digest 0.10.5", + "sha2 0.10.6", "sha3", - "sp-std", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "twox-hash", ] [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" dependencies = [ "proc-macro2", "quote", - "sp-core-hashing", + "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", "syn", ] [[package]] -name = "sp-debug-derive" +name = "sp-core-hashing-proc-macro" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "proc-macro2", + "quote", + "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "syn", +] + +[[package]] +name = "sp-debug-derive" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "proc-macro2", "quote", @@ -2347,32 +2677,83 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" dependencies = [ "environmental", "parity-scale-codec", - "sp-std", - "sp-storage", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", +] + +[[package]] +name = "sp-externalities" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "environmental", + "parity-scale-codec", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", +] + +[[package]] +name = "sp-inherents" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +dependencies = [ + "async-trait", + "impl-trait-for-tuples", + "parity-scale-codec", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "thiserror", ] [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", - "sp-core", - "sp-runtime", - "sp-std", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +dependencies = [ + "bytes", + "futures", + "hash-db", + "libsecp256k1", + "log", + "parity-scale-codec", + "parking_lot", + "secp256k1", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "tracing", + "tracing-core", +] + +[[package]] +name = "sp-io" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "bytes", "futures", @@ -2382,15 +2763,15 @@ dependencies = [ "parity-scale-codec", "parking_lot", "secp256k1", - "sp-core", - "sp-externalities", - "sp-keystore", - "sp-runtime-interface", - "sp-state-machine", - "sp-std", - "sp-tracing", - "sp-trie", - "sp-wasm-interface", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tracing", "tracing-core", ] @@ -2398,18 +2779,18 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "lazy_static", - "sp-core", - "sp-runtime", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "strum", ] [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" dependencies = [ "async-trait", "futures", @@ -2417,25 +2798,73 @@ dependencies = [ "parity-scale-codec", "parking_lot", "schnorrkel", - "sp-core", - "sp-externalities", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "thiserror", +] + +[[package]] +name = "sp-keystore" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "async-trait", + "futures", + "merlin", + "parity-scale-codec", + "parking_lot", + "schnorrkel", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" dependencies = [ "backtrace", "lazy_static", "regex", ] +[[package]] +name = "sp-panic-handler" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "backtrace", + "lazy_static", + "regex", +] + +[[package]] +name = "sp-runtime" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +dependencies = [ + "either", + "hash256-std-hasher", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "parity-util-mem", + "paste", + "rand 0.7.3", + "scale-info", + "serde", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", +] + [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "either", "hash256-std-hasher", @@ -2447,35 +2876,66 @@ dependencies = [ "rand 0.7.3", "scale-info", "serde", - "sp-application-crypto", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-std", + "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-weights", +] + +[[package]] +name = "sp-runtime-interface" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +dependencies = [ + "bytes", + "impl-trait-for-tuples", + "parity-scale-codec", + "primitive-types", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-runtime-interface-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "static_assertions", ] [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities", - "sp-runtime-interface-proc-macro", - "sp-std", - "sp-storage", - "sp-tracing", - "sp-wasm-interface", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime-interface-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "static_assertions", ] [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +dependencies = [ + "Inflector", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "sp-runtime-interface-proc-macro" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "Inflector", "proc-macro-crate", @@ -2487,18 +2947,29 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" dependencies = [ "parity-scale-codec", "scale-info", - "sp-runtime", - "sp-std", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", +] + +[[package]] +name = "sp-staking" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" dependencies = [ "hash-db", "log", @@ -2507,11 +2978,33 @@ dependencies = [ "parking_lot", "rand 0.7.3", "smallvec", - "sp-core", - "sp-externalities", - "sp-panic-handler", - "sp-std", - "sp-trie", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "thiserror", + "tracing", + "trie-root", +] + +[[package]] +name = "sp-state-machine" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "hash-db", + "log", + "num-traits", + "parity-scale-codec", + "parking_lot", + "rand 0.7.3", + "smallvec", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tracing", "trie-root", @@ -2520,44 +3013,74 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" + +[[package]] +name = "sp-std" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" dependencies = [ "impl-serde", "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive", - "sp-std", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", +] + +[[package]] +name = "sp-storage" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "ref-cast", + "serde", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "async-trait", "futures-timer", "log", "parity-scale-codec", - "sp-api", - "sp-inherents", - "sp-runtime", - "sp-std", + "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", ] [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +dependencies = [ + "parity-scale-codec", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "sp-tracing" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", - "sp-std", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "tracing", "tracing-core", "tracing-subscriber", @@ -2566,7 +3089,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" dependencies = [ "ahash", "hash-db", @@ -2578,8 +3101,31 @@ dependencies = [ "parity-scale-codec", "parking_lot", "scale-info", - "sp-core", - "sp-std", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "thiserror", + "tracing", + "trie-db", + "trie-root", +] + +[[package]] +name = "sp-trie" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "ahash", + "hash-db", + "hashbrown", + "lazy_static", + "lru", + "memory-db", + "nohash-hasher", + "parity-scale-codec", + "parking_lot", + "scale-info", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "thiserror", "tracing", "trie-db", @@ -2589,24 +3135,52 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" dependencies = [ "impl-serde", "parity-scale-codec", - "parity-wasm", + "parity-wasm 0.42.2", "scale-info", "serde", - "sp-core-hashing-proc-macro", - "sp-runtime", - "sp-std", - "sp-version-proc-macro", + "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", "thiserror", ] +[[package]] +name = "sp-version" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "impl-serde", + "parity-scale-codec", + "parity-wasm 0.45.0", + "scale-info", + "serde", + "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "thiserror", +] + +[[package]] +name = "sp-version-proc-macro" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +dependencies = [ + "parity-scale-codec", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -2617,13 +3191,41 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std", - "wasmi", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "wasmi 0.9.1", +] + +[[package]] +name = "sp-wasm-interface" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "wasmi 0.13.2", +] + +[[package]] +name = "sp-weights" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", + "serde", + "smallvec", + "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -2632,11 +3234,21 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spki" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "ss58-registry" -version = "1.29.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0837b5d62f42082c9d56cd946495ae273a3c68083b637b9153341d5e465146d" +checksum = "3ab7554f8a8b6f8d71cd5a8e6536ef116e2ce0504cf97ebf16311d58065dc8a6" dependencies = [ "Inflector", "num-format", @@ -2720,9 +3332,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.99" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" dependencies = [ "proc-macro2", "quote", @@ -2752,7 +3364,7 @@ name = "teeracle-primitives" version = "0.1.0" dependencies = [ "common-primitives", - "sp-std", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", "substrate-fixed", ] @@ -2764,9 +3376,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core", - "sp-io", - "sp-std", + "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", ] [[package]] @@ -2789,18 +3401,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.35" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c53f98874615aea268107765aa1ed8f6116782501d18e53d08b471733bea6c85" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.35" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8b463991b4eab2d801e724172285ec4195c650e8ec79b149e6c2a8e6dd3f783" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ "proc-macro2", "quote", @@ -2861,9 +3473,9 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.36" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "pin-project-lite", @@ -2873,9 +3485,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", @@ -2884,9 +3496,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", "valuable", @@ -2970,7 +3582,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "digest 0.10.3", + "digest 0.10.5", "rand 0.8.5", "static_assertions", ] @@ -2992,9 +3604,9 @@ dependencies = [ [[package]] name = "uint" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0" +checksum = "a45526d29728d135c2900b0d30573fe3ee79fceb12ef534c7bb30e810a91b601" dependencies = [ "byteorder", "crunchy", @@ -3004,24 +3616,30 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" [[package]] name = "unicode-normalization" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + [[package]] name = "unicode-xid" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "untrusted" @@ -3115,11 +3733,22 @@ checksum = "ca00c5147c319a8ec91ec1a0edbec31e566ce2c9cc93b3f9bb86a9efd0eb795d" dependencies = [ "downcast-rs", "libc", - "memory_units", + "memory_units 0.3.0", "num-rational 0.2.4", "num-traits", - "parity-wasm", - "wasmi-validation", + "parity-wasm 0.42.2", + "wasmi-validation 0.4.1", +] + +[[package]] +name = "wasmi" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422" +dependencies = [ + "parity-wasm 0.45.0", + "wasmi-validation 0.5.0", + "wasmi_core", ] [[package]] @@ -3128,7 +3757,29 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "165343ecd6c018fc09ebcae280752702c9a2ef3e6f8d02f1cfcbdb53ef6d7937" dependencies = [ - "parity-wasm", + "parity-wasm 0.42.2", +] + +[[package]] +name = "wasmi-validation" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b" +dependencies = [ + "parity-wasm 0.45.0", +] + +[[package]] +name = "wasmi_core" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" +dependencies = [ + "downcast-rs", + "libm", + "memory_units 0.4.0", + "num-rational 0.4.1", + "num-traits", ] [[package]] @@ -3194,46 +3845,60 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.36.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ + "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", "windows_i686_msvc", "windows_x86_64_gnu", + "windows_x86_64_gnullvm", "windows_x86_64_msvc", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" + [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" +checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" +checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" +checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" +checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" [[package]] name = "wyz" diff --git a/claims/Cargo.toml b/claims/Cargo.toml index ee8a3f9b..447e2e24 100644 --- a/claims/Cargo.toml +++ b/claims/Cargo.toml @@ -13,12 +13,12 @@ serde = { version = "1.0.13", default-features = false } serde_derive = { version = "1.0.13", optional = true } # substrate dependencies -frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-std = { package = "sp-std", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } +frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { package = "sp-std", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # local claims-primitives = { package = "claims-primitives", path = "../primitives/claims", default-features = false } @@ -26,10 +26,10 @@ claims-primitives = { package = "claims-primitives", path = "../primitives/claim [dev-dependencies] hex-literal = "0.3.3" libsecp256k1 = "0.7.0" -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -pallet-vesting = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-vesting = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } serde_json = { version = "1.0" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/claims/src/lib.rs b/claims/src/lib.rs index f5d7f6dd..c16df0ab 100644 --- a/claims/src/lib.rs +++ b/claims/src/lib.rs @@ -85,11 +85,11 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config { /// The overarching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type VestingSchedule: VestingSchedule; #[pallet::constant] type Prefix: Get<&'static [u8]>; - type MoveClaimOrigin: EnsureOrigin; + type MoveClaimOrigin: EnsureOrigin; type WeightInfo: WeightInfo; } @@ -516,11 +516,11 @@ impl Pallet { #[scale_info(skip_type_params(T))] pub struct PrevalidateAttests(sp_std::marker::PhantomData) where - ::Call: IsSubType>; + ::RuntimeCall: IsSubType>; impl Debug for PrevalidateAttests where - ::Call: IsSubType>, + ::RuntimeCall: IsSubType>, { #[cfg(feature = "std")] fn fmt(&self, f: &mut sp_std::fmt::Formatter) -> sp_std::fmt::Result { @@ -535,7 +535,7 @@ where impl PrevalidateAttests where - ::Call: IsSubType>, + ::RuntimeCall: IsSubType>, { /// Create new `SignedExtension` to check runtime version. pub fn new() -> Self { @@ -544,7 +544,7 @@ where } impl Default for PrevalidateAttests where - ::Call: IsSubType>, + ::RuntimeCall: IsSubType>, { fn default() -> Self { Self::new() @@ -553,10 +553,10 @@ where impl SignedExtension for PrevalidateAttests where - ::Call: IsSubType>, + ::RuntimeCall: IsSubType>, { type AccountId = T::AccountId; - type Call = ::Call; + type Call = ::RuntimeCall; type AdditionalSigned = (); type Pre = (); const IDENTIFIER: &'static str = "PrevalidateAttests"; @@ -676,8 +676,8 @@ mod tests { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; - type Call = Call; + type RuntimeOrigin = RuntimeOrigin; + type RuntimeCall = RuntimeCall; type Index = u64; type BlockNumber = u64; type Hash = H256; @@ -685,7 +685,7 @@ mod tests { type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -704,7 +704,7 @@ mod tests { impl pallet_balances::Config for Test { type Balance = u64; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type DustRemoval = (); type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; @@ -719,7 +719,7 @@ mod tests { } impl pallet_vesting::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BlockNumberToBalance = Identity; type MinVestedTransfer = MinVestedTransfer; @@ -735,7 +735,7 @@ mod tests { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type VestingSchedule = Vesting; type Prefix = Prefix; type MoveClaimOrigin = frame_system::EnsureSignedBy; @@ -826,10 +826,10 @@ mod tests { new_test_ext().execute_with(|| { assert_eq!(Balances::free_balance(42), 0); assert_noop!( - Claims::move_claim(Origin::signed(1), eth(&alice()), eth(&bob()), None), + Claims::move_claim(RuntimeOrigin::signed(1), eth(&alice()), eth(&bob()), None), BadOrigin ); - assert_ok!(Claims::move_claim(Origin::signed(6), eth(&alice()), eth(&bob()), None)); + assert_ok!(Claims::move_claim(RuntimeOrigin::signed(6), eth(&alice()), eth(&bob()), None)); assert_noop!( Claims::claim(Origin::none(), 42, sig::(&alice(), &42u64.encode(), &[][..])), Error::::SignerHasNoClaim @@ -848,7 +848,7 @@ mod tests { #[test] fn claim_attest_moving_works() { new_test_ext().execute_with(|| { - assert_ok!(Claims::move_claim(Origin::signed(6), eth(&dave()), eth(&bob()), None)); + assert_ok!(Claims::move_claim(RuntimeOrigin::signed(6), eth(&dave()), eth(&bob()), None)); let s = sig::(&bob(), &42u64.encode(), StatementKind::Regular.to_text()); assert_ok!(Claims::claim_attest( Origin::none(), @@ -863,8 +863,8 @@ mod tests { #[test] fn attest_moving_works() { new_test_ext().execute_with(|| { - assert_ok!(Claims::move_claim(Origin::signed(6), eth(&eve()), eth(&bob()), Some(42))); - assert_ok!(Claims::attest(Origin::signed(42), StatementKind::Saft.to_text().to_vec())); + assert_ok!(Claims::move_claim(RuntimeOrigin::signed(6), eth(&eve()), eth(&bob()), Some(42))); + assert_ok!(Claims::attest(RuntimeOrigin::signed(42), StatementKind::Saft.to_text().to_vec())); assert_eq!(Balances::free_balance(&42), 300); }); } @@ -942,14 +942,14 @@ mod tests { new_test_ext().execute_with(|| { assert_eq!(Balances::free_balance(42), 0); assert_noop!( - Claims::attest(Origin::signed(69), StatementKind::Saft.to_text().to_vec()), + Claims::attest(RuntimeOrigin::signed(69), StatementKind::Saft.to_text().to_vec()), Error::::SenderHasNoClaim ); assert_noop!( - Claims::attest(Origin::signed(42), StatementKind::Regular.to_text().to_vec()), + Claims::attest(RuntimeOrigin::signed(42), StatementKind::Regular.to_text().to_vec()), Error::::InvalidStatement ); - assert_ok!(Claims::attest(Origin::signed(42), StatementKind::Saft.to_text().to_vec())); + assert_ok!(Claims::attest(RuntimeOrigin::signed(42), StatementKind::Saft.to_text().to_vec())); assert_eq!(Balances::free_balance(&42), 300); assert_eq!(Claims::total(), total_claims() - 300); }); @@ -967,7 +967,7 @@ mod tests { )); assert_eq!(Balances::free_balance(&42), 100); // Eve's claim is 300 through Account 42 - assert_ok!(Claims::attest(Origin::signed(42), StatementKind::Saft.to_text().to_vec())); + assert_ok!(Claims::attest(RuntimeOrigin::signed(42), StatementKind::Saft.to_text().to_vec())); assert_eq!(Balances::free_balance(&42), 100 + 300); assert_eq!(Claims::total(), total_claims() - 400); }); @@ -1020,7 +1020,7 @@ mod tests { fn add_claim_works() { new_test_ext().execute_with(|| { assert_noop!( - Claims::mint_claim(Origin::signed(42), eth(&bob()), 200, None, None), + Claims::mint_claim(RuntimeOrigin::signed(42), eth(&bob()), 200, None, None), sp_runtime::traits::BadOrigin, ); assert_eq!(Balances::free_balance(42), 0); @@ -1028,7 +1028,7 @@ mod tests { Claims::claim(Origin::none(), 69, sig::(&bob(), &69u64.encode(), &[][..])), Error::::SignerHasNoClaim, ); - assert_ok!(Claims::mint_claim(Origin::root(), eth(&bob()), 200, None, None)); + assert_ok!(Claims::mint_claim(RuntimeOrigin::root(), eth(&bob()), 200, None, None)); assert_eq!(Claims::total(), total_claims() + 200); assert_ok!(Claims::claim( Origin::none(), @@ -1045,7 +1045,7 @@ mod tests { fn add_claim_with_vesting_works() { new_test_ext().execute_with(|| { assert_noop!( - Claims::mint_claim(Origin::signed(42), eth(&bob()), 200, Some((50, 10, 1)), None), + Claims::mint_claim(RuntimeOrigin::signed(42), eth(&bob()), 200, Some((50, 10, 1)), None), sp_runtime::traits::BadOrigin, ); assert_eq!(Balances::free_balance(42), 0); @@ -1054,7 +1054,7 @@ mod tests { Error::::SignerHasNoClaim, ); assert_ok!(Claims::mint_claim( - Origin::root(), + RuntimeOrigin::root(), eth(&bob()), 200, Some((50, 10, 1)), @@ -1086,7 +1086,7 @@ mod tests { new_test_ext().execute_with(|| { assert_noop!( Claims::mint_claim( - Origin::signed(42), + RuntimeOrigin::signed(42), eth(&bob()), 200, None, @@ -1106,7 +1106,7 @@ mod tests { Error::::SignerHasNoClaim ); assert_ok!(Claims::mint_claim( - Origin::root(), + RuntimeOrigin::root(), eth(&bob()), 200, None, @@ -1132,7 +1132,7 @@ mod tests { assert_eq!(Balances::free_balance(42), 0); assert_err!( Claims::claim( - Origin::signed(42), + RuntimeOrigin::signed(42), 42, sig::(&alice(), &42u64.encode(), &[][..]) ), @@ -1170,7 +1170,7 @@ mod tests { CurrencyOf::::make_free_balance_be(&69, total_claims()); assert_eq!(Balances::free_balance(69), total_claims()); assert_ok!(Claims::mint_claim( - Origin::root(), + RuntimeOrigin::root(), eth(&bob()), 200, Some((50, 10, 1)), diff --git a/parentchain/Cargo.toml b/parentchain/Cargo.toml index 76122848..ee346332 100644 --- a/parentchain/Cargo.toml +++ b/parentchain/Cargo.toml @@ -15,17 +15,17 @@ scale-info = { version = "2.0.1", default-features = false, features = ["derive" serde = { version = "1.0.13", features = ["derive"], optional = true } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -frame-system = { default-features = false, package = "frame-system", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, package = "frame-system", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } [dev-dependencies] env_logger = "0.9.0" -sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/parentchain/src/mock.rs b/parentchain/src/mock.rs index d9bbef63..df5263a7 100644 --- a/parentchain/src/mock.rs +++ b/parentchain/src/mock.rs @@ -32,7 +32,7 @@ pub type Address = sp_runtime::MultiAddress; pub type BlockNumber = u32; pub type Header = generic::Header; pub type Block = generic::Block; -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; pub type SignedExtra = ( frame_system::CheckSpecVersion, @@ -68,16 +68,16 @@ impl frame_system::Config for Test { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type Index = u64; - type Call = Call; + type RuntimeCall = RuntimeCall; type BlockNumber = BlockNumber; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -100,7 +100,7 @@ impl pallet_balances::Config for Test { type MaxLocks = (); type Balance = u64; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); diff --git a/parentchain/src/tests.rs b/parentchain/src/tests.rs index 7449fffb..cef98f3a 100644 --- a/parentchain/src/tests.rs +++ b/parentchain/src/tests.rs @@ -41,7 +41,7 @@ fn verify_storage_works() { let hash = header.hash(); new_test_ext().execute_with(|| { - assert_ok!(Parentchain::set_block(Origin::root(), header)); + assert_ok!(Parentchain::set_block(RuntimeOrigin::root(), header)); assert_eq!(Parentchain::block_number(), block_number); assert_eq!(Parentchain::parent_hash(), parent_hash); assert_eq!(Parentchain::block_hash(), hash); @@ -60,6 +60,6 @@ fn non_root_account_errs() { new_test_ext().execute_with(|| { let root = AccountKeyring::Ferdie.to_account_id(); - assert_err!(Parentchain::set_block(Origin::signed(root), header), BadOrigin); + assert_err!(Parentchain::set_block(RuntimeOrigin::signed(root), header), BadOrigin); }) } diff --git a/primitives/claims/Cargo.toml b/primitives/claims/Cargo.toml index aa9a03d5..cd7b005a 100644 --- a/primitives/claims/Cargo.toml +++ b/primitives/claims/Cargo.toml @@ -14,9 +14,9 @@ scale-info = { version = "2.0.1", default-features = false, features = ["derive" serde = { version = "1.0.13", default-features = false } # substrate dependencies -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/primitives/common/Cargo.toml b/primitives/common/Cargo.toml index 356de057..f9d122f9 100644 --- a/primitives/common/Cargo.toml +++ b/primitives/common/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] # substrate deps -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/primitives/sidechain/Cargo.toml b/primitives/sidechain/Cargo.toml index fcc7f4c8..fb9aabd9 100644 --- a/primitives/sidechain/Cargo.toml +++ b/primitives/sidechain/Cargo.toml @@ -14,10 +14,10 @@ serde = { version = "1.0.13", default-features = false } # substrate dependencies -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } [features] diff --git a/primitives/teeracle/Cargo.toml b/primitives/teeracle/Cargo.toml index c6c9bf4b..ad248612 100644 --- a/primitives/teeracle/Cargo.toml +++ b/primitives/teeracle/Cargo.toml @@ -15,7 +15,7 @@ common-primitives = { path = "../common", default-features = false } substrate-fixed = { tag = "v0.5.9", default-features = false, git = "https://github.com/encointer/substrate-fixed.git" } # substrate -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } [features] diff --git a/primitives/teerex/Cargo.toml b/primitives/teerex/Cargo.toml index 22616c1e..3e9c0402 100644 --- a/primitives/teerex/Cargo.toml +++ b/primitives/teerex/Cargo.toml @@ -16,9 +16,9 @@ serde = { version = "1.0.13", default-features = false } ias-verify = { path = "../../teerex/ias-verify", default-features = false } # substrate dependencies -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } [features] diff --git a/sidechain/Cargo.toml b/sidechain/Cargo.toml index a7857754..a31ee72c 100644 --- a/sidechain/Cargo.toml +++ b/sidechain/Cargo.toml @@ -20,27 +20,27 @@ sidechain-primitives = { path = "../primitives/sidechain", default-features = fa teerex-primitives = { path = "../primitives/teerex", default-features = false } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } # benchmarking -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.2", optional = true } -pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } test-utils = { path = "../test-utils", default-features = false, optional = true } [dev-dependencies] env_logger = "0.9.0" -externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } hex-literal = "0.3.2" -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } test-utils = { path = "../test-utils" } [features] diff --git a/sidechain/src/lib.rs b/sidechain/src/lib.rs index 4fa86e89..84cec7d1 100644 --- a/sidechain/src/lib.rs +++ b/sidechain/src/lib.rs @@ -50,7 +50,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + pallet_teerex::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type WeightInfo: WeightInfo; // If a block arrives far too early, an error should be returned #[pallet::constant] diff --git a/sidechain/src/mock.rs b/sidechain/src/mock.rs index 9e240751..23b8a0e3 100644 --- a/sidechain/src/mock.rs +++ b/sidechain/src/mock.rs @@ -34,7 +34,7 @@ pub type Address = sp_runtime::MultiAddress; pub type BlockNumber = u32; pub type Header = generic::Header; pub type Block = generic::Block; -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; pub type SignedExtra = ( frame_system::CheckSpecVersion, @@ -67,16 +67,16 @@ impl frame_system::Config for Test { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type Index = u64; - type Call = Call; + type RuntimeCall = RuntimeCall; type BlockNumber = BlockNumber; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -99,7 +99,7 @@ impl pallet_balances::Config for Test { type MaxLocks = (); type Balance = u64; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); @@ -125,7 +125,7 @@ parameter_types! { } impl pallet_teerex::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type MomentsPerDay = MomentsPerDay; type WeightInfo = (); @@ -141,7 +141,7 @@ parameter_types! { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); type EarlyBlockProposalLenience = EarlyBlockProposalLenience; } diff --git a/sidechain/src/tests.rs b/sidechain/src/tests.rs index 46bda7f5..ad952210 100644 --- a/sidechain/src/tests.rs +++ b/sidechain/src/tests.rs @@ -36,14 +36,14 @@ fn confirm_imported_sidechain_block_works_for_correct_shard() { register_enclave7(); assert_ok!(Sidechain::confirm_imported_sidechain_block( - Origin::signed(signer7.clone()), + RuntimeOrigin::signed(signer7.clone()), shard7, 1, hash )); let expected_event = - Event::Sidechain(SidechainEvent::FinalizedSidechainBlock(signer7, hash)); + RuntimeEvent::Sidechain(SidechainEvent::FinalizedSidechainBlock(signer7, hash)); assert!(System::events().iter().any(|a| a.event == expected_event)); }) } @@ -59,7 +59,7 @@ fn confirm_imported_sidechain_block_from_shard_neq_mrenclave_errs() { register_enclave7(); assert_err!( - Sidechain::confirm_imported_sidechain_block(Origin::signed(signer7), shard4, 1, hash), + Sidechain::confirm_imported_sidechain_block(RuntimeOrigin::signed(signer7), shard4, 1, hash), pallet_teerex::Error::::WrongMrenclaveForShard ); }) @@ -203,7 +203,7 @@ fn register_enclave(signer_pub_key: &[u8; 32], cert: &[u8], expected_enclave_cou //Ensure that enclave is registered assert_ok!(Teerex::::register_enclave( - Origin::signed(signer7), + RuntimeOrigin::signed(signer7), cert.to_vec(), URL.to_vec(), )); @@ -229,7 +229,7 @@ fn confirm_block( let signer7 = get_signer(signer_pub_key); Sidechain::confirm_imported_sidechain_block( - Origin::signed(signer7.clone()), + RuntimeOrigin::signed(signer7.clone()), shard7, block_number, block_header_hash, @@ -237,7 +237,7 @@ fn confirm_block( if check_for_event { let expected_event = - Event::Sidechain(SidechainEvent::FinalizedSidechainBlock(signer7, block_header_hash)); + RuntimeEvent::Sidechain(SidechainEvent::FinalizedSidechainBlock(signer7, block_header_hash)); assert!(System::events().iter().any(|a| a.event == expected_event)); } Ok(().into()) diff --git a/teeracle/Cargo.toml b/teeracle/Cargo.toml index 98042079..c3979db2 100644 --- a/teeracle/Cargo.toml +++ b/teeracle/Cargo.toml @@ -21,27 +21,27 @@ teeracle-primitives = { path = "../primitives/teeracle", default-features = fals substrate-fixed = { tag = "v0.5.9", default-features = false, git = "https://github.com/encointer/substrate-fixed.git" } # substrate -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } # benchmarking -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.2", optional = true } test-utils = { path = "../test-utils", optional = true, default-features = false } -timestamp = { package = "pallet-timestamp", default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +timestamp = { package = "pallet-timestamp", default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } [dev-dependencies] -externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } hex-literal = "0.3.2" -sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } test-utils = { path = "../test-utils" } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } [features] diff --git a/teeracle/src/lib.rs b/teeracle/src/lib.rs index df8b02ec..82b1d7a6 100644 --- a/teeracle/src/lib.rs +++ b/teeracle/src/lib.rs @@ -54,7 +54,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + pallet_teerex::Config { /// The overarching event type. - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type WeightInfo: WeightInfo; /// Max number of whitelisted oracle's releases allowed #[pallet::constant] diff --git a/teeracle/src/mock.rs b/teeracle/src/mock.rs index 3ce23c95..38a6bca2 100644 --- a/teeracle/src/mock.rs +++ b/teeracle/src/mock.rs @@ -32,7 +32,7 @@ pub type Address = sp_runtime::MultiAddress; pub type BlockNumber = u32; pub type Header = generic::Header; pub type Block = generic::Block; -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; pub type SignedExtra = ( frame_system::CheckSpecVersion, @@ -65,16 +65,16 @@ impl frame_system::Config for Test { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type Index = u64; - type Call = Call; + type RuntimeCall = RuntimeCall; type BlockNumber = BlockNumber; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -97,7 +97,7 @@ impl pallet_balances::Config for Test { type MaxLocks = (); type Balance = u64; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); @@ -125,7 +125,7 @@ parameter_types! { } impl pallet_teerex::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type MomentsPerDay = MomentsPerDay; type WeightInfo = (); @@ -133,7 +133,7 @@ impl pallet_teerex::Config for Test { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); type MaxWhitelistedReleases = MaxWhitelistedReleases; } diff --git a/teeracle/src/tests.rs b/teeracle/src/tests.rs index fd8175ef..1e126cd7 100644 --- a/teeracle/src/tests.rs +++ b/teeracle/src/tests.rs @@ -29,7 +29,7 @@ const COINGECKO_SRC: &str = "https://api.coingecko.com"; const COINMARKETCAP_SRC: &str = "https://coinmarketcap.com/"; const DOT_USD_TRADING_PAIR: &str = "DOT/USD"; -const TEER_USD_TRADING_PAIR: &str = "TEER/USD"; +// const TEER_USD_TRADING_PAIR: &str = "TEER/USD"; // give get_signer a concrete type fn get_signer(pubkey: &[u8; 32]) -> AccountId { @@ -39,15 +39,15 @@ fn get_signer(pubkey: &[u8; 32]) -> AccountId { fn register_enclave_and_add_oracle_to_whitelist_ok(src: &str) { Timestamp::set_timestamp(TEST4_TIMESTAMP); let signer = get_signer(TEST4_SIGNER_PUB); - assert_ok!(Teerex::register_enclave(Origin::signed(signer), TEST4_CERT.to_vec(), URL.to_vec())); + assert_ok!(Teerex::register_enclave(RuntimeOrigin::signed(signer), TEST4_CERT.to_vec(), URL.to_vec())); let mrenclave = Teerex::enclave(1).unwrap().mr_enclave; - assert_ok!(Exchange::add_to_whitelist(Origin::root(), src.to_owned(), mrenclave)); + assert_ok!(Exchange::add_to_whitelist(RuntimeOrigin::root(), src.to_owned(), mrenclave)); } fn update_exchange_rate_dot_dollars_ok(src: &str, rate: Option) { let signer = get_signer(TEST4_SIGNER_PUB); assert_ok!(Exchange::update_exchange_rate( - Origin::signed(signer), + RuntimeOrigin::signed(signer), src.to_owned(), DOT_USD_TRADING_PAIR.to_owned(), rate @@ -61,7 +61,7 @@ fn update_exchange_rate_works() { let rate = U32F32::from_num(43.65); update_exchange_rate_dot_dollars_ok(COINGECKO_SRC, Some(rate)); - let expected_event = Event::Exchange(crate::Event::ExchangeRateUpdated( + let expected_event = RuntimeEvent::Exchange(crate::Event::ExchangeRateUpdated( COINGECKO_SRC.to_owned(), DOT_USD_TRADING_PAIR.to_owned(), Some(rate), @@ -117,7 +117,7 @@ fn update_exchange_rate_to_none_delete_exchange_rate() { update_exchange_rate_dot_dollars_ok(COINGECKO_SRC, None); - let expected_event = Event::Exchange(crate::Event::ExchangeRateDeleted( + let expected_event = RuntimeEvent::Exchange(crate::Event::ExchangeRateDeleted( COINGECKO_SRC.to_owned(), DOT_USD_TRADING_PAIR.to_owned(), )); @@ -138,7 +138,7 @@ fn update_exchange_rate_to_zero_delete_exchange_rate() { update_exchange_rate_dot_dollars_ok(COINGECKO_SRC, Some(U32F32::from_num(0))); - let expected_event = Event::Exchange(crate::Event::ExchangeRateDeleted( + let expected_event = RuntimeEvent::Exchange(crate::Event::ExchangeRateDeleted( COINGECKO_SRC.to_owned(), DOT_USD_TRADING_PAIR.to_owned(), )); @@ -158,7 +158,7 @@ fn update_exchange_rate_from_not_registered_enclave_fails() { let rate = U32F32::from_num(43.65); assert_err!( Exchange::update_exchange_rate( - Origin::signed(signer), + RuntimeOrigin::signed(signer), COINGECKO_SRC.to_owned(), DOT_USD_TRADING_PAIR.to_owned(), Some(rate) @@ -174,7 +174,7 @@ fn update_exchange_rate_from_not_whitelisted_oracle_fails() { Timestamp::set_timestamp(TEST4_TIMESTAMP); let signer = get_signer(TEST4_SIGNER_PUB); assert_ok!(Teerex::register_enclave( - Origin::signed(signer.clone()), + RuntimeOrigin::signed(signer.clone()), TEST4_CERT.to_vec(), URL.to_vec() )); @@ -182,7 +182,7 @@ fn update_exchange_rate_from_not_whitelisted_oracle_fails() { let rate = U32F32::from_num(43.65); assert_err!( Exchange::update_exchange_rate( - Origin::signed(signer), + RuntimeOrigin::signed(signer), COINGECKO_SRC.to_owned(), DOT_USD_TRADING_PAIR.to_owned(), Some(rate) @@ -201,7 +201,7 @@ fn update_exchange_rate_with_too_long_trading_pair_fails() { let too_long_trading_pair = "123456789_12".to_owned(); assert_err!( Exchange::update_exchange_rate( - Origin::signed(signer), + RuntimeOrigin::signed(signer), COINGECKO_SRC.to_owned(), too_long_trading_pair, rate @@ -215,11 +215,11 @@ fn update_exchange_rate_with_too_long_trading_pair_fails() { fn add_to_whitelist_works() { new_test_ext().execute_with(|| { assert_ok!(Exchange::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); - let expected_event = Event::Exchange(crate::Event::AddedToWhitelist( + let expected_event = RuntimeEvent::Exchange(crate::Event::AddedToWhitelist( COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE, )); @@ -232,16 +232,16 @@ fn add_to_whitelist_works() { fn add_mulitple_src_to_whitelists_works() { new_test_ext().execute_with(|| { assert_ok!(Exchange::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); assert_ok!(Exchange::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINMARKETCAP_SRC.to_owned(), TEST4_MRENCLAVE )); - let expected_event = Event::Exchange(crate::Event::AddedToWhitelist( + let expected_event = RuntimeEvent::Exchange(crate::Event::AddedToWhitelist( COINMARKETCAP_SRC.to_owned(), TEST4_MRENCLAVE, )); @@ -256,12 +256,12 @@ fn add_mulitple_src_to_whitelists_works() { fn add_two_times_to_whitelist_fails() { new_test_ext().execute_with(|| { assert_ok!(Exchange::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); assert_err!( - Exchange::add_to_whitelist(Origin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE), + Exchange::add_to_whitelist(RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE), crate::Error::::ReleaseAlreadyWhitelisted ); assert_eq!(Exchange::whitelist(COINGECKO_SRC.to_owned()).len(), 1); @@ -272,57 +272,57 @@ fn add_two_times_to_whitelist_fails() { fn add_too_many_oracles_to_whitelist_fails() { new_test_ext().execute_with(|| { assert_ok!(Exchange::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); assert_ok!(Exchange::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST5_MRENCLAVE )); assert_ok!(Exchange::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d2") )); assert_ok!(Exchange::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d3") )); assert_ok!(Exchange::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d4") )); assert_ok!(Exchange::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d5") )); assert_ok!(Exchange::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d6") )); assert_ok!(Exchange::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d7") )); assert_ok!(Exchange::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d8") )); assert_ok!(Exchange::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d9") )); assert_err!( - Exchange::add_to_whitelist(Origin::root(), COINGECKO_SRC.to_owned(), TEST8_MRENCLAVE), + Exchange::add_to_whitelist(RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST8_MRENCLAVE), crate::Error::::ReleaseWhitelistOverflow ); assert_eq!(Exchange::whitelist(COINGECKO_SRC.to_owned()).len(), 10); @@ -333,7 +333,7 @@ fn add_to_whitelist_too_long_source_fails() { new_test_ext().execute_with(|| { let too_long_source = "123456789_223456789_323456789_423456789_1".to_owned(); assert_err!( - Exchange::add_to_whitelist(Origin::root(), too_long_source, TEST4_MRENCLAVE), + Exchange::add_to_whitelist(RuntimeOrigin::root(), too_long_source, TEST4_MRENCLAVE), crate::Error::::MarketDataSourceStringTooLong ); }) @@ -345,7 +345,7 @@ fn non_root_add_to_whitelist_fails() { let signer = get_signer(TEST5_SIGNER_PUB); assert_err!( Exchange::add_to_whitelist( - Origin::signed(signer), + RuntimeOrigin::signed(signer), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE ), @@ -359,16 +359,16 @@ fn non_root_add_to_whitelist_fails() { fn remove_from_whitelist_works() { new_test_ext().execute_with(|| { assert_ok!(Exchange::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); assert_ok!(Exchange::remove_from_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); - let expected_event = Event::Exchange(crate::Event::RemovedFromWhitelist( + let expected_event = RuntimeEvent::Exchange(crate::Event::RemovedFromWhitelist( COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE, )); @@ -381,13 +381,13 @@ fn remove_from_whitelist_works() { fn remove_from_whitelist_not_whitelisted_fails() { new_test_ext().execute_with(|| { assert_ok!(Exchange::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); assert_err!( Exchange::remove_from_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST5_MRENCLAVE ), @@ -403,7 +403,7 @@ fn remove_from_empty_whitelist_doesnt_crash() { assert_eq!(Exchange::whitelist(COINGECKO_SRC.to_owned()).len(), 0); assert_err!( Exchange::remove_from_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST5_MRENCLAVE ), @@ -418,13 +418,13 @@ fn non_root_remove_from_whitelist_fails() { new_test_ext().execute_with(|| { let signer = get_signer(TEST5_SIGNER_PUB); assert_ok!(Exchange::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); assert_err!( Exchange::remove_from_whitelist( - Origin::signed(signer), + RuntimeOrigin::signed(signer), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE ), diff --git a/teerex/Cargo.toml b/teerex/Cargo.toml index d4f6608a..37f86534 100644 --- a/teerex/Cargo.toml +++ b/teerex/Cargo.toml @@ -19,27 +19,27 @@ ias-verify = { path = "./ias-verify", default-features = false } teerex-primitives = { path = "../primitives/teerex", default-features = false } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -timestamp = { package = "pallet-timestamp", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +timestamp = { package = "pallet-timestamp", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } # benchmarking -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.2", optional = true } -pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } test-utils = { path = "../test-utils", default-features = false, optional = true } [dev-dependencies] env_logger = "0.9.0" -externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } hex-literal = "0.3.2" -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } test-utils = { path = "../test-utils" } [features] diff --git a/teerex/src/lib.rs b/teerex/src/lib.rs index ca4148c5..99734479 100644 --- a/teerex/src/lib.rs +++ b/teerex/src/lib.rs @@ -22,7 +22,6 @@ use frame_support::{ dispatch::{DispatchErrorWithPostInfo, DispatchResult, DispatchResultWithPostInfo}, ensure, traits::{Currency, ExistenceRequirement, Get, OnTimestampSet}, - weights::{DispatchClass, Pays}, }; use frame_system::{self, ensure_signed}; use sp_core::H256; @@ -61,7 +60,7 @@ pub mod pallet { #[pallet::config] pub trait Config: frame_system::Config + timestamp::Config { - type Event: From> + IsType<::Event>; + type RuntimeEvent: From> + IsType<::RuntimeEvent>; type Currency: Currency<::AccountId>; type MomentsPerDay: Get; type WeightInfo: WeightInfo; diff --git a/teerex/src/mock.rs b/teerex/src/mock.rs index 2a3e50a6..5ad97c5c 100644 --- a/teerex/src/mock.rs +++ b/teerex/src/mock.rs @@ -38,7 +38,7 @@ pub type Address = sp_runtime::MultiAddress; pub type BlockNumber = u32; pub type Header = generic::Header; pub type Block = generic::Block; -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; pub type SignedExtra = ( frame_system::CheckSpecVersion, @@ -70,16 +70,16 @@ impl frame_system::Config for Test { type BlockWeights = (); type BlockLength = (); type DbWeight = (); - type Origin = Origin; + type RuntimeOrigin = RuntimeOrigin; type Index = u64; - type Call = Call; + type RuntimeCall = RuntimeCall; type BlockNumber = BlockNumber; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; - type Event = Event; + type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); type PalletInfo = PalletInfo; @@ -102,7 +102,7 @@ impl pallet_balances::Config for Test { type MaxLocks = (); type Balance = u64; type DustRemoval = (); - type Event = Event; + type RuntimeEvent = RuntimeEvent; type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); @@ -129,7 +129,7 @@ parameter_types! { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type MomentsPerDay = MomentsPerDay; type MaxSilenceTime = MaxSilenceTime; @@ -172,7 +172,7 @@ pub fn new_test_production_ext() -> sp_io::TestExternalities { //Help method for the OnTimestampSet to be called pub fn set_timestamp(t: u64) { - let _ = timestamp::Pallet::::set(Origin::none(), t); + let _ = timestamp::Pallet::::set(RuntimeOrigin::none(), t); } /// Run until a particular block. diff --git a/teerex/src/tests/skip_ias_check_tests.rs b/teerex/src/tests/skip_ias_check_tests.rs index 5f15d4da..8df951e1 100644 --- a/teerex/src/tests/skip_ias_check_tests.rs +++ b/teerex/src/tests/skip_ias_check_tests.rs @@ -37,7 +37,7 @@ fn test_enclave() -> Enclave> { fn register_enclave_with_empty_mrenclave_works() { new_test_ext().execute_with(|| { assert_ok!(Teerex::register_enclave( - Origin::signed(AccountKeyring::Alice.to_account_id()), + RuntimeOrigin::signed(AccountKeyring::Alice.to_account_id()), Vec::new(), URL.to_vec() )); @@ -51,7 +51,7 @@ fn register_enclave_with_empty_mrenclave_works() { fn register_enclave_with_mrenclave_works() { new_test_ext().execute_with(|| { assert_ok!(Teerex::register_enclave( - Origin::signed(AccountKeyring::Alice.to_account_id()), + RuntimeOrigin::signed(AccountKeyring::Alice.to_account_id()), TEST4_MRENCLAVE.to_vec(), URL.to_vec() )); @@ -67,7 +67,7 @@ fn register_enclave_with_mrenclave_works() { fn register_enclave_with_faulty_mrenclave_inserts_default() { new_test_ext().execute_with(|| { assert_ok!(Teerex::register_enclave( - Origin::signed(AccountKeyring::Alice.to_account_id()), + RuntimeOrigin::signed(AccountKeyring::Alice.to_account_id()), [1u8, 2].to_vec(), URL.to_vec() )); @@ -81,7 +81,7 @@ fn register_enclave_with_faulty_mrenclave_inserts_default() { fn register_enclave_with_empty_url_inserts_default() { new_test_ext().execute_with(|| { assert_ok!(Teerex::register_enclave( - Origin::signed(AccountKeyring::Alice.to_account_id()), + RuntimeOrigin::signed(AccountKeyring::Alice.to_account_id()), Vec::new(), Vec::new(), )); diff --git a/teerex/src/tests/test_cases.rs b/teerex/src/tests/test_cases.rs index 6297f122..7a06c1b2 100644 --- a/teerex/src/tests/test_cases.rs +++ b/teerex/src/tests/test_cases.rs @@ -41,7 +41,7 @@ fn add_enclave_works() { Timestamp::set_timestamp(TEST4_TIMESTAMP); let signer = get_signer(TEST4_SIGNER_PUB); assert_ok!(Teerex::register_enclave( - Origin::signed(signer), + RuntimeOrigin::signed(signer), TEST4_CERT.to_vec(), URL.to_vec() )); @@ -56,12 +56,12 @@ fn add_and_remove_enclave_works() { Timestamp::set_timestamp(TEST4_TIMESTAMP); let signer = get_signer(TEST4_SIGNER_PUB); assert_ok!(Teerex::register_enclave( - Origin::signed(signer.clone()), + RuntimeOrigin::signed(signer.clone()), TEST4_CERT.to_vec(), URL.to_vec() )); assert_eq!(Teerex::enclave_count(), 1); - assert_ok!(Teerex::unregister_enclave(Origin::signed(signer))); + assert_ok!(Teerex::unregister_enclave(RuntimeOrigin::signed(signer))); assert_eq!(Teerex::enclave_count(), 0); assert_eq!(list_enclaves(), vec![]) }) @@ -80,7 +80,7 @@ fn list_enclaves_works() { sgx_mode: SgxBuildMode::Debug, }; assert_ok!(Teerex::register_enclave( - Origin::signed(signer.clone()), + RuntimeOrigin::signed(signer.clone()), TEST4_CERT.to_vec(), URL.to_vec(), )); @@ -127,7 +127,7 @@ fn remove_middle_enclave_works() { }; assert_ok!(Teerex::register_enclave( - Origin::signed(signer5), + RuntimeOrigin::signed(signer5), TEST5_CERT.to_vec(), URL.to_vec(), )); @@ -136,7 +136,7 @@ fn remove_middle_enclave_works() { // add enclave 2 assert_ok!(Teerex::register_enclave( - Origin::signed(signer6.clone()), + RuntimeOrigin::signed(signer6.clone()), TEST6_CERT.to_vec(), URL.to_vec(), )); @@ -147,7 +147,7 @@ fn remove_middle_enclave_works() { // add enclave 3 assert_ok!(Teerex::register_enclave( - Origin::signed(signer7), + RuntimeOrigin::signed(signer7), TEST7_CERT.to_vec(), URL.to_vec(), )); @@ -158,7 +158,7 @@ fn remove_middle_enclave_works() { assert!(enclaves.contains(&(3, e_3.clone()))); // remove enclave 2 - assert_ok!(Teerex::unregister_enclave(Origin::signed(signer6))); + assert_ok!(Teerex::unregister_enclave(RuntimeOrigin::signed(signer6))); assert_eq!(Teerex::enclave_count(), 2); let enclaves = list_enclaves(); assert!(enclaves.contains(&(1, e_1))); @@ -171,7 +171,7 @@ fn register_enclave_with_different_signer_fails() { new_test_ext().execute_with(|| { let signer = get_signer(TEST7_SIGNER_PUB); assert_err!( - Teerex::register_enclave(Origin::signed(signer), TEST5_CERT.to_vec(), URL.to_vec()), + Teerex::register_enclave(RuntimeOrigin::signed(signer), TEST5_CERT.to_vec(), URL.to_vec()), Error::::SenderIsNotAttestedEnclave ); }) @@ -183,7 +183,7 @@ fn register_enclave_with_to_old_attestation_report_fails() { Timestamp::set_timestamp(TEST7_TIMESTAMP + TWENTY_FOUR_HOURS + 1); let signer = get_signer(TEST7_SIGNER_PUB); assert_err!( - Teerex::register_enclave(Origin::signed(signer), TEST7_CERT.to_vec(), URL.to_vec(),), + Teerex::register_enclave(RuntimeOrigin::signed(signer), TEST7_CERT.to_vec(), URL.to_vec(),), Error::::RemoteAttestationTooOld ); }) @@ -195,7 +195,7 @@ fn register_enclave_with_almost_too_old_report_works() { Timestamp::set_timestamp(TEST7_TIMESTAMP + TWENTY_FOUR_HOURS - 1); let signer = get_signer(TEST7_SIGNER_PUB); assert_ok!(Teerex::register_enclave( - Origin::signed(signer), + RuntimeOrigin::signed(signer), TEST7_CERT.to_vec(), URL.to_vec(), )); @@ -218,14 +218,14 @@ fn update_enclave_url_works() { }; assert_ok!(Teerex::register_enclave( - Origin::signed(signer.clone()), + RuntimeOrigin::signed(signer.clone()), TEST4_CERT.to_vec(), URL.to_vec(), )); assert_eq!(Teerex::enclave(1).unwrap().url, URL.to_vec()); assert_ok!(Teerex::register_enclave( - Origin::signed(signer.clone()), + RuntimeOrigin::signed(signer.clone()), TEST4_CERT.to_vec(), url2.to_vec(), )); @@ -245,19 +245,19 @@ fn update_ipfs_hash_works() { let signer = get_signer(TEST4_SIGNER_PUB); assert_ok!(Teerex::register_enclave( - Origin::signed(signer.clone()), + RuntimeOrigin::signed(signer.clone()), TEST4_CERT.to_vec(), URL.to_vec(), )); assert_eq!(Teerex::enclave_count(), 1); assert_ok!(Teerex::confirm_processed_parentchain_block( - Origin::signed(signer.clone()), + RuntimeOrigin::signed(signer.clone()), block_hash, block_number, merkle_root, )); - let expected_event = Event::Teerex(TeerexEvent::ProcessedParentchainBlock( + let expected_event = RuntimeEvent::Teerex(TeerexEvent::ProcessedParentchainBlock( signer, block_hash, merkle_root, @@ -273,7 +273,7 @@ fn ipfs_update_from_unregistered_enclave_fails() { let signer = get_signer(TEST4_SIGNER_PUB); assert_err!( Teerex::confirm_processed_parentchain_block( - Origin::signed(signer), + RuntimeOrigin::signed(signer), H256::default(), 3, H256::default(), @@ -289,8 +289,8 @@ fn call_worker_works() { let req = Request { shard: ShardIdentifier::default(), cyphertext: vec![0u8, 1, 2, 3, 4] }; // don't care who signs let signer = get_signer(TEST4_SIGNER_PUB); - assert!(Teerex::call_worker(Origin::signed(signer), req.clone()).is_ok()); - let expected_event = Event::Teerex(TeerexEvent::Forwarded(req.shard)); + assert!(Teerex::call_worker(RuntimeOrigin::signed(signer), req.clone()).is_ok()); + let expected_event = RuntimeEvent::Teerex(TeerexEvent::Forwarded(req.shard)); println!("events:{:?}", System::events()); assert!(System::events().iter().any(|a| a.event == expected_event)); }) @@ -305,19 +305,19 @@ fn unshield_is_only_executed_once_for_the_same_call_hash() { let bonding_account = get_signer(&TEST4_MRENCLAVE); assert_ok!(Teerex::register_enclave( - Origin::signed(signer.clone()), + RuntimeOrigin::signed(signer.clone()), TEST4_CERT.to_vec(), URL.to_vec(), )); assert_ok!(Balances::transfer( - Origin::signed(AccountKeyring::Alice.to_account_id()), + RuntimeOrigin::signed(AccountKeyring::Alice.to_account_id()), bonding_account.clone(), 1 << 50 )); assert!(Teerex::unshield_funds( - Origin::signed(signer.clone()), + RuntimeOrigin::signed(signer.clone()), AccountKeyring::Alice.to_account_id(), 50, bonding_account.clone(), @@ -326,7 +326,7 @@ fn unshield_is_only_executed_once_for_the_same_call_hash() { .is_ok()); assert!(Teerex::unshield_funds( - Origin::signed(signer), + RuntimeOrigin::signed(signer), AccountKeyring::Alice.to_account_id(), 50, bonding_account, @@ -365,17 +365,17 @@ fn timestamp_callback_works() { //Register 3 enclaves: 5, 6 ,7 assert_ok!(Teerex::register_enclave( - Origin::signed(signer5.clone()), + RuntimeOrigin::signed(signer5.clone()), TEST5_CERT.to_vec(), URL.to_vec(), )); assert_ok!(Teerex::register_enclave( - Origin::signed(signer6.clone()), + RuntimeOrigin::signed(signer6.clone()), TEST6_CERT.to_vec(), URL.to_vec(), )); assert_ok!(Teerex::register_enclave( - Origin::signed(signer7.clone()), + RuntimeOrigin::signed(signer7.clone()), TEST7_CERT.to_vec(), URL.to_vec(), )); @@ -385,7 +385,7 @@ fn timestamp_callback_works() { run_to_block(2); set_timestamp(TEST5_TIMESTAMP + 2 * TWENTY_FOUR_HOURS + 1); - let expected_event = Event::Teerex(TeerexEvent::RemovedEnclave(signer5)); + let expected_event = RuntimeEvent::Teerex(TeerexEvent::RemovedEnclave(signer5)); assert!(System::events().iter().any(|a| a.event == expected_event)); assert_eq!(Teerex::enclave_count(), 2); //2 and 3 are still there. 3 and 1 were swapped -> 3 and 2 @@ -399,15 +399,15 @@ fn timestamp_callback_works() { assert_eq!(Teerex::enclave_count(), 2); //unregister 6 to generate an error next call of callbakc - assert_ok!(Teerex::unregister_enclave(Origin::signed(signer6.clone()))); - let expected_event = Event::Teerex(TeerexEvent::RemovedEnclave(signer6)); + assert_ok!(Teerex::unregister_enclave(RuntimeOrigin::signed(signer6.clone()))); + let expected_event = RuntimeEvent::Teerex(TeerexEvent::RemovedEnclave(signer6)); assert!(System::events().iter().any(|a| a.event == expected_event)); assert_eq!(Teerex::enclave_count(), 1); //enclave 6 and 7 silent since TWENTY_FOUR_HOURS + 1 -> unregistered run_to_block(4); set_timestamp(TEST7_TIMESTAMP + 2 * TWENTY_FOUR_HOURS + 1); - let expected_event = Event::Teerex(TeerexEvent::RemovedEnclave(signer7)); + let expected_event = RuntimeEvent::Teerex(TeerexEvent::RemovedEnclave(signer7)); assert!(System::events().iter().any(|a| a.event == expected_event)); assert_eq!(Teerex::enclave_count(), 0); }) @@ -428,7 +428,7 @@ fn debug_mode_enclave_attest_works_when_sgx_debug_mode_is_allowed() { //Register an enclave compiled in debug mode assert_ok!(Teerex::register_enclave( - Origin::signed(signer4), + RuntimeOrigin::signed(signer4), TEST4_CERT.to_vec(), URL.to_vec(), )); @@ -454,7 +454,7 @@ fn production_mode_enclave_attest_works_when_sgx_debug_mode_is_allowed() { //Register an enclave compiled in production mode assert_ok!(Teerex::register_enclave( - Origin::signed(signer8), + RuntimeOrigin::signed(signer8), TEST8_CERT.to_vec(), URL.to_vec(), )); @@ -472,7 +472,7 @@ fn debug_mode_enclave_attest_fails_when_sgx_debug_mode_not_allowed() { let signer4 = get_signer(TEST4_SIGNER_PUB); //Try to register an enclave compiled in debug mode assert_err!( - Teerex::register_enclave(Origin::signed(signer4), TEST4_CERT.to_vec(), URL.to_vec(),), + Teerex::register_enclave(RuntimeOrigin::signed(signer4), TEST4_CERT.to_vec(), URL.to_vec(),), Error::::SgxModeNotAllowed ); assert_eq!(Teerex::enclave_count(), 0); @@ -493,7 +493,7 @@ fn production_mode_enclave_attest_works_when_sgx_debug_mode_not_allowed() { //Register an enclave compiled in production mode assert_ok!(Teerex::register_enclave( - Origin::signed(signer8), + RuntimeOrigin::signed(signer8), TEST8_CERT.to_vec(), URL.to_vec(), )); @@ -514,14 +514,14 @@ fn verify_unshield_funds_works() { //Register enclave assert_ok!(Teerex::register_enclave( - Origin::signed(signer4.clone()), + RuntimeOrigin::signed(signer4.clone()), TEST4_CERT.to_vec(), URL.to_vec(), )); assert_eq!(Teerex::enclave_count(), 1); assert!(Teerex::shield_funds( - Origin::signed(AccountKeyring::Alice.to_account_id()), + RuntimeOrigin::signed(AccountKeyring::Alice.to_account_id()), incognito_account.clone(), 100, bonding_account.clone(), @@ -530,11 +530,11 @@ fn verify_unshield_funds_works() { assert_eq!(Balances::free_balance(bonding_account.clone()), 100); - let expected_event = Event::Teerex(TeerexEvent::ShieldFunds(incognito_account)); + let expected_event = RuntimeEvent::Teerex(TeerexEvent::ShieldFunds(incognito_account)); assert!(System::events().iter().any(|a| a.event == expected_event)); assert!(Teerex::unshield_funds( - Origin::signed(signer4), + RuntimeOrigin::signed(signer4), AccountKeyring::Alice.to_account_id(), 50, bonding_account.clone(), @@ -544,7 +544,7 @@ fn verify_unshield_funds_works() { assert_eq!(Balances::free_balance(bonding_account), 50); let expected_event = - Event::Teerex(TeerexEvent::UnshieldedFunds(AccountKeyring::Alice.to_account_id())); + RuntimeEvent::Teerex(TeerexEvent::UnshieldedFunds(AccountKeyring::Alice.to_account_id())); assert!(System::events().iter().any(|a| a.event == expected_event)); }) } @@ -560,7 +560,7 @@ fn unshield_funds_from_not_registered_enclave_errs() { assert_err!( Teerex::unshield_funds( - Origin::signed(signer4.clone()), + RuntimeOrigin::signed(signer4.clone()), AccountKeyring::Alice.to_account_id(), 51, signer4, @@ -583,14 +583,14 @@ fn unshield_funds_from_enclave_neq_bonding_account_errs() { //Ensure that enclave is registered assert_ok!(Teerex::register_enclave( - Origin::signed(signer4.clone()), + RuntimeOrigin::signed(signer4.clone()), TEST4_CERT.to_vec(), URL.to_vec(), )); //Ensure that bonding account has funds assert!(Teerex::shield_funds( - Origin::signed(AccountKeyring::Alice.to_account_id()), + RuntimeOrigin::signed(AccountKeyring::Alice.to_account_id()), incognito_account.to_vec(), 100, bonding_account.clone(), @@ -598,7 +598,7 @@ fn unshield_funds_from_enclave_neq_bonding_account_errs() { .is_ok()); assert!(Teerex::shield_funds( - Origin::signed(AccountKeyring::Alice.to_account_id()), + RuntimeOrigin::signed(AccountKeyring::Alice.to_account_id()), incognito_account.to_vec(), 50, not_bonding_account.clone(), @@ -607,7 +607,7 @@ fn unshield_funds_from_enclave_neq_bonding_account_errs() { assert_err!( Teerex::unshield_funds( - Origin::signed(signer4), + RuntimeOrigin::signed(signer4), AccountKeyring::Alice.to_account_id(), 50, not_bonding_account.clone(), @@ -632,20 +632,20 @@ fn confirm_processed_parentchain_block_works() { //Ensure that enclave is registered assert_ok!(Teerex::register_enclave( - Origin::signed(signer7.clone()), + RuntimeOrigin::signed(signer7.clone()), TEST7_CERT.to_vec(), URL.to_vec(), )); assert_eq!(Teerex::enclave_count(), 1); assert_ok!(Teerex::confirm_processed_parentchain_block( - Origin::signed(signer7.clone()), + RuntimeOrigin::signed(signer7.clone()), block_hash, block_number, merkle_root, )); - let expected_event = Event::Teerex(TeerexEvent::ProcessedParentchainBlock( + let expected_event = RuntimeEvent::Teerex(TeerexEvent::ProcessedParentchainBlock( signer7, block_hash, merkle_root, @@ -664,7 +664,7 @@ fn verify_is_registered_enclave_works() { //Ensure that enclave is registered assert_ok!(Teerex::register_enclave( - Origin::signed(signer4.clone()), + RuntimeOrigin::signed(signer4.clone()), TEST4_CERT.to_vec(), URL.to_vec(), )); From e142ae8bded481244edbf0020f3ff212e922fb4d Mon Sep 17 00:00:00 2001 From: Chengcheng Shi Date: Tue, 8 Nov 2022 18:55:58 +0800 Subject: [PATCH 02/11] format code --- claims/src/lib.rs | 49 ++++++++++++++++++++++++++++------ parentchain/src/mock.rs | 3 ++- sidechain/src/mock.rs | 3 ++- sidechain/src/tests.rs | 13 ++++++--- teeracle/src/mock.rs | 3 ++- teeracle/src/tests.rs | 18 ++++++++++--- teerex/src/mock.rs | 3 ++- teerex/src/tests/test_cases.rs | 23 ++++++++++++---- 8 files changed, 92 insertions(+), 23 deletions(-) diff --git a/claims/src/lib.rs b/claims/src/lib.rs index c16df0ab..63477aca 100644 --- a/claims/src/lib.rs +++ b/claims/src/lib.rs @@ -829,7 +829,12 @@ mod tests { Claims::move_claim(RuntimeOrigin::signed(1), eth(&alice()), eth(&bob()), None), BadOrigin ); - assert_ok!(Claims::move_claim(RuntimeOrigin::signed(6), eth(&alice()), eth(&bob()), None)); + assert_ok!(Claims::move_claim( + RuntimeOrigin::signed(6), + eth(&alice()), + eth(&bob()), + None + )); assert_noop!( Claims::claim(Origin::none(), 42, sig::(&alice(), &42u64.encode(), &[][..])), Error::::SignerHasNoClaim @@ -848,7 +853,12 @@ mod tests { #[test] fn claim_attest_moving_works() { new_test_ext().execute_with(|| { - assert_ok!(Claims::move_claim(RuntimeOrigin::signed(6), eth(&dave()), eth(&bob()), None)); + assert_ok!(Claims::move_claim( + RuntimeOrigin::signed(6), + eth(&dave()), + eth(&bob()), + None + )); let s = sig::(&bob(), &42u64.encode(), StatementKind::Regular.to_text()); assert_ok!(Claims::claim_attest( Origin::none(), @@ -863,8 +873,16 @@ mod tests { #[test] fn attest_moving_works() { new_test_ext().execute_with(|| { - assert_ok!(Claims::move_claim(RuntimeOrigin::signed(6), eth(&eve()), eth(&bob()), Some(42))); - assert_ok!(Claims::attest(RuntimeOrigin::signed(42), StatementKind::Saft.to_text().to_vec())); + assert_ok!(Claims::move_claim( + RuntimeOrigin::signed(6), + eth(&eve()), + eth(&bob()), + Some(42) + )); + assert_ok!(Claims::attest( + RuntimeOrigin::signed(42), + StatementKind::Saft.to_text().to_vec() + )); assert_eq!(Balances::free_balance(&42), 300); }); } @@ -946,10 +964,16 @@ mod tests { Error::::SenderHasNoClaim ); assert_noop!( - Claims::attest(RuntimeOrigin::signed(42), StatementKind::Regular.to_text().to_vec()), + Claims::attest( + RuntimeOrigin::signed(42), + StatementKind::Regular.to_text().to_vec() + ), Error::::InvalidStatement ); - assert_ok!(Claims::attest(RuntimeOrigin::signed(42), StatementKind::Saft.to_text().to_vec())); + assert_ok!(Claims::attest( + RuntimeOrigin::signed(42), + StatementKind::Saft.to_text().to_vec() + )); assert_eq!(Balances::free_balance(&42), 300); assert_eq!(Claims::total(), total_claims() - 300); }); @@ -967,7 +991,10 @@ mod tests { )); assert_eq!(Balances::free_balance(&42), 100); // Eve's claim is 300 through Account 42 - assert_ok!(Claims::attest(RuntimeOrigin::signed(42), StatementKind::Saft.to_text().to_vec())); + assert_ok!(Claims::attest( + RuntimeOrigin::signed(42), + StatementKind::Saft.to_text().to_vec() + )); assert_eq!(Balances::free_balance(&42), 100 + 300); assert_eq!(Claims::total(), total_claims() - 400); }); @@ -1045,7 +1072,13 @@ mod tests { fn add_claim_with_vesting_works() { new_test_ext().execute_with(|| { assert_noop!( - Claims::mint_claim(RuntimeOrigin::signed(42), eth(&bob()), 200, Some((50, 10, 1)), None), + Claims::mint_claim( + RuntimeOrigin::signed(42), + eth(&bob()), + 200, + Some((50, 10, 1)), + None + ), sp_runtime::traits::BadOrigin, ); assert_eq!(Balances::free_balance(42), 0); diff --git a/parentchain/src/mock.rs b/parentchain/src/mock.rs index df5263a7..053c3ddb 100644 --- a/parentchain/src/mock.rs +++ b/parentchain/src/mock.rs @@ -32,7 +32,8 @@ pub type Address = sp_runtime::MultiAddress; pub type BlockNumber = u32; pub type Header = generic::Header; pub type Block = generic::Block; -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = + generic::UncheckedExtrinsic; pub type SignedExtra = ( frame_system::CheckSpecVersion, diff --git a/sidechain/src/mock.rs b/sidechain/src/mock.rs index 23b8a0e3..0ef97192 100644 --- a/sidechain/src/mock.rs +++ b/sidechain/src/mock.rs @@ -34,7 +34,8 @@ pub type Address = sp_runtime::MultiAddress; pub type BlockNumber = u32; pub type Header = generic::Header; pub type Block = generic::Block; -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = + generic::UncheckedExtrinsic; pub type SignedExtra = ( frame_system::CheckSpecVersion, diff --git a/sidechain/src/tests.rs b/sidechain/src/tests.rs index ad952210..5d2f5a34 100644 --- a/sidechain/src/tests.rs +++ b/sidechain/src/tests.rs @@ -59,7 +59,12 @@ fn confirm_imported_sidechain_block_from_shard_neq_mrenclave_errs() { register_enclave7(); assert_err!( - Sidechain::confirm_imported_sidechain_block(RuntimeOrigin::signed(signer7), shard4, 1, hash), + Sidechain::confirm_imported_sidechain_block( + RuntimeOrigin::signed(signer7), + shard4, + 1, + hash + ), pallet_teerex::Error::::WrongMrenclaveForShard ); }) @@ -236,8 +241,10 @@ fn confirm_block( )?; if check_for_event { - let expected_event = - RuntimeEvent::Sidechain(SidechainEvent::FinalizedSidechainBlock(signer7, block_header_hash)); + let expected_event = RuntimeEvent::Sidechain(SidechainEvent::FinalizedSidechainBlock( + signer7, + block_header_hash, + )); assert!(System::events().iter().any(|a| a.event == expected_event)); } Ok(().into()) diff --git a/teeracle/src/mock.rs b/teeracle/src/mock.rs index 38a6bca2..05086454 100644 --- a/teeracle/src/mock.rs +++ b/teeracle/src/mock.rs @@ -32,7 +32,8 @@ pub type Address = sp_runtime::MultiAddress; pub type BlockNumber = u32; pub type Header = generic::Header; pub type Block = generic::Block; -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = + generic::UncheckedExtrinsic; pub type SignedExtra = ( frame_system::CheckSpecVersion, diff --git a/teeracle/src/tests.rs b/teeracle/src/tests.rs index 1e126cd7..67aeb96f 100644 --- a/teeracle/src/tests.rs +++ b/teeracle/src/tests.rs @@ -39,7 +39,11 @@ fn get_signer(pubkey: &[u8; 32]) -> AccountId { fn register_enclave_and_add_oracle_to_whitelist_ok(src: &str) { Timestamp::set_timestamp(TEST4_TIMESTAMP); let signer = get_signer(TEST4_SIGNER_PUB); - assert_ok!(Teerex::register_enclave(RuntimeOrigin::signed(signer), TEST4_CERT.to_vec(), URL.to_vec())); + assert_ok!(Teerex::register_enclave( + RuntimeOrigin::signed(signer), + TEST4_CERT.to_vec(), + URL.to_vec() + )); let mrenclave = Teerex::enclave(1).unwrap().mr_enclave; assert_ok!(Exchange::add_to_whitelist(RuntimeOrigin::root(), src.to_owned(), mrenclave)); } @@ -261,7 +265,11 @@ fn add_two_times_to_whitelist_fails() { TEST4_MRENCLAVE )); assert_err!( - Exchange::add_to_whitelist(RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE), + Exchange::add_to_whitelist( + RuntimeOrigin::root(), + COINGECKO_SRC.to_owned(), + TEST4_MRENCLAVE + ), crate::Error::::ReleaseAlreadyWhitelisted ); assert_eq!(Exchange::whitelist(COINGECKO_SRC.to_owned()).len(), 1); @@ -322,7 +330,11 @@ fn add_too_many_oracles_to_whitelist_fails() { hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d9") )); assert_err!( - Exchange::add_to_whitelist(RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST8_MRENCLAVE), + Exchange::add_to_whitelist( + RuntimeOrigin::root(), + COINGECKO_SRC.to_owned(), + TEST8_MRENCLAVE + ), crate::Error::::ReleaseWhitelistOverflow ); assert_eq!(Exchange::whitelist(COINGECKO_SRC.to_owned()).len(), 10); diff --git a/teerex/src/mock.rs b/teerex/src/mock.rs index 5ad97c5c..23499f4e 100644 --- a/teerex/src/mock.rs +++ b/teerex/src/mock.rs @@ -38,7 +38,8 @@ pub type Address = sp_runtime::MultiAddress; pub type BlockNumber = u32; pub type Header = generic::Header; pub type Block = generic::Block; -pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; +pub type UncheckedExtrinsic = + generic::UncheckedExtrinsic; pub type SignedExtra = ( frame_system::CheckSpecVersion, diff --git a/teerex/src/tests/test_cases.rs b/teerex/src/tests/test_cases.rs index 7a06c1b2..1dd8c6ff 100644 --- a/teerex/src/tests/test_cases.rs +++ b/teerex/src/tests/test_cases.rs @@ -171,7 +171,11 @@ fn register_enclave_with_different_signer_fails() { new_test_ext().execute_with(|| { let signer = get_signer(TEST7_SIGNER_PUB); assert_err!( - Teerex::register_enclave(RuntimeOrigin::signed(signer), TEST5_CERT.to_vec(), URL.to_vec()), + Teerex::register_enclave( + RuntimeOrigin::signed(signer), + TEST5_CERT.to_vec(), + URL.to_vec() + ), Error::::SenderIsNotAttestedEnclave ); }) @@ -183,7 +187,11 @@ fn register_enclave_with_to_old_attestation_report_fails() { Timestamp::set_timestamp(TEST7_TIMESTAMP + TWENTY_FOUR_HOURS + 1); let signer = get_signer(TEST7_SIGNER_PUB); assert_err!( - Teerex::register_enclave(RuntimeOrigin::signed(signer), TEST7_CERT.to_vec(), URL.to_vec(),), + Teerex::register_enclave( + RuntimeOrigin::signed(signer), + TEST7_CERT.to_vec(), + URL.to_vec(), + ), Error::::RemoteAttestationTooOld ); }) @@ -472,7 +480,11 @@ fn debug_mode_enclave_attest_fails_when_sgx_debug_mode_not_allowed() { let signer4 = get_signer(TEST4_SIGNER_PUB); //Try to register an enclave compiled in debug mode assert_err!( - Teerex::register_enclave(RuntimeOrigin::signed(signer4), TEST4_CERT.to_vec(), URL.to_vec(),), + Teerex::register_enclave( + RuntimeOrigin::signed(signer4), + TEST4_CERT.to_vec(), + URL.to_vec(), + ), Error::::SgxModeNotAllowed ); assert_eq!(Teerex::enclave_count(), 0); @@ -543,8 +555,9 @@ fn verify_unshield_funds_works() { .is_ok()); assert_eq!(Balances::free_balance(bonding_account), 50); - let expected_event = - RuntimeEvent::Teerex(TeerexEvent::UnshieldedFunds(AccountKeyring::Alice.to_account_id())); + let expected_event = RuntimeEvent::Teerex(TeerexEvent::UnshieldedFunds( + AccountKeyring::Alice.to_account_id(), + )); assert!(System::events().iter().any(|a| a.event == expected_event)); }) } From 44bc690d5bd728ca84a7a8699283a95c1e137049 Mon Sep 17 00:00:00 2001 From: SCC Date: Wed, 9 Nov 2022 15:05:18 +0800 Subject: [PATCH 03/11] fix deps and update v0.9.30 --- Cargo.lock | 887 +++++++---------------------------- teerex/ias-verify/Cargo.toml | 8 +- 2 files changed, 172 insertions(+), 723 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6e909468..a5dba8f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -92,15 +92,6 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" -[[package]] -name = "arrayvec" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -dependencies = [ - "nodrop", -] - [[package]] name = "arrayvec" version = "0.5.2" @@ -207,16 +198,6 @@ dependencies = [ "digest 0.10.5", ] -[[package]] -name = "blake2-rfc" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" -dependencies = [ - "arrayvec 0.4.12", - "constant_time_eq", -] - [[package]] name = "block-buffer" version = "0.7.3" @@ -327,9 +308,9 @@ dependencies = [ "rustc-hex", "scale-info", "serde", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -346,7 +327,7 @@ dependencies = [ name = "common-primitives" version = "0.1.0" dependencies = [ - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", ] [[package]] @@ -355,12 +336,6 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "core-foundation-sys" version = "0.8.3" @@ -687,7 +662,7 @@ name = "frame-benchmarking" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "frame-system", "linregress", "log", @@ -695,14 +670,14 @@ dependencies = [ "paste", "scale-info", "serde", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-runtime", + "sp-runtime-interface", + "sp-std", + "sp-storage", ] [[package]] @@ -717,37 +692,6 @@ dependencies = [ "serde", ] -[[package]] -name = "frame-support" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "bitflags", - "frame-metadata", - "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "impl-trait-for-tuples", - "k256", - "log", - "once_cell", - "parity-scale-codec", - "paste", - "scale-info", - "serde", - "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "tt-call", -] - [[package]] name = "frame-support" version = "4.0.0-dev" @@ -755,7 +699,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3 dependencies = [ "bitflags", "frame-metadata", - "frame-support-procedural 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support-procedural", "impl-trait-for-tuples", "k256", "log", @@ -765,35 +709,21 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-staking 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-arithmetic", + "sp-core", + "sp-core-hashing-proc-macro", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-state-machine", + "sp-std", + "sp-tracing", "sp-weights", "tt-call", ] -[[package]] -name = "frame-support-procedural" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "Inflector", - "cfg-expr", - "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "itertools", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "frame-support-procedural" version = "4.0.0-dev" @@ -801,47 +731,25 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3 dependencies = [ "Inflector", "cfg-expr", - "frame-support-procedural-tools 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support-procedural-tools", "itertools", "proc-macro2", "quote", "syn", ] -[[package]] -name = "frame-support-procedural-tools" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support-procedural-tools-derive 3.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote", "syn", ] -[[package]] -name = "frame-support-procedural-tools-derive" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" @@ -857,16 +765,16 @@ name = "frame-system" version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "log", "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-version", "sp-weights", ] @@ -1150,14 +1058,14 @@ version = "0.1.4" dependencies = [ "base64", "chrono", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "frame-support", "hex-literal", "parity-scale-codec", "scale-info", "serde_json", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", + "sp-core", + "sp-io", + "sp-std", "webpki", ] @@ -1389,12 +1297,6 @@ dependencies = [ "parity-util-mem", ] -[[package]] -name = "memory_units" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" - [[package]] name = "memory_units" version = "0.4.0" @@ -1432,7 +1334,7 @@ dependencies = [ "matrixmultiply", "nalgebra-macros", "num-complex", - "num-rational 0.4.1", + "num-rational", "num-traits", "rand 0.8.5", "rand_distr", @@ -1451,29 +1353,12 @@ dependencies = [ "syn", ] -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - [[package]] name = "nohash-hasher" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-bigint" version = "0.4.3" @@ -1514,18 +1399,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-rational" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" -dependencies = [ - "autocfg", - "num-bigint 0.2.6", - "num-integer", - "num-traits", -] - [[package]] name = "num-rational" version = "0.4.1" @@ -1533,7 +1406,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", - "num-bigint 0.4.3", + "num-bigint", "num-integer", "num-traits", ] @@ -1591,13 +1464,13 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -1606,7 +1479,7 @@ version = "0.9.12" dependencies = [ "claims-primitives", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "frame-system", "hex-literal", "libsecp256k1", @@ -1618,10 +1491,10 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -1629,18 +1502,18 @@ name = "pallet-parentchain" version = "0.9.0" dependencies = [ "env_logger", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "frame-system", "log", "pallet-balances", "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", "sp-keyring", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -1649,7 +1522,7 @@ version = "0.9.0" dependencies = [ "env_logger", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "frame-system", "hex-literal", "log", @@ -1660,12 +1533,12 @@ dependencies = [ "scale-info", "serde", "sidechain-primitives", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-externalities", + "sp-io", "sp-keyring", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", "teerex-primitives", "test-utils", ] @@ -1675,7 +1548,7 @@ name = "pallet-teeracle" version = "0.1.0" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "frame-system", "hex-literal", "log", @@ -1684,12 +1557,12 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-externalities", + "sp-io", "sp-keyring", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", "substrate-fixed", "teeracle-primitives", "test-utils", @@ -1701,7 +1574,7 @@ version = "0.9.0" dependencies = [ "env_logger", "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "frame-system", "hex-literal", "ias-verify", @@ -1711,12 +1584,12 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-externalities", + "sp-io", "sp-keyring", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", "teerex-primitives", "test-utils", ] @@ -1727,15 +1600,15 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-std", "sp-timestamp", ] @@ -1745,13 +1618,13 @@ version = "4.0.0-dev" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", - "frame-support 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "frame-support", "frame-system", "log", "parity-scale-codec", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-runtime", + "sp-std", ] [[package]] @@ -1807,12 +1680,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "parity-wasm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" - [[package]] name = "parity-wasm" version = "0.45.0" @@ -2353,10 +2220,10 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] @@ -2396,24 +2263,6 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" -[[package]] -name = "sp-api" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "thiserror", -] - [[package]] name = "sp-api" version = "4.0.0-dev" @@ -2422,28 +2271,16 @@ dependencies = [ "hash-db", "log", "parity-scale-codec", - "sp-api-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api-proc-macro", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", + "sp-version", "thiserror", ] -[[package]] -name = "sp-api-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "blake2", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" @@ -2456,19 +2293,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-application-crypto" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", -] - [[package]] name = "sp-application-crypto" version = "6.0.0" @@ -2477,24 +2301,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", -] - -[[package]] -name = "sp-arithmetic" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "integer-sqrt", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "static_assertions", + "sp-core", + "sp-io", + "sp-std", ] [[package]] @@ -2507,57 +2316,11 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-debug-derive", + "sp-std", "static_assertions", ] -[[package]] -name = "sp-core" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "base58", - "bitflags", - "blake2-rfc", - "byteorder", - "dyn-clonable", - "ed25519-zebra", - "futures", - "hash-db", - "hash256-std-hasher", - "hex", - "impl-serde", - "lazy_static", - "libsecp256k1", - "log", - "merlin", - "num-traits", - "parity-scale-codec", - "parity-util-mem", - "parking_lot", - "primitive-types", - "rand 0.7.3", - "regex", - "scale-info", - "schnorrkel", - "secp256k1", - "secrecy", - "serde", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "ss58-registry", - "substrate-bip39", - "thiserror", - "tiny-bip39", - "wasmi 0.9.1", - "zeroize", -] - [[package]] name = "sp-core" version = "6.0.0" @@ -2590,34 +2353,20 @@ dependencies = [ "secp256k1", "secrecy", "serde", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core-hashing", + "sp-debug-derive", + "sp-externalities", + "sp-runtime-interface", + "sp-std", + "sp-storage", "ss58-registry", "substrate-bip39", "thiserror", "tiny-bip39", - "wasmi 0.13.2", + "wasmi", "zeroize", ] -[[package]] -name = "sp-core-hashing" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "blake2", - "byteorder", - "digest 0.10.5", - "sha2 0.10.6", - "sha3", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "twox-hash", -] - [[package]] name = "sp-core-hashing" version = "4.0.0" @@ -2628,21 +2377,10 @@ dependencies = [ "digest 0.10.5", "sha2 0.10.6", "sha3", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", "twox-hash", ] -[[package]] -name = "sp-core-hashing-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "proc-macro2", - "quote", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "syn", -] - [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" @@ -2650,17 +2388,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3 dependencies = [ "proc-macro2", "quote", - "sp-core-hashing 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "syn", -] - -[[package]] -name = "sp-debug-derive" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "proc-macro2", - "quote", + "sp-core-hashing", "syn", ] @@ -2674,17 +2402,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-externalities" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", -] - [[package]] name = "sp-externalities" version = "0.12.0" @@ -2692,22 +2409,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3 dependencies = [ "environmental", "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", -] - -[[package]] -name = "sp-inherents" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "async-trait", - "impl-trait-for-tuples", - "parity-scale-codec", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "thiserror", + "sp-std", + "sp-storage", ] [[package]] @@ -2718,38 +2421,12 @@ dependencies = [ "async-trait", "impl-trait-for-tuples", "parity-scale-codec", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", + "sp-std", "thiserror", ] -[[package]] -name = "sp-io" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "bytes", - "futures", - "hash-db", - "libsecp256k1", - "log", - "parity-scale-codec", - "parking_lot", - "secp256k1", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "tracing", - "tracing-core", -] - [[package]] name = "sp-io" version = "6.0.0" @@ -2763,15 +2440,15 @@ dependencies = [ "parity-scale-codec", "parking_lot", "secp256k1", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-keystore 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-state-machine 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-externalities", + "sp-keystore", + "sp-runtime-interface", + "sp-state-machine", + "sp-std", + "sp-tracing", + "sp-trie", + "sp-wasm-interface", "tracing", "tracing-core", ] @@ -2782,27 +2459,11 @@ version = "6.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "lazy_static", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-runtime", "strum", ] -[[package]] -name = "sp-keystore" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "async-trait", - "futures", - "merlin", - "parity-scale-codec", - "parking_lot", - "schnorrkel", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "thiserror", -] - [[package]] name = "sp-keystore" version = "0.12.0" @@ -2814,21 +2475,11 @@ dependencies = [ "parity-scale-codec", "parking_lot", "schnorrkel", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-externalities", "thiserror", ] -[[package]] -name = "sp-panic-handler" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "backtrace", - "lazy_static", - "regex", -] - [[package]] name = "sp-panic-handler" version = "4.0.0" @@ -2839,28 +2490,6 @@ dependencies = [ "regex", ] -[[package]] -name = "sp-runtime" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "either", - "hash256-std-hasher", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "parity-util-mem", - "paste", - "rand 0.7.3", - "scale-info", - "serde", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", -] - [[package]] name = "sp-runtime" version = "6.0.0" @@ -2876,32 +2505,14 @@ dependencies = [ "rand 0.7.3", "scale-info", "serde", - "sp-application-crypto 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-application-crypto", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-std", "sp-weights", ] -[[package]] -name = "sp-runtime-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec", - "primitive-types", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-runtime-interface-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "static_assertions", -] - [[package]] name = "sp-runtime-interface" version = "6.0.0" @@ -2911,27 +2522,15 @@ dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime-interface-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-storage 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-tracing 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-wasm-interface 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-externalities", + "sp-runtime-interface-proc-macro", + "sp-std", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", ] -[[package]] -name = "sp-runtime-interface-proc-macro" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "Inflector", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" @@ -2944,17 +2543,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-staking" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "parity-scale-codec", - "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", -] - [[package]] name = "sp-staking" version = "4.0.0-dev" @@ -2962,30 +2550,8 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3 dependencies = [ "parity-scale-codec", "scale-info", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", -] - -[[package]] -name = "sp-state-machine" -version = "0.12.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "hash-db", - "log", - "num-traits", - "parity-scale-codec", - "parking_lot", - "rand 0.7.3", - "smallvec", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "thiserror", - "tracing", - "trie-root", + "sp-runtime", + "sp-std", ] [[package]] @@ -3000,39 +2566,21 @@ dependencies = [ "parking_lot", "rand 0.7.3", "smallvec", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-externalities 0.12.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-panic-handler 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-trie 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-externalities", + "sp-panic-handler", + "sp-std", + "sp-trie", "thiserror", "tracing", "trie-root", ] -[[package]] -name = "sp-std" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" - [[package]] name = "sp-std" version = "4.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" -[[package]] -name = "sp-storage" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", -] - [[package]] name = "sp-storage" version = "6.0.0" @@ -3042,8 +2590,8 @@ dependencies = [ "parity-scale-codec", "ref-cast", "serde", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-debug-derive", + "sp-std", ] [[package]] @@ -3055,60 +2603,25 @@ dependencies = [ "futures-timer", "log", "parity-scale-codec", - "sp-api 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-inherents 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-api", + "sp-inherents", + "sp-runtime", + "sp-std", "thiserror", ] -[[package]] -name = "sp-tracing" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "tracing", - "tracing-core", - "tracing-subscriber", -] - [[package]] name = "sp-tracing" version = "5.0.0" source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", "tracing", "tracing-core", "tracing-subscriber", ] -[[package]] -name = "sp-trie" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "ahash", - "hash-db", - "hashbrown", - "lazy_static", - "lru", - "memory-db", - "nohash-hasher", - "parity-scale-codec", - "parking_lot", - "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "thiserror", - "tracing", - "trie-db", - "trie-root", -] - [[package]] name = "sp-trie" version = "6.0.0" @@ -3124,31 +2637,14 @@ dependencies = [ "parity-scale-codec", "parking_lot", "scale-info", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-std", "thiserror", "tracing", "trie-db", "trie-root", ] -[[package]] -name = "sp-version" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "parity-wasm 0.42.2", - "scale-info", - "serde", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "thiserror", -] - [[package]] name = "sp-version" version = "5.0.0" @@ -3156,27 +2652,16 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3 dependencies = [ "impl-serde", "parity-scale-codec", - "parity-wasm 0.45.0", + "parity-wasm", "scale-info", "serde", - "sp-core-hashing-proc-macro 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-runtime 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-version-proc-macro 4.0.0-dev (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core-hashing-proc-macro", + "sp-runtime", + "sp-std", + "sp-version-proc-macro", "thiserror", ] -[[package]] -name = "sp-version-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "parity-scale-codec", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" @@ -3188,18 +2673,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sp-wasm-interface" -version = "6.0.0" -source = "git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" -dependencies = [ - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate.git?branch=polkadot-v0.9.29)", - "wasmi 0.9.1", -] - [[package]] name = "sp-wasm-interface" version = "6.0.0" @@ -3208,8 +2681,8 @@ dependencies = [ "impl-trait-for-tuples", "log", "parity-scale-codec", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "wasmi 0.13.2", + "sp-std", + "wasmi", ] [[package]] @@ -3222,10 +2695,10 @@ dependencies = [ "scale-info", "serde", "smallvec", - "sp-arithmetic 5.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-debug-derive 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-arithmetic", + "sp-core", + "sp-debug-derive", + "sp-std", ] [[package]] @@ -3364,7 +2837,7 @@ name = "teeracle-primitives" version = "0.1.0" dependencies = [ "common-primitives", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-std", "substrate-fixed", ] @@ -3376,9 +2849,9 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-io 6.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", - "sp-std 4.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30)", + "sp-core", + "sp-io", + "sp-std", ] [[package]] @@ -3725,48 +3198,24 @@ version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" -[[package]] -name = "wasmi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca00c5147c319a8ec91ec1a0edbec31e566ce2c9cc93b3f9bb86a9efd0eb795d" -dependencies = [ - "downcast-rs", - "libc", - "memory_units 0.3.0", - "num-rational 0.2.4", - "num-traits", - "parity-wasm 0.42.2", - "wasmi-validation 0.4.1", -] - [[package]] name = "wasmi" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422" dependencies = [ - "parity-wasm 0.45.0", - "wasmi-validation 0.5.0", + "parity-wasm", + "wasmi-validation", "wasmi_core", ] -[[package]] -name = "wasmi-validation" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "165343ecd6c018fc09ebcae280752702c9a2ef3e6f8d02f1cfcbdb53ef6d7937" -dependencies = [ - "parity-wasm 0.42.2", -] - [[package]] name = "wasmi-validation" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b" dependencies = [ - "parity-wasm 0.45.0", + "parity-wasm", ] [[package]] @@ -3777,8 +3226,8 @@ checksum = "57d20cb3c59b788653d99541c646c561c9dd26506f25c0cebfe810659c54c6d7" dependencies = [ "downcast-rs", "libm", - "memory_units 0.4.0", - "num-rational 0.4.1", + "memory_units", + "num-rational", "num-traits", ] diff --git a/teerex/ias-verify/Cargo.toml b/teerex/ias-verify/Cargo.toml index 3d6e39c5..3278df58 100644 --- a/teerex/ias-verify/Cargo.toml +++ b/teerex/ias-verify/Cargo.toml @@ -17,10 +17,10 @@ serde_json = { version = "1.0", default-features = false, features = ["alloc"] } webpki = { default-features = false, git = "https://github.com/scs/webpki-nostd.git" } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.29" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } [dev-dependencies] hex-literal = "*" From 26e479f8703aef63ee7820e5a80b3fe3966aab50 Mon Sep 17 00:00:00 2001 From: Chengcheng Shi Date: Thu, 10 Nov 2022 16:04:31 +0800 Subject: [PATCH 04/11] change the dps to our dps --- Cargo.lock | 74 ++++++++++++++++----------------- claims/Cargo.toml | 18 ++++---- parentchain/Cargo.toml | 16 +++---- primitives/claims/Cargo.toml | 6 +-- primitives/common/Cargo.toml | 2 +- primitives/sidechain/Cargo.toml | 8 ++-- primitives/teeracle/Cargo.toml | 2 +- primitives/teerex/Cargo.toml | 6 +-- sidechain/Cargo.toml | 26 ++++++------ teeracle/Cargo.toml | 26 ++++++------ teerex/Cargo.toml | 26 ++++++------ teerex/ias-verify/Cargo.toml | 8 ++-- 12 files changed, 109 insertions(+), 109 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a5dba8f4..52f8beb6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -660,7 +660,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "frame-support", "frame-system", @@ -695,7 +695,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "bitflags", "frame-metadata", @@ -727,7 +727,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "Inflector", "cfg-expr", @@ -741,7 +741,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -753,7 +753,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "proc-macro2", "quote", @@ -763,7 +763,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "frame-support", "log", @@ -1461,7 +1461,7 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "frame-benchmarking", "frame-support", @@ -1597,7 +1597,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "frame-benchmarking", "frame-support", @@ -1615,7 +1615,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "frame-benchmarking", "frame-support", @@ -2266,7 +2266,7 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "hash-db", "log", @@ -2284,7 +2284,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "blake2", "proc-macro-crate", @@ -2296,7 +2296,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "parity-scale-codec", "scale-info", @@ -2309,7 +2309,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "integer-sqrt", "num-traits", @@ -2324,7 +2324,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "array-bytes", "base58", @@ -2370,7 +2370,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "blake2", "byteorder", @@ -2384,7 +2384,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "proc-macro2", "quote", @@ -2395,7 +2395,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "proc-macro2", "quote", @@ -2405,7 +2405,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "environmental", "parity-scale-codec", @@ -2416,7 +2416,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -2430,7 +2430,7 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "bytes", "futures", @@ -2456,7 +2456,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "lazy_static", "sp-core", @@ -2467,7 +2467,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "async-trait", "futures", @@ -2483,7 +2483,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "backtrace", "lazy_static", @@ -2493,7 +2493,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "either", "hash256-std-hasher", @@ -2516,7 +2516,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -2534,7 +2534,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "Inflector", "proc-macro-crate", @@ -2546,7 +2546,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "parity-scale-codec", "scale-info", @@ -2557,7 +2557,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "hash-db", "log", @@ -2579,12 +2579,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "impl-serde", "parity-scale-codec", @@ -2597,7 +2597,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "async-trait", "futures-timer", @@ -2613,7 +2613,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "parity-scale-codec", "sp-std", @@ -2625,7 +2625,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "ahash", "hash-db", @@ -2648,7 +2648,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "impl-serde", "parity-scale-codec", @@ -2665,7 +2665,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -2676,7 +2676,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "impl-trait-for-tuples", "log", @@ -2688,7 +2688,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", diff --git a/claims/Cargo.toml b/claims/Cargo.toml index 447e2e24..195491b9 100644 --- a/claims/Cargo.toml +++ b/claims/Cargo.toml @@ -13,12 +13,12 @@ serde = { version = "1.0.13", default-features = false } serde_derive = { version = "1.0.13", optional = true } # substrate dependencies -frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-std = { package = "sp-std", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { package = "sp-std", default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } # local claims-primitives = { package = "claims-primitives", path = "../primitives/claims", default-features = false } @@ -26,10 +26,10 @@ claims-primitives = { package = "claims-primitives", path = "../primitives/claim [dev-dependencies] hex-literal = "0.3.3" libsecp256k1 = "0.7.0" -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -pallet-vesting = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +pallet-vesting = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } serde_json = { version = "1.0" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/parentchain/Cargo.toml b/parentchain/Cargo.toml index ee346332..6cb161ab 100644 --- a/parentchain/Cargo.toml +++ b/parentchain/Cargo.toml @@ -15,17 +15,17 @@ scale-info = { version = "2.0.1", default-features = false, features = ["derive" serde = { version = "1.0.13", features = ["derive"], optional = true } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, package = "frame-system", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, package = "frame-system", git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } [dev-dependencies] env_logger = "0.9.0" -sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-keyring = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/primitives/claims/Cargo.toml b/primitives/claims/Cargo.toml index cd7b005a..f68ac65f 100644 --- a/primitives/claims/Cargo.toml +++ b/primitives/claims/Cargo.toml @@ -14,9 +14,9 @@ scale-info = { version = "2.0.1", default-features = false, features = ["derive" serde = { version = "1.0.13", default-features = false } # substrate dependencies -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/primitives/common/Cargo.toml b/primitives/common/Cargo.toml index f9d122f9..f0e134bd 100644 --- a/primitives/common/Cargo.toml +++ b/primitives/common/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] # substrate deps -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/primitives/sidechain/Cargo.toml b/primitives/sidechain/Cargo.toml index fb9aabd9..b436c2c8 100644 --- a/primitives/sidechain/Cargo.toml +++ b/primitives/sidechain/Cargo.toml @@ -14,10 +14,10 @@ serde = { version = "1.0.13", default-features = false } # substrate dependencies -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } [features] diff --git a/primitives/teeracle/Cargo.toml b/primitives/teeracle/Cargo.toml index ad248612..d27b7df3 100644 --- a/primitives/teeracle/Cargo.toml +++ b/primitives/teeracle/Cargo.toml @@ -15,7 +15,7 @@ common-primitives = { path = "../common", default-features = false } substrate-fixed = { tag = "v0.5.9", default-features = false, git = "https://github.com/encointer/substrate-fixed.git" } # substrate -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } [features] diff --git a/primitives/teerex/Cargo.toml b/primitives/teerex/Cargo.toml index 3e9c0402..3b834c49 100644 --- a/primitives/teerex/Cargo.toml +++ b/primitives/teerex/Cargo.toml @@ -16,9 +16,9 @@ serde = { version = "1.0.13", default-features = false } ias-verify = { path = "../../teerex/ias-verify", default-features = false } # substrate dependencies -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } [features] diff --git a/sidechain/Cargo.toml b/sidechain/Cargo.toml index a31ee72c..b2c58c81 100644 --- a/sidechain/Cargo.toml +++ b/sidechain/Cargo.toml @@ -20,27 +20,27 @@ sidechain-primitives = { path = "../primitives/sidechain", default-features = fa teerex-primitives = { path = "../primitives/teerex", default-features = false } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +pallet-timestamp = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } # benchmarking -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.2", optional = true } -pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +pallet-balances = { default-features = false, optional = true, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } test-utils = { path = "../test-utils", default-features = false, optional = true } [dev-dependencies] env_logger = "0.9.0" -externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +externalities = { package = "sp-externalities", git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +frame-benchmarking = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } hex-literal = "0.3.2" -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-keyring = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } test-utils = { path = "../test-utils" } [features] diff --git a/teeracle/Cargo.toml b/teeracle/Cargo.toml index c3979db2..b8d470d8 100644 --- a/teeracle/Cargo.toml +++ b/teeracle/Cargo.toml @@ -21,27 +21,27 @@ teeracle-primitives = { path = "../primitives/teeracle", default-features = fals substrate-fixed = { tag = "v0.5.9", default-features = false, git = "https://github.com/encointer/substrate-fixed.git" } # substrate -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } # benchmarking -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.2", optional = true } test-utils = { path = "../test-utils", optional = true, default-features = false } -timestamp = { package = "pallet-timestamp", default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +timestamp = { package = "pallet-timestamp", default-features = false, optional = true, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } [dev-dependencies] -externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +externalities = { package = "sp-externalities", git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +frame-benchmarking = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } hex-literal = "0.3.2" -sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +sp-keyring = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } test-utils = { path = "../test-utils" } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +timestamp = { package = "pallet-timestamp", git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } [features] diff --git a/teerex/Cargo.toml b/teerex/Cargo.toml index 37f86534..1695d639 100644 --- a/teerex/Cargo.toml +++ b/teerex/Cargo.toml @@ -19,27 +19,27 @@ ias-verify = { path = "./ias-verify", default-features = false } teerex-primitives = { path = "../primitives/teerex", default-features = false } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -timestamp = { package = "pallet-timestamp", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +timestamp = { package = "pallet-timestamp", default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } # benchmarking -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.2", optional = true } -pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +pallet-balances = { default-features = false, optional = true, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } test-utils = { path = "../test-utils", default-features = false, optional = true } [dev-dependencies] env_logger = "0.9.0" -externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +externalities = { package = "sp-externalities", git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +frame-benchmarking = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } hex-literal = "0.3.2" -pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-keyring = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } test-utils = { path = "../test-utils" } [features] diff --git a/teerex/ias-verify/Cargo.toml b/teerex/ias-verify/Cargo.toml index 3278df58..ed3b433a 100644 --- a/teerex/ias-verify/Cargo.toml +++ b/teerex/ias-verify/Cargo.toml @@ -17,10 +17,10 @@ serde_json = { version = "1.0", default-features = false, features = ["alloc"] } webpki = { default-features = false, git = "https://github.com/scs/webpki-nostd.git" } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } [dev-dependencies] hex-literal = "*" From e4ef0aa973918295540c693bb66aa8fce8d05ab8 Mon Sep 17 00:00:00 2001 From: Chengcheng Shi Date: Fri, 11 Nov 2022 09:58:19 +0800 Subject: [PATCH 05/11] change dps --- Cargo.lock | 74 ++++++++++++++++----------------- claims/Cargo.toml | 18 ++++---- parentchain/Cargo.toml | 16 +++---- primitives/claims/Cargo.toml | 6 +-- primitives/common/Cargo.toml | 2 +- primitives/sidechain/Cargo.toml | 8 ++-- primitives/teeracle/Cargo.toml | 2 +- primitives/teerex/Cargo.toml | 6 +-- sidechain/Cargo.toml | 26 ++++++------ teeracle/Cargo.toml | 26 ++++++------ teerex/Cargo.toml | 26 ++++++------ teerex/ias-verify/Cargo.toml | 8 ++-- 12 files changed, 109 insertions(+), 109 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 52f8beb6..a5dba8f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -660,7 +660,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-support", "frame-system", @@ -695,7 +695,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "bitflags", "frame-metadata", @@ -727,7 +727,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "Inflector", "cfg-expr", @@ -741,7 +741,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -753,7 +753,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "proc-macro2", "quote", @@ -763,7 +763,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-support", "log", @@ -1461,7 +1461,7 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -1597,7 +1597,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -1615,7 +1615,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "frame-benchmarking", "frame-support", @@ -2266,7 +2266,7 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "hash-db", "log", @@ -2284,7 +2284,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "blake2", "proc-macro-crate", @@ -2296,7 +2296,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", "scale-info", @@ -2309,7 +2309,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "integer-sqrt", "num-traits", @@ -2324,7 +2324,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "array-bytes", "base58", @@ -2370,7 +2370,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "blake2", "byteorder", @@ -2384,7 +2384,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "proc-macro2", "quote", @@ -2395,7 +2395,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "proc-macro2", "quote", @@ -2405,7 +2405,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "environmental", "parity-scale-codec", @@ -2416,7 +2416,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -2430,7 +2430,7 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "bytes", "futures", @@ -2456,7 +2456,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "lazy_static", "sp-core", @@ -2467,7 +2467,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "async-trait", "futures", @@ -2483,7 +2483,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "backtrace", "lazy_static", @@ -2493,7 +2493,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "either", "hash256-std-hasher", @@ -2516,7 +2516,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -2534,7 +2534,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "Inflector", "proc-macro-crate", @@ -2546,7 +2546,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", "scale-info", @@ -2557,7 +2557,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "hash-db", "log", @@ -2579,12 +2579,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "impl-serde", "parity-scale-codec", @@ -2597,7 +2597,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "async-trait", "futures-timer", @@ -2613,7 +2613,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", "sp-std", @@ -2625,7 +2625,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "ahash", "hash-db", @@ -2648,7 +2648,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "impl-serde", "parity-scale-codec", @@ -2665,7 +2665,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -2676,7 +2676,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "impl-trait-for-tuples", "log", @@ -2688,7 +2688,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/litentry/litentry-substrate.git?branch=polkadot-v0.9.30#731a606593937437493777661abaa40b099ec866" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", diff --git a/claims/Cargo.toml b/claims/Cargo.toml index 195491b9..af829694 100644 --- a/claims/Cargo.toml +++ b/claims/Cargo.toml @@ -13,12 +13,12 @@ serde = { version = "1.0.13", default-features = false } serde_derive = { version = "1.0.13", optional = true } # substrate dependencies -frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -frame-support = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { package = "sp-std", default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { package = "sp-std", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # local claims-primitives = { package = "claims-primitives", path = "../primitives/claims", default-features = false } @@ -26,10 +26,10 @@ claims-primitives = { package = "claims-primitives", path = "../primitives/claim [dev-dependencies] hex-literal = "0.3.3" libsecp256k1 = "0.7.0" -pallet-balances = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -pallet-vesting = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } serde_json = { version = "1.0" } -sp-core = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/parentchain/Cargo.toml b/parentchain/Cargo.toml index 6cb161ab..95c47ffc 100644 --- a/parentchain/Cargo.toml +++ b/parentchain/Cargo.toml @@ -15,17 +15,17 @@ scale-info = { version = "2.0.1", default-features = false, features = ["derive" serde = { version = "1.0.13", features = ["derive"], optional = true } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, package = "frame-system", git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [dev-dependencies] env_logger = "0.9.0" -sp-keyring = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -pallet-balances = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/primitives/claims/Cargo.toml b/primitives/claims/Cargo.toml index f68ac65f..cd7b005a 100644 --- a/primitives/claims/Cargo.toml +++ b/primitives/claims/Cargo.toml @@ -14,9 +14,9 @@ scale-info = { version = "2.0.1", default-features = false, features = ["derive" serde = { version = "1.0.13", default-features = false } # substrate dependencies -sp-io = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/primitives/common/Cargo.toml b/primitives/common/Cargo.toml index f0e134bd..3584bb24 100644 --- a/primitives/common/Cargo.toml +++ b/primitives/common/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] # substrate deps -sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] default = ["std"] diff --git a/primitives/sidechain/Cargo.toml b/primitives/sidechain/Cargo.toml index b436c2c8..e58e315f 100644 --- a/primitives/sidechain/Cargo.toml +++ b/primitives/sidechain/Cargo.toml @@ -14,10 +14,10 @@ serde = { version = "1.0.13", default-features = false } # substrate dependencies -sp-core = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] diff --git a/primitives/teeracle/Cargo.toml b/primitives/teeracle/Cargo.toml index d27b7df3..1f3f678d 100644 --- a/primitives/teeracle/Cargo.toml +++ b/primitives/teeracle/Cargo.toml @@ -15,7 +15,7 @@ common-primitives = { path = "../common", default-features = false } substrate-fixed = { tag = "v0.5.9", default-features = false, git = "https://github.com/encointer/substrate-fixed.git" } # substrate -sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] diff --git a/primitives/teerex/Cargo.toml b/primitives/teerex/Cargo.toml index 3b834c49..d60ab24b 100644 --- a/primitives/teerex/Cargo.toml +++ b/primitives/teerex/Cargo.toml @@ -16,9 +16,9 @@ serde = { version = "1.0.13", default-features = false } ias-verify = { path = "../../teerex/ias-verify", default-features = false } # substrate dependencies -sp-core = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] diff --git a/sidechain/Cargo.toml b/sidechain/Cargo.toml index b2c58c81..d0c24349 100644 --- a/sidechain/Cargo.toml +++ b/sidechain/Cargo.toml @@ -20,27 +20,27 @@ sidechain-primitives = { path = "../primitives/sidechain", default-features = fa teerex-primitives = { path = "../primitives/teerex", default-features = false } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -pallet-timestamp = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # benchmarking -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.2", optional = true } -pallet-balances = { default-features = false, optional = true, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } test-utils = { path = "../test-utils", default-features = false, optional = true } [dev-dependencies] env_logger = "0.9.0" -externalities = { package = "sp-externalities", git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -frame-benchmarking = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } hex-literal = "0.3.2" -pallet-balances = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-keyring = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } test-utils = { path = "../test-utils" } [features] diff --git a/teeracle/Cargo.toml b/teeracle/Cargo.toml index b8d470d8..974e981c 100644 --- a/teeracle/Cargo.toml +++ b/teeracle/Cargo.toml @@ -21,27 +21,27 @@ teeracle-primitives = { path = "../primitives/teeracle", default-features = fals substrate-fixed = { tag = "v0.5.9", default-features = false, git = "https://github.com/encointer/substrate-fixed.git" } # substrate -frame-support = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # benchmarking -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.2", optional = true } test-utils = { path = "../test-utils", optional = true, default-features = false } -timestamp = { package = "pallet-timestamp", default-features = false, optional = true, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +timestamp = { package = "pallet-timestamp", default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [dev-dependencies] -externalities = { package = "sp-externalities", git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -frame-benchmarking = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } hex-literal = "0.3.2" -sp-keyring = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -pallet-balances = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } test-utils = { path = "../test-utils" } -timestamp = { package = "pallet-timestamp", git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [features] diff --git a/teerex/Cargo.toml b/teerex/Cargo.toml index 1695d639..4ddaad5b 100644 --- a/teerex/Cargo.toml +++ b/teerex/Cargo.toml @@ -19,27 +19,27 @@ ias-verify = { path = "./ias-verify", default-features = false } teerex-primitives = { path = "../primitives/teerex", default-features = false } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -timestamp = { package = "pallet-timestamp", default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +timestamp = { package = "pallet-timestamp", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } # benchmarking -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } hex-literal = { version = "0.3.2", optional = true } -pallet-balances = { default-features = false, optional = true, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } test-utils = { path = "../test-utils", default-features = false, optional = true } [dev-dependencies] env_logger = "0.9.0" -externalities = { package = "sp-externalities", git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -frame-benchmarking = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } hex-literal = "0.3.2" -pallet-balances = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-keyring = { git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } test-utils = { path = "../test-utils" } [features] diff --git a/teerex/ias-verify/Cargo.toml b/teerex/ias-verify/Cargo.toml index ed3b433a..8fc24607 100644 --- a/teerex/ias-verify/Cargo.toml +++ b/teerex/ias-verify/Cargo.toml @@ -17,10 +17,10 @@ serde_json = { version = "1.0", default-features = false, features = ["alloc"] } webpki = { default-features = false, git = "https://github.com/scs/webpki-nostd.git" } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/litentry/litentry-substrate.git", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } [dev-dependencies] hex-literal = "*" From 3b63c7315e2243f6f1f653f940d90894ba6e8b72 Mon Sep 17 00:00:00 2001 From: Chengcheng Shi Date: Mon, 14 Nov 2022 10:43:22 +0800 Subject: [PATCH 06/11] update to v0.9.31 --- Cargo.lock | 94 ++++++++++++++++----------------- claims/Cargo.toml | 18 +++---- parentchain/Cargo.toml | 16 +++--- primitives/claims/Cargo.toml | 6 +-- primitives/common/Cargo.toml | 2 +- primitives/sidechain/Cargo.toml | 8 +-- primitives/teeracle/Cargo.toml | 2 +- primitives/teerex/Cargo.toml | 6 +-- sidechain/Cargo.toml | 26 ++++----- teeracle/Cargo.toml | 26 ++++----- teerex/Cargo.toml | 26 ++++----- teerex/ias-verify/Cargo.toml | 8 +-- 12 files changed, 119 insertions(+), 119 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a5dba8f4..098a9310 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -647,9 +647,9 @@ dependencies = [ [[package]] name = "fixed-hash" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" +checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", "rand 0.8.5", @@ -660,7 +660,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "frame-support", "frame-system", @@ -695,7 +695,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "bitflags", "frame-metadata", @@ -727,7 +727,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "Inflector", "cfg-expr", @@ -741,7 +741,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -753,7 +753,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "proc-macro2", "quote", @@ -763,7 +763,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "frame-support", "log", @@ -1080,9 +1080,9 @@ dependencies = [ [[package]] name = "impl-serde" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c" +checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd" dependencies = [ "serde", ] @@ -1288,9 +1288,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memory-db" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a" +checksum = "34ac11bb793c28fa095b7554466f53b3a60a2cd002afdac01bcf135cbd73a269" dependencies = [ "hash-db", "hashbrown", @@ -1461,7 +1461,7 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "frame-benchmarking", "frame-support", @@ -1597,7 +1597,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "frame-benchmarking", "frame-support", @@ -1615,7 +1615,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "frame-benchmarking", "frame-support", @@ -1656,9 +1656,9 @@ dependencies = [ [[package]] name = "parity-util-mem" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" +checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8" dependencies = [ "cfg-if", "hashbrown", @@ -1764,9 +1764,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "primitive-types" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" +checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" dependencies = [ "fixed-hash", "impl-codec", @@ -2266,7 +2266,7 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "hash-db", "log", @@ -2284,7 +2284,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "blake2", "proc-macro-crate", @@ -2296,7 +2296,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "parity-scale-codec", "scale-info", @@ -2309,7 +2309,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "integer-sqrt", "num-traits", @@ -2324,7 +2324,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "array-bytes", "base58", @@ -2370,7 +2370,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "blake2", "byteorder", @@ -2384,7 +2384,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "proc-macro2", "quote", @@ -2395,7 +2395,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "proc-macro2", "quote", @@ -2405,7 +2405,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "environmental", "parity-scale-codec", @@ -2416,7 +2416,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -2430,7 +2430,7 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "bytes", "futures", @@ -2456,7 +2456,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "lazy_static", "sp-core", @@ -2467,7 +2467,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "async-trait", "futures", @@ -2483,7 +2483,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "backtrace", "lazy_static", @@ -2493,7 +2493,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "either", "hash256-std-hasher", @@ -2516,7 +2516,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -2534,7 +2534,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "Inflector", "proc-macro-crate", @@ -2546,7 +2546,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "parity-scale-codec", "scale-info", @@ -2557,7 +2557,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "hash-db", "log", @@ -2579,12 +2579,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "impl-serde", "parity-scale-codec", @@ -2597,7 +2597,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "async-trait", "futures-timer", @@ -2613,7 +2613,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "parity-scale-codec", "sp-std", @@ -2625,7 +2625,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "ahash", "hash-db", @@ -2648,7 +2648,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "impl-serde", "parity-scale-codec", @@ -2665,7 +2665,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -2676,7 +2676,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "impl-trait-for-tuples", "log", @@ -2688,7 +2688,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.30#a3ed0119c45cdd0d571ad34e5b3ee7518c8cef8d" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", diff --git a/claims/Cargo.toml b/claims/Cargo.toml index af829694..7ec35388 100644 --- a/claims/Cargo.toml +++ b/claims/Cargo.toml @@ -13,12 +13,12 @@ serde = { version = "1.0.13", default-features = false } serde_derive = { version = "1.0.13", optional = true } # substrate dependencies -frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-std = { package = "sp-std", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-std = { package = "sp-std", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } # local claims-primitives = { package = "claims-primitives", path = "../primitives/claims", default-features = false } @@ -26,10 +26,10 @@ claims-primitives = { package = "claims-primitives", path = "../primitives/claim [dev-dependencies] hex-literal = "0.3.3" libsecp256k1 = "0.7.0" -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } serde_json = { version = "1.0" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } [features] default = ["std"] diff --git a/parentchain/Cargo.toml b/parentchain/Cargo.toml index 95c47ffc..74159502 100644 --- a/parentchain/Cargo.toml +++ b/parentchain/Cargo.toml @@ -15,17 +15,17 @@ scale-info = { version = "2.0.1", default-features = false, features = ["derive" serde = { version = "1.0.13", features = ["derive"], optional = true } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +frame-system = { default-features = false, package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } [dev-dependencies] env_logger = "0.9.0" -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } [features] default = ["std"] diff --git a/primitives/claims/Cargo.toml b/primitives/claims/Cargo.toml index cd7b005a..b3a48241 100644 --- a/primitives/claims/Cargo.toml +++ b/primitives/claims/Cargo.toml @@ -14,9 +14,9 @@ scale-info = { version = "2.0.1", default-features = false, features = ["derive" serde = { version = "1.0.13", default-features = false } # substrate dependencies -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } [features] default = ["std"] diff --git a/primitives/common/Cargo.toml b/primitives/common/Cargo.toml index 3584bb24..3f6f4174 100644 --- a/primitives/common/Cargo.toml +++ b/primitives/common/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] # substrate deps -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } [features] default = ["std"] diff --git a/primitives/sidechain/Cargo.toml b/primitives/sidechain/Cargo.toml index e58e315f..b1d6d27f 100644 --- a/primitives/sidechain/Cargo.toml +++ b/primitives/sidechain/Cargo.toml @@ -14,10 +14,10 @@ serde = { version = "1.0.13", default-features = false } # substrate dependencies -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } [features] diff --git a/primitives/teeracle/Cargo.toml b/primitives/teeracle/Cargo.toml index 1f3f678d..07b797d2 100644 --- a/primitives/teeracle/Cargo.toml +++ b/primitives/teeracle/Cargo.toml @@ -15,7 +15,7 @@ common-primitives = { path = "../common", default-features = false } substrate-fixed = { tag = "v0.5.9", default-features = false, git = "https://github.com/encointer/substrate-fixed.git" } # substrate -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } [features] diff --git a/primitives/teerex/Cargo.toml b/primitives/teerex/Cargo.toml index d60ab24b..6c35bd45 100644 --- a/primitives/teerex/Cargo.toml +++ b/primitives/teerex/Cargo.toml @@ -16,9 +16,9 @@ serde = { version = "1.0.13", default-features = false } ias-verify = { path = "../../teerex/ias-verify", default-features = false } # substrate dependencies -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } [features] diff --git a/sidechain/Cargo.toml b/sidechain/Cargo.toml index d0c24349..b1a9ac39 100644 --- a/sidechain/Cargo.toml +++ b/sidechain/Cargo.toml @@ -20,27 +20,27 @@ sidechain-primitives = { path = "../primitives/sidechain", default-features = fa teerex-primitives = { path = "../primitives/teerex", default-features = false } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } # benchmarking -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } hex-literal = { version = "0.3.2", optional = true } -pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } test-utils = { path = "../test-utils", default-features = false, optional = true } [dev-dependencies] env_logger = "0.9.0" -externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } hex-literal = "0.3.2" -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } test-utils = { path = "../test-utils" } [features] diff --git a/teeracle/Cargo.toml b/teeracle/Cargo.toml index 974e981c..e9931a66 100644 --- a/teeracle/Cargo.toml +++ b/teeracle/Cargo.toml @@ -21,27 +21,27 @@ teeracle-primitives = { path = "../primitives/teeracle", default-features = fals substrate-fixed = { tag = "v0.5.9", default-features = false, git = "https://github.com/encointer/substrate-fixed.git" } # substrate -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } # benchmarking -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } hex-literal = { version = "0.3.2", optional = true } test-utils = { path = "../test-utils", optional = true, default-features = false } -timestamp = { package = "pallet-timestamp", default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +timestamp = { package = "pallet-timestamp", default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } [dev-dependencies] -externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } hex-literal = "0.3.2" -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } test-utils = { path = "../test-utils" } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } [features] diff --git a/teerex/Cargo.toml b/teerex/Cargo.toml index 4ddaad5b..3cffbd50 100644 --- a/teerex/Cargo.toml +++ b/teerex/Cargo.toml @@ -19,27 +19,27 @@ ias-verify = { path = "./ias-verify", default-features = false } teerex-primitives = { path = "../primitives/teerex", default-features = false } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -timestamp = { package = "pallet-timestamp", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +timestamp = { package = "pallet-timestamp", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } # benchmarking -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } hex-literal = { version = "0.3.2", optional = true } -pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } test-utils = { path = "../test-utils", default-features = false, optional = true } [dev-dependencies] env_logger = "0.9.0" -externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } hex-literal = "0.3.2" -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } test-utils = { path = "../test-utils" } [features] diff --git a/teerex/ias-verify/Cargo.toml b/teerex/ias-verify/Cargo.toml index 8fc24607..f25181a1 100644 --- a/teerex/ias-verify/Cargo.toml +++ b/teerex/ias-verify/Cargo.toml @@ -17,10 +17,10 @@ serde_json = { version = "1.0", default-features = false, features = ["alloc"] } webpki = { default-features = false, git = "https://github.com/scs/webpki-nostd.git" } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } [dev-dependencies] hex-literal = "*" From 75e592f35176defcb08678c3cfc4733bb1551ae6 Mon Sep 17 00:00:00 2001 From: Chengcheng Shi Date: Tue, 15 Nov 2022 17:45:15 +0800 Subject: [PATCH 07/11] fix claims test code --- claims/src/lib.rs | 58 +++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/claims/src/lib.rs b/claims/src/lib.rs index 63477aca..ab02ae53 100644 --- a/claims/src/lib.rs +++ b/claims/src/lib.rs @@ -811,7 +811,7 @@ mod tests { new_test_ext().execute_with(|| { assert_eq!(Balances::free_balance(42), 0); assert_ok!(Claims::claim( - Origin::none(), + RuntimeOrigin::none(), 42, sig::(&alice(), &42u64.encode(), &[][..]) )); @@ -836,11 +836,11 @@ mod tests { None )); assert_noop!( - Claims::claim(Origin::none(), 42, sig::(&alice(), &42u64.encode(), &[][..])), + Claims::claim(RuntimeOrigin::none(), 42, sig::(&alice(), &42u64.encode(), &[][..])), Error::::SignerHasNoClaim ); assert_ok!(Claims::claim( - Origin::none(), + RuntimeOrigin::none(), 42, sig::(&bob(), &42u64.encode(), &[][..]) )); @@ -861,7 +861,7 @@ mod tests { )); let s = sig::(&bob(), &42u64.encode(), StatementKind::Regular.to_text()); assert_ok!(Claims::claim_attest( - Origin::none(), + RuntimeOrigin::none(), 42, s, StatementKind::Regular.to_text().to_vec() @@ -891,20 +891,20 @@ mod tests { fn claiming_does_not_bypass_signing() { new_test_ext().execute_with(|| { assert_ok!(Claims::claim( - Origin::none(), + RuntimeOrigin::none(), 42, sig::(&alice(), &42u64.encode(), &[][..]) )); assert_noop!( - Claims::claim(Origin::none(), 42, sig::(&dave(), &42u64.encode(), &[][..])), + Claims::claim(RuntimeOrigin::none(), 42, sig::(&dave(), &42u64.encode(), &[][..])), Error::::InvalidStatement, ); assert_noop!( - Claims::claim(Origin::none(), 42, sig::(&eve(), &42u64.encode(), &[][..])), + Claims::claim(RuntimeOrigin::none(), 42, sig::(&eve(), &42u64.encode(), &[][..])), Error::::InvalidStatement, ); assert_ok!(Claims::claim( - Origin::none(), + RuntimeOrigin::none(), 42, sig::(&frank(), &42u64.encode(), &[][..]) )); @@ -917,7 +917,7 @@ mod tests { assert_eq!(Balances::free_balance(42), 0); let s = sig::(&dave(), &42u64.encode(), StatementKind::Saft.to_text()); let r = Claims::claim_attest( - Origin::none(), + RuntimeOrigin::none(), 42, s.clone(), StatementKind::Saft.to_text().to_vec(), @@ -925,7 +925,7 @@ mod tests { assert_noop!(r, Error::::InvalidStatement); let r = Claims::claim_attest( - Origin::none(), + RuntimeOrigin::none(), 42, s, StatementKind::Regular.to_text().to_vec(), @@ -936,7 +936,7 @@ mod tests { let s = sig::(&dave(), &42u64.encode(), StatementKind::Regular.to_text()); assert_ok!(Claims::claim_attest( - Origin::none(), + RuntimeOrigin::none(), 42, s, StatementKind::Regular.to_text().to_vec() @@ -946,7 +946,7 @@ mod tests { let s = sig::(&dave(), &42u64.encode(), StatementKind::Regular.to_text()); let r = Claims::claim_attest( - Origin::none(), + RuntimeOrigin::none(), 42, s, StatementKind::Regular.to_text().to_vec(), @@ -985,7 +985,7 @@ mod tests { assert_eq!(Balances::free_balance(42), 0); // Alice's claim is 100 assert_ok!(Claims::claim( - Origin::none(), + RuntimeOrigin::none(), 42, sig::(&alice(), &42u64.encode(), &[][..]) )); @@ -1004,7 +1004,7 @@ mod tests { fn valid_attest_transactions_are_free() { new_test_ext().execute_with(|| { let p = PrevalidateAttests::::new(); - let c = Call::Claims(ClaimsCall::attest { + let c = RuntimeCall::Claims(ClaimsCall::attest { statement: StatementKind::Saft.to_text().to_vec(), }); let di = c.get_dispatch_info(); @@ -1018,13 +1018,13 @@ mod tests { fn invalid_attest_transactions_are_recognized() { new_test_ext().execute_with(|| { let p = PrevalidateAttests::::new(); - let c = Call::Claims(ClaimsCall::attest { + let c = RuntimeCall::Claims(ClaimsCall::attest { statement: StatementKind::Regular.to_text().to_vec(), }); let di = c.get_dispatch_info(); let r = p.validate(&42, &c, &di, 20); assert!(r.is_err()); - let c = Call::Claims(ClaimsCall::attest { + let c = RuntimeCall::Claims(ClaimsCall::attest { statement: StatementKind::Saft.to_text().to_vec(), }); let di = c.get_dispatch_info(); @@ -1038,7 +1038,7 @@ mod tests { new_test_ext().execute_with(|| { assert_eq!(Balances::free_balance(42), 0); let s = sig::(&dave(), &42u64.encode(), &[]); - let r = Claims::claim(Origin::none(), 42, s); + let r = Claims::claim(RuntimeOrigin::none(), 42, s); assert_noop!(r, Error::::InvalidStatement); }); } @@ -1052,13 +1052,13 @@ mod tests { ); assert_eq!(Balances::free_balance(42), 0); assert_noop!( - Claims::claim(Origin::none(), 69, sig::(&bob(), &69u64.encode(), &[][..])), + Claims::claim(RuntimeOrigin::none(), 69, sig::(&bob(), &69u64.encode(), &[][..])), Error::::SignerHasNoClaim, ); assert_ok!(Claims::mint_claim(RuntimeOrigin::root(), eth(&bob()), 200, None, None)); assert_eq!(Claims::total(), total_claims() + 200); assert_ok!(Claims::claim( - Origin::none(), + RuntimeOrigin::none(), 69, sig::(&bob(), &69u64.encode(), &[][..]) )); @@ -1083,7 +1083,7 @@ mod tests { ); assert_eq!(Balances::free_balance(42), 0); assert_noop!( - Claims::claim(Origin::none(), 69, sig::(&bob(), &69u64.encode(), &[][..])), + Claims::claim(RuntimeOrigin::none(), 69, sig::(&bob(), &69u64.encode(), &[][..])), Error::::SignerHasNoClaim, ); assert_ok!(Claims::mint_claim( @@ -1094,7 +1094,7 @@ mod tests { None )); assert_ok!(Claims::claim( - Origin::none(), + RuntimeOrigin::none(), 69, sig::(&bob(), &69u64.encode(), &[][..]) )); @@ -1131,7 +1131,7 @@ mod tests { let signature = sig::(&bob(), &69u64.encode(), StatementKind::Regular.to_text()); assert_noop!( Claims::claim_attest( - Origin::none(), + RuntimeOrigin::none(), 69, signature.clone(), StatementKind::Regular.to_text().to_vec() @@ -1146,11 +1146,11 @@ mod tests { Some(StatementKind::Regular) )); assert_noop!( - Claims::claim_attest(Origin::none(), 69, signature.clone(), vec![],), + Claims::claim_attest(RuntimeOrigin::none(), 69, signature.clone(), vec![],), Error::::SignerHasNoClaim ); assert_ok!(Claims::claim_attest( - Origin::none(), + RuntimeOrigin::none(), 69, signature, StatementKind::Regular.to_text().to_vec() @@ -1179,12 +1179,12 @@ mod tests { new_test_ext().execute_with(|| { assert_eq!(Balances::free_balance(42), 0); assert_ok!(Claims::claim( - Origin::none(), + RuntimeOrigin::none(), 42, sig::(&alice(), &42u64.encode(), &[][..]) )); assert_noop!( - Claims::claim(Origin::none(), 42, sig::(&alice(), &42u64.encode(), &[][..])), + Claims::claim(RuntimeOrigin::none(), 42, sig::(&alice(), &42u64.encode(), &[][..])), Error::::SignerHasNoClaim ); }); @@ -1214,7 +1214,7 @@ mod tests { // They should not be able to claim assert_noop!( - Claims::claim(Origin::none(), 69, sig::(&bob(), &69u64.encode(), &[][..])), + Claims::claim(RuntimeOrigin::none(), 69, sig::(&bob(), &69u64.encode(), &[][..])), Error::::VestedBalanceExists, ); }); @@ -1225,7 +1225,7 @@ mod tests { new_test_ext().execute_with(|| { assert_eq!(Balances::free_balance(42), 0); assert_noop!( - Claims::claim(Origin::none(), 42, sig::(&alice(), &69u64.encode(), &[][..])), + Claims::claim(RuntimeOrigin::none(), 42, sig::(&alice(), &69u64.encode(), &[][..])), Error::::SignerHasNoClaim ); }); @@ -1236,7 +1236,7 @@ mod tests { new_test_ext().execute_with(|| { assert_eq!(Balances::free_balance(42), 0); assert_noop!( - Claims::claim(Origin::none(), 42, sig::(&bob(), &69u64.encode(), &[][..])), + Claims::claim(RuntimeOrigin::none(), 42, sig::(&bob(), &69u64.encode(), &[][..])), Error::::SignerHasNoClaim ); }); From b6372ac758dbf5cdc1099a3abcb263aa561bafab Mon Sep 17 00:00:00 2001 From: Chengcheng Shi Date: Wed, 16 Nov 2022 11:08:30 +0800 Subject: [PATCH 08/11] fix some sytanx --- claims/src/lib.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/claims/src/lib.rs b/claims/src/lib.rs index ab02ae53..dbce1d86 100644 --- a/claims/src/lib.rs +++ b/claims/src/lib.rs @@ -639,11 +639,12 @@ mod tests { // or public keys. `u64` is used as the `AccountId` and no `Signature`s are required. use super::Call as ClaimsCall; use frame_support::{ + dispatch::*, assert_err, assert_noop, assert_ok, dispatch::DispatchError::BadOrigin, ord_parameter_types, parameter_types, - traits::{ExistenceRequirement, GenesisBuild}, - weights::{GetDispatchInfo, Pays}, + traits::{ExistenceRequirement, GenesisBuild,WithdrawReasons}, + pallet_prelude::*, }; use sp_runtime::{ @@ -716,6 +717,8 @@ mod tests { parameter_types! { pub const MinVestedTransfer: u64 = 1; + pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons = + WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE); } impl pallet_vesting::Config for Test { @@ -725,6 +728,7 @@ mod tests { type MinVestedTransfer = MinVestedTransfer; type WeightInfo = (); const MAX_VESTING_SCHEDULES: u32 = 28; + type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons; } parameter_types! { From e4cb76648a65a4438de286ee78201b9345d68649 Mon Sep 17 00:00:00 2001 From: Chengcheng Shi Date: Wed, 16 Nov 2022 11:26:49 +0800 Subject: [PATCH 09/11] update to polkadot-v0.9.32 --- Cargo.lock | 74 ++++++++++++++++----------------- claims/Cargo.toml | 18 ++++---- claims/src/lib.rs | 1 - parentchain/Cargo.toml | 16 +++---- primitives/claims/Cargo.toml | 6 +-- primitives/common/Cargo.toml | 2 +- primitives/sidechain/Cargo.toml | 8 ++-- primitives/teeracle/Cargo.toml | 2 +- primitives/teerex/Cargo.toml | 6 +-- sidechain/Cargo.toml | 26 ++++++------ teeracle/Cargo.toml | 26 ++++++------ teerex/Cargo.toml | 26 ++++++------ teerex/ias-verify/Cargo.toml | 8 ++-- 13 files changed, 109 insertions(+), 110 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 098a9310..8e4349cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -660,7 +660,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support", "frame-system", @@ -695,7 +695,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "bitflags", "frame-metadata", @@ -727,7 +727,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "Inflector", "cfg-expr", @@ -741,7 +741,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -753,7 +753,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "proc-macro2", "quote", @@ -763,7 +763,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support", "log", @@ -1461,7 +1461,7 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -1597,7 +1597,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -1615,7 +1615,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -2266,7 +2266,7 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "hash-db", "log", @@ -2284,7 +2284,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "blake2", "proc-macro-crate", @@ -2296,7 +2296,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "scale-info", @@ -2309,7 +2309,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "integer-sqrt", "num-traits", @@ -2324,7 +2324,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "array-bytes", "base58", @@ -2370,7 +2370,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "blake2", "byteorder", @@ -2384,7 +2384,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "proc-macro2", "quote", @@ -2395,7 +2395,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "proc-macro2", "quote", @@ -2405,7 +2405,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "environmental", "parity-scale-codec", @@ -2416,7 +2416,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -2430,7 +2430,7 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "bytes", "futures", @@ -2456,7 +2456,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "lazy_static", "sp-core", @@ -2467,7 +2467,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "futures", @@ -2483,7 +2483,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "backtrace", "lazy_static", @@ -2493,7 +2493,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "either", "hash256-std-hasher", @@ -2516,7 +2516,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -2534,7 +2534,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "Inflector", "proc-macro-crate", @@ -2546,7 +2546,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "scale-info", @@ -2557,7 +2557,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "hash-db", "log", @@ -2579,12 +2579,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "impl-serde", "parity-scale-codec", @@ -2597,7 +2597,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "futures-timer", @@ -2613,7 +2613,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "sp-std", @@ -2625,7 +2625,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "ahash", "hash-db", @@ -2648,7 +2648,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "impl-serde", "parity-scale-codec", @@ -2665,7 +2665,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -2676,7 +2676,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "impl-trait-for-tuples", "log", @@ -2688,7 +2688,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.31#7a4e5163091384c4c10b6d76f5cb80dac0834f38" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", diff --git a/claims/Cargo.toml b/claims/Cargo.toml index 7ec35388..d7b585ee 100644 --- a/claims/Cargo.toml +++ b/claims/Cargo.toml @@ -13,12 +13,12 @@ serde = { version = "1.0.13", default-features = false } serde_derive = { version = "1.0.13", optional = true } # substrate dependencies -frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-std = { package = "sp-std", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +frame-benchmarking = { optional = true, default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-std = { package = "sp-std", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } # local claims-primitives = { package = "claims-primitives", path = "../primitives/claims", default-features = false } @@ -26,10 +26,10 @@ claims-primitives = { package = "claims-primitives", path = "../primitives/claim [dev-dependencies] hex-literal = "0.3.3" libsecp256k1 = "0.7.0" -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } serde_json = { version = "1.0" } -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } [features] default = ["std"] diff --git a/claims/src/lib.rs b/claims/src/lib.rs index dbce1d86..b49dd45e 100644 --- a/claims/src/lib.rs +++ b/claims/src/lib.rs @@ -644,7 +644,6 @@ mod tests { dispatch::DispatchError::BadOrigin, ord_parameter_types, parameter_types, traits::{ExistenceRequirement, GenesisBuild,WithdrawReasons}, - pallet_prelude::*, }; use sp_runtime::{ diff --git a/parentchain/Cargo.toml b/parentchain/Cargo.toml index 74159502..36880345 100644 --- a/parentchain/Cargo.toml +++ b/parentchain/Cargo.toml @@ -15,17 +15,17 @@ scale-info = { version = "2.0.1", default-features = false, features = ["derive" serde = { version = "1.0.13", features = ["derive"], optional = true } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -frame-system = { default-features = false, package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +frame-system = { default-features = false, package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } [dev-dependencies] env_logger = "0.9.0" -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } [features] default = ["std"] diff --git a/primitives/claims/Cargo.toml b/primitives/claims/Cargo.toml index b3a48241..b2afe8ae 100644 --- a/primitives/claims/Cargo.toml +++ b/primitives/claims/Cargo.toml @@ -14,9 +14,9 @@ scale-info = { version = "2.0.1", default-features = false, features = ["derive" serde = { version = "1.0.13", default-features = false } # substrate dependencies -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } [features] default = ["std"] diff --git a/primitives/common/Cargo.toml b/primitives/common/Cargo.toml index 3f6f4174..b4db4563 100644 --- a/primitives/common/Cargo.toml +++ b/primitives/common/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] # substrate deps -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } [features] default = ["std"] diff --git a/primitives/sidechain/Cargo.toml b/primitives/sidechain/Cargo.toml index b1d6d27f..1f86dbfa 100644 --- a/primitives/sidechain/Cargo.toml +++ b/primitives/sidechain/Cargo.toml @@ -14,10 +14,10 @@ serde = { version = "1.0.13", default-features = false } # substrate dependencies -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } [features] diff --git a/primitives/teeracle/Cargo.toml b/primitives/teeracle/Cargo.toml index 07b797d2..67dfbcf6 100644 --- a/primitives/teeracle/Cargo.toml +++ b/primitives/teeracle/Cargo.toml @@ -15,7 +15,7 @@ common-primitives = { path = "../common", default-features = false } substrate-fixed = { tag = "v0.5.9", default-features = false, git = "https://github.com/encointer/substrate-fixed.git" } # substrate -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } [features] diff --git a/primitives/teerex/Cargo.toml b/primitives/teerex/Cargo.toml index 6c35bd45..f8705720 100644 --- a/primitives/teerex/Cargo.toml +++ b/primitives/teerex/Cargo.toml @@ -16,9 +16,9 @@ serde = { version = "1.0.13", default-features = false } ias-verify = { path = "../../teerex/ias-verify", default-features = false } # substrate dependencies -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } [features] diff --git a/sidechain/Cargo.toml b/sidechain/Cargo.toml index b1a9ac39..1a5a7c01 100644 --- a/sidechain/Cargo.toml +++ b/sidechain/Cargo.toml @@ -20,27 +20,27 @@ sidechain-primitives = { path = "../primitives/sidechain", default-features = fa teerex-primitives = { path = "../primitives/teerex", default-features = false } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } # benchmarking -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } hex-literal = { version = "0.3.2", optional = true } -pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } test-utils = { path = "../test-utils", default-features = false, optional = true } [dev-dependencies] env_logger = "0.9.0" -externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } hex-literal = "0.3.2" -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } test-utils = { path = "../test-utils" } [features] diff --git a/teeracle/Cargo.toml b/teeracle/Cargo.toml index e9931a66..7c9017d5 100644 --- a/teeracle/Cargo.toml +++ b/teeracle/Cargo.toml @@ -21,27 +21,27 @@ teeracle-primitives = { path = "../primitives/teeracle", default-features = fals substrate-fixed = { tag = "v0.5.9", default-features = false, git = "https://github.com/encointer/substrate-fixed.git" } # substrate -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } # benchmarking -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } hex-literal = { version = "0.3.2", optional = true } test-utils = { path = "../test-utils", optional = true, default-features = false } -timestamp = { package = "pallet-timestamp", default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +timestamp = { package = "pallet-timestamp", default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } [dev-dependencies] -externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } hex-literal = "0.3.2" -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } test-utils = { path = "../test-utils" } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } [features] diff --git a/teerex/Cargo.toml b/teerex/Cargo.toml index 3cffbd50..3c673135 100644 --- a/teerex/Cargo.toml +++ b/teerex/Cargo.toml @@ -19,27 +19,27 @@ ias-verify = { path = "./ias-verify", default-features = false } teerex-primitives = { path = "../primitives/teerex", default-features = false } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -timestamp = { package = "pallet-timestamp", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +timestamp = { package = "pallet-timestamp", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } # benchmarking -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } hex-literal = { version = "0.3.2", optional = true } -pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } test-utils = { path = "../test-utils", default-features = false, optional = true } [dev-dependencies] env_logger = "0.9.0" -externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } hex-literal = "0.3.2" -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } test-utils = { path = "../test-utils" } [features] diff --git a/teerex/ias-verify/Cargo.toml b/teerex/ias-verify/Cargo.toml index f25181a1..f504ba6c 100644 --- a/teerex/ias-verify/Cargo.toml +++ b/teerex/ias-verify/Cargo.toml @@ -17,10 +17,10 @@ serde_json = { version = "1.0", default-features = false, features = ["alloc"] } webpki = { default-features = false, git = "https://github.com/scs/webpki-nostd.git" } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.31" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } [dev-dependencies] hex-literal = "*" From 76de6c261d7df38cfa9b706d52a1bd207c741d4c Mon Sep 17 00:00:00 2001 From: BillyWooo Date: Wed, 7 Dec 2022 12:20:49 +0100 Subject: [PATCH 10/11] update upstream master on ed263bc4 --- .github/workflows/ci.yml | 4 +- claims/Cargo.toml | 2 +- claims/src/lib.rs | 85 ++++++++++----- parentchain/Cargo.toml | 16 +-- primitives/common/Cargo.toml | 2 +- primitives/sidechain/Cargo.toml | 8 +- primitives/teeracle/Cargo.toml | 2 +- primitives/teeracle/src/lib.rs | 4 + primitives/teerex/Cargo.toml | 6 +- rust-toolchain.toml | 2 +- sidechain/Cargo.toml | 26 ++--- sidechain/src/benchmarking.rs | 5 +- sidechain/src/lib.rs | 93 +++++------------ sidechain/src/mock.rs | 4 - sidechain/src/tests.rs | 153 ++++++++++++++------------- teeracle/Cargo.toml | 26 ++--- teeracle/src/benchmarking.rs | 45 ++++++-- teeracle/src/lib.rs | 81 ++++++++++++--- teeracle/src/mock.rs | 16 +-- teeracle/src/tests.rs | 178 ++++++++++++++++++++++---------- teeracle/src/weights.rs | 7 ++ teerex/Cargo.toml | 26 ++--- teerex/ias-verify/Cargo.toml | 8 +- teerex/ias-verify/src/lib.rs | 2 +- teerex/src/lib.rs | 8 +- 25 files changed, 482 insertions(+), 327 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 627a80f7..9ce68b66 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,7 +64,9 @@ jobs: version: "0.5" - name: Run license check - run: cargo about generate about.hbs > license.html + # Explicitly use stable because otherwise cargo will trigger a download of + # the nightly version specified in rust-toolchain.toml + run: cargo +stable about generate about.hbs > license.html - name: Archive license file uses: actions/upload-artifact@v3 diff --git a/claims/Cargo.toml b/claims/Cargo.toml index d7b585ee..93d2e19d 100644 --- a/claims/Cargo.toml +++ b/claims/Cargo.toml @@ -27,7 +27,7 @@ claims-primitives = { package = "claims-primitives", path = "../primitives/claim hex-literal = "0.3.3" libsecp256k1 = "0.7.0" pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +pallet-vesting = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } serde_json = { version = "1.0" } sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } diff --git a/claims/src/lib.rs b/claims/src/lib.rs index b49dd45e..7f4696b5 100644 --- a/claims/src/lib.rs +++ b/claims/src/lib.rs @@ -230,7 +230,7 @@ pub mod pallet { let data = dest.using_encoded(to_ascii_hex); let signer = Self::eth_recover(ðereum_signature, &data, &[][..]) .ok_or(Error::::InvalidEthereumSignature)?; - ensure!(Signing::::get(&signer).is_none(), Error::::InvalidStatement); + ensure!(Signing::::get(signer).is_none(), Error::::InvalidStatement); Self::process_claim(signer, dest)?; Ok(()) @@ -359,16 +359,16 @@ pub mod pallet { ) -> DispatchResultWithPostInfo { T::MoveClaimOrigin::try_origin(origin).map(|_| ()).or_else(ensure_root)?; - if let Some(c) = Claims::::take(&old) { - Claims::::insert(&new, c); + if let Some(c) = Claims::::take(old) { + Claims::::insert(new, c); } - if let Some(c) = Vesting::::take(&old) { - Vesting::::insert(&new, c) + if let Some(c) = Vesting::::take(old) { + Vesting::::insert(new, c) } - if let Some(c) = Signing::::take(&old) { - Signing::::insert(&new, c) + if let Some(c) = Signing::::take(old) { + Signing::::insert(new, c) } if let Some(preclaim) = maybe_preclaim { @@ -415,7 +415,7 @@ pub mod pallet { })?; let e = InvalidTransaction::Custom(ValidityError::SignerHasNoClaim.into()); - ensure!(>::contains_key(&signer), e); + ensure!(>::contains_key(signer), e); let e = InvalidTransaction::Custom(ValidityError::InvalidStatement.into()); match Signing::::get(signer) { @@ -474,11 +474,11 @@ impl Pallet { } fn process_claim(signer: EthereumAddress, dest: T::AccountId) -> sp_runtime::DispatchResult { - let balance_due = >::get(&signer).ok_or(Error::::SignerHasNoClaim)?; + let balance_due = >::get(signer).ok_or(Error::::SignerHasNoClaim)?; let new_total = Self::total().checked_sub(&balance_due).ok_or(Error::::PotUnderflow)?; - let vesting = Vesting::::get(&signer); + let vesting = Vesting::::get(signer); if vesting.is_some() && T::VestingSchedule::vesting_balance(&dest).is_some() { return Err(Error::::VestedBalanceExists.into()) } @@ -495,9 +495,9 @@ impl Pallet { } >::put(new_total); - >::remove(&signer); - >::remove(&signer); - Signing::::remove(&signer); + >::remove(signer); + >::remove(signer); + Signing::::remove(signer); // Let's deposit an event to let the outside world know this happened. Self::deposit_event(Event::::Claimed(dest, signer, balance_due)); @@ -639,11 +639,10 @@ mod tests { // or public keys. `u64` is used as the `AccountId` and no `Signature`s are required. use super::Call as ClaimsCall; use frame_support::{ - dispatch::*, assert_err, assert_noop, assert_ok, - dispatch::DispatchError::BadOrigin, + dispatch::{DispatchError::BadOrigin, GetDispatchInfo, Pays}, ord_parameter_types, parameter_types, - traits::{ExistenceRequirement, GenesisBuild,WithdrawReasons}, + traits::{ExistenceRequirement, GenesisBuild, WithdrawReasons}, }; use sp_runtime::{ @@ -839,7 +838,11 @@ mod tests { None )); assert_noop!( - Claims::claim(RuntimeOrigin::none(), 42, sig::(&alice(), &42u64.encode(), &[][..])), + Claims::claim( + RuntimeOrigin::none(), + 42, + sig::(&alice(), &42u64.encode(), &[][..]) + ), Error::::SignerHasNoClaim ); assert_ok!(Claims::claim( @@ -899,11 +902,19 @@ mod tests { sig::(&alice(), &42u64.encode(), &[][..]) )); assert_noop!( - Claims::claim(RuntimeOrigin::none(), 42, sig::(&dave(), &42u64.encode(), &[][..])), + Claims::claim( + RuntimeOrigin::none(), + 42, + sig::(&dave(), &42u64.encode(), &[][..]) + ), Error::::InvalidStatement, ); assert_noop!( - Claims::claim(RuntimeOrigin::none(), 42, sig::(&eve(), &42u64.encode(), &[][..])), + Claims::claim( + RuntimeOrigin::none(), + 42, + sig::(&eve(), &42u64.encode(), &[][..]) + ), Error::::InvalidStatement, ); assert_ok!(Claims::claim( @@ -1055,7 +1066,11 @@ mod tests { ); assert_eq!(Balances::free_balance(42), 0); assert_noop!( - Claims::claim(RuntimeOrigin::none(), 69, sig::(&bob(), &69u64.encode(), &[][..])), + Claims::claim( + RuntimeOrigin::none(), + 69, + sig::(&bob(), &69u64.encode(), &[][..]) + ), Error::::SignerHasNoClaim, ); assert_ok!(Claims::mint_claim(RuntimeOrigin::root(), eth(&bob()), 200, None, None)); @@ -1086,7 +1101,11 @@ mod tests { ); assert_eq!(Balances::free_balance(42), 0); assert_noop!( - Claims::claim(RuntimeOrigin::none(), 69, sig::(&bob(), &69u64.encode(), &[][..])), + Claims::claim( + RuntimeOrigin::none(), + 69, + sig::(&bob(), &69u64.encode(), &[][..]) + ), Error::::SignerHasNoClaim, ); assert_ok!(Claims::mint_claim( @@ -1187,7 +1206,11 @@ mod tests { sig::(&alice(), &42u64.encode(), &[][..]) )); assert_noop!( - Claims::claim(RuntimeOrigin::none(), 42, sig::(&alice(), &42u64.encode(), &[][..])), + Claims::claim( + RuntimeOrigin::none(), + 42, + sig::(&alice(), &42u64.encode(), &[][..]) + ), Error::::SignerHasNoClaim ); }); @@ -1217,7 +1240,11 @@ mod tests { // They should not be able to claim assert_noop!( - Claims::claim(RuntimeOrigin::none(), 69, sig::(&bob(), &69u64.encode(), &[][..])), + Claims::claim( + RuntimeOrigin::none(), + 69, + sig::(&bob(), &69u64.encode(), &[][..]) + ), Error::::VestedBalanceExists, ); }); @@ -1228,7 +1255,11 @@ mod tests { new_test_ext().execute_with(|| { assert_eq!(Balances::free_balance(42), 0); assert_noop!( - Claims::claim(RuntimeOrigin::none(), 42, sig::(&alice(), &69u64.encode(), &[][..])), + Claims::claim( + RuntimeOrigin::none(), + 42, + sig::(&alice(), &69u64.encode(), &[][..]) + ), Error::::SignerHasNoClaim ); }); @@ -1239,7 +1270,11 @@ mod tests { new_test_ext().execute_with(|| { assert_eq!(Balances::free_balance(42), 0); assert_noop!( - Claims::claim(RuntimeOrigin::none(), 42, sig::(&bob(), &69u64.encode(), &[][..])), + Claims::claim( + RuntimeOrigin::none(), + 42, + sig::(&bob(), &69u64.encode(), &[][..]) + ), Error::::SignerHasNoClaim ); }); diff --git a/parentchain/Cargo.toml b/parentchain/Cargo.toml index 36880345..f7cd6baa 100644 --- a/parentchain/Cargo.toml +++ b/parentchain/Cargo.toml @@ -15,17 +15,17 @@ scale-info = { version = "2.0.1", default-features = false, features = ["derive" serde = { version = "1.0.13", features = ["derive"], optional = true } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -frame-system = { default-features = false, package = "frame-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +frame-system = { default-features = false, package = "frame-system", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } [dev-dependencies] env_logger = "0.9.0" -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } [features] default = ["std"] diff --git a/primitives/common/Cargo.toml b/primitives/common/Cargo.toml index b4db4563..f9a2eabb 100644 --- a/primitives/common/Cargo.toml +++ b/primitives/common/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] # substrate deps -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } [features] default = ["std"] diff --git a/primitives/sidechain/Cargo.toml b/primitives/sidechain/Cargo.toml index 1f86dbfa..1860ffef 100644 --- a/primitives/sidechain/Cargo.toml +++ b/primitives/sidechain/Cargo.toml @@ -14,10 +14,10 @@ serde = { version = "1.0.13", default-features = false } # substrate dependencies -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } [features] diff --git a/primitives/teeracle/Cargo.toml b/primitives/teeracle/Cargo.toml index 67dfbcf6..b8e3db7a 100644 --- a/primitives/teeracle/Cargo.toml +++ b/primitives/teeracle/Cargo.toml @@ -15,7 +15,7 @@ common-primitives = { path = "../common", default-features = false } substrate-fixed = { tag = "v0.5.9", default-features = false, git = "https://github.com/encointer/substrate-fixed.git" } # substrate -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } [features] diff --git a/primitives/teeracle/src/lib.rs b/primitives/teeracle/src/lib.rs index dffaefc4..e9f7f6d8 100644 --- a/primitives/teeracle/src/lib.rs +++ b/primitives/teeracle/src/lib.rs @@ -3,6 +3,10 @@ use common_primitives::PalletString; use substrate_fixed::types::U32F32; +pub const MAX_ORACLE_DATA_NAME_LEN: usize = 40; + pub type ExchangeRate = U32F32; pub type TradingPairString = PalletString; pub type MarketDataSourceString = PalletString; +pub type OracleDataName = PalletString; +pub type DataSource = PalletString; diff --git a/primitives/teerex/Cargo.toml b/primitives/teerex/Cargo.toml index f8705720..c630e9ef 100644 --- a/primitives/teerex/Cargo.toml +++ b/primitives/teerex/Cargo.toml @@ -16,9 +16,9 @@ serde = { version = "1.0.13", default-features = false } ias-verify = { path = "../../teerex/ias-verify", default-features = false } # substrate dependencies -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } [features] diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 95fc0485..23ed88e6 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2022-08-18" +channel = "nightly-2022-10-22" targets = ["wasm32-unknown-unknown"] profile = "default" # include rustfmt, clippy diff --git a/sidechain/Cargo.toml b/sidechain/Cargo.toml index 1a5a7c01..43df3956 100644 --- a/sidechain/Cargo.toml +++ b/sidechain/Cargo.toml @@ -20,27 +20,27 @@ sidechain-primitives = { path = "../primitives/sidechain", default-features = fa teerex-primitives = { path = "../primitives/teerex", default-features = false } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +pallet-timestamp = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } # benchmarking -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } hex-literal = { version = "0.3.2", optional = true } -pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } test-utils = { path = "../test-utils", default-features = false, optional = true } [dev-dependencies] env_logger = "0.9.0" -externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } hex-literal = "0.3.2" -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } test-utils = { path = "../test-utils" } [features] diff --git a/sidechain/src/benchmarking.rs b/sidechain/src/benchmarking.rs index d3467116..0330b0f8 100644 --- a/sidechain/src/benchmarking.rs +++ b/sidechain/src/benchmarking.rs @@ -53,8 +53,9 @@ benchmarks! { let shard: ShardIdentifier = H256::from_slice(&TEST4_SETUP.mrenclave); let hash: H256 = [2; 32].into(); - - }: _(RawOrigin::Signed(accounts[0].clone()), shard, 1, hash) + let block_number = 1; + let next_finalization_candidate_block_number = 20; + }: _(RawOrigin::Signed(accounts[0].clone()), shard, block_number, next_finalization_candidate_block_number, hash) verify { assert_latest_worker_update::(&accounts[0], &shard) } diff --git a/sidechain/src/lib.rs b/sidechain/src/lib.rs index 84cec7d1..138d77c6 100644 --- a/sidechain/src/lib.rs +++ b/sidechain/src/lib.rs @@ -18,7 +18,7 @@ limitations under the License. #![cfg_attr(not(feature = "std"), no_std)] use codec::Encode; -use frame_support::{dispatch::DispatchResultWithPostInfo, traits::Get}; +use frame_support::dispatch::DispatchResultWithPostInfo; use frame_system::{self}; use pallet_teerex::Pallet as Teerex; use sidechain_primitives::SidechainBlockConfirmation; @@ -52,9 +52,6 @@ pub mod pallet { pub trait Config: frame_system::Config + pallet_teerex::Config { type RuntimeEvent: From> + IsType<::RuntimeEvent>; type WeightInfo: WeightInfo; - // If a block arrives far too early, an error should be returned - #[pallet::constant] - type EarlyBlockProposalLenience: Get; } #[pallet::event] @@ -76,8 +73,9 @@ pub mod pallet { StorageMap<_, Blake2_128Concat, ShardIdentifier, SidechainBlockConfirmation, ValueQuery>; #[pallet::storage] - pub type SidechainBlockConfirmationQueue = - StorageMap<_, Blake2_128Concat, ShardBlockNumber, SidechainBlockConfirmation, ValueQuery>; + #[pallet::getter(fn sidechain_block_finalization_candidate)] + pub type SidechainBlockFinalizationCandidate = + StorageMap<_, Blake2_128Concat, ShardIdentifier, u64, ValueQuery>; #[pallet::call] impl Pallet { @@ -87,6 +85,7 @@ pub mod pallet { origin: OriginFor, shard_id: ShardIdentifier, block_number: u64, + next_finalization_candidate_block_number: u64, block_header_hash: H256, ) -> DispatchResultWithPostInfo { let confirmation = SidechainBlockConfirmation { block_number, block_header_hash }; @@ -110,47 +109,35 @@ pub mod pallet { return Ok(().into()) } - let lenience = T::EarlyBlockProposalLenience::get(); - let mut latest_confirmation = >::get(shard_id); - let latest_block_number = latest_confirmation.block_number; let block_number = confirmation.block_number; + let finalization_candidate_block_number = + >::try_get(shard_id).unwrap_or(1); - if block_number > Self::add_to_block_number(latest_block_number, lenience)? { - // Block is far too early and hence refused. - return Err(>::BlockNumberTooHigh.into()) - } else if block_number > Self::add_to_block_number(latest_block_number, 1)? { - // Block is too early and stored in the queue for later import. - if !>::contains_key((shard_id, block_number)) { - >::insert( - (shard_id, block_number), - confirmation, - ); - } - } else if block_number == Self::add_to_block_number(latest_block_number, 1)? { - Self::finalize_block(shard_id, confirmation, &sender, sender_index); - latest_confirmation = confirmation; - - Self::finalize_blocks_from_queue( - shard_id, - &sender, - sender_index, - latest_confirmation, - )?; - } else { - // Block is too late and hence refused. - return Err(>::OutdatedBlockNumber.into()) - } + ensure!( + block_number == finalization_candidate_block_number, + >::ReceivedUnexpectedSidechainBlock + ); + ensure!( + next_finalization_candidate_block_number > finalization_candidate_block_number, + >::InvalidNextFinalizationCandidateBlockNumber + ); + + >::insert( + shard_id, + next_finalization_candidate_block_number, + ); + Self::finalize_block(shard_id, confirmation, &sender, sender_index); Ok(().into()) } } #[pallet::error] pub enum Error { - /// A proposed block is too early. - BlockNumberTooHigh, - /// A propsed block is too late and already outdated. - OutdatedBlockNumber, + /// A proposed block is unexpected. + ReceivedUnexpectedSidechainBlock, + /// The value for the next finalization candidate is invalid. + InvalidNextFinalizationCandidateBlockNumber, } } @@ -171,36 +158,6 @@ impl Pallet { ); Self::deposit_event(Event::FinalizedSidechainBlock(sender.clone(), block_header_hash)); } - - fn finalize_blocks_from_queue( - shard_id: ShardIdentifier, - sender: &T::AccountId, - sender_index: u64, - mut latest_confirmation: SidechainBlockConfirmation, - ) -> DispatchResultWithPostInfo { - let mut latest_block_number = latest_confirmation.block_number; - let mut expected_block_number = Self::add_to_block_number(latest_block_number, 1)?; - let lenience = T::EarlyBlockProposalLenience::get(); - let mut i: u64 = 0; - while >::contains_key((shard_id, expected_block_number)) && - i < lenience - { - let confirmation = - >::take((shard_id, expected_block_number)); - - Self::finalize_block(shard_id, confirmation, sender, sender_index); - latest_confirmation = confirmation; - - latest_block_number = latest_confirmation.block_number; - expected_block_number = Self::add_to_block_number(latest_block_number, 1)?; - i = Self::add_to_block_number(i, 1)?; - } - Ok(().into()) - } - - fn add_to_block_number(block_number: u64, diff: u64) -> Result { - block_number.checked_add(diff).ok_or("[Sidechain]: Overflow adding new block") - } } mod benchmarking; diff --git a/sidechain/src/mock.rs b/sidechain/src/mock.rs index 0ef97192..b9b7a25f 100644 --- a/sidechain/src/mock.rs +++ b/sidechain/src/mock.rs @@ -133,18 +133,14 @@ impl pallet_teerex::Config for Test { type MaxSilenceTime = MaxSilenceTime; } -pub const EARLY_BLOCK_PROPOSAL_LENIENCE: u64 = 100; - parameter_types! { pub const MomentsPerDay: u64 = 86_400_000; // [ms/d] pub const MaxSilenceTime: u64 = 172_800_000; // 48h - pub const EarlyBlockProposalLenience: u64 = EARLY_BLOCK_PROPOSAL_LENIENCE; } impl Config for Test { type RuntimeEvent = RuntimeEvent; type WeightInfo = (); - type EarlyBlockProposalLenience = EarlyBlockProposalLenience; } // This function basically just builds a genesis storage key/value store according to diff --git a/sidechain/src/tests.rs b/sidechain/src/tests.rs index 5d2f5a34..05bc93cc 100644 --- a/sidechain/src/tests.rs +++ b/sidechain/src/tests.rs @@ -25,6 +25,31 @@ fn get_signer(pubkey: &[u8; 32]) -> AccountId { test_utils::get_signer(pubkey) } +#[test] +fn confirm_imported_sidechain_block_invalid_next_finalization_candidate() { + new_test_ext().execute_with(|| { + Timestamp::set_timestamp(TEST7_TIMESTAMP); + let hash = H256::default(); + let signer7 = get_signer(TEST7_SIGNER_PUB); + let shard7 = H256::from_slice(&TEST7_MRENCLAVE); + + let block_number = 1; + + register_enclave7(); + + assert_err!( + Sidechain::confirm_imported_sidechain_block( + RuntimeOrigin::signed(signer7.clone()), + shard7, + block_number, + block_number, + hash + ), + Error::::InvalidNextFinalizationCandidateBlockNumber, + ); + }) +} + #[test] fn confirm_imported_sidechain_block_works_for_correct_shard() { new_test_ext().execute_with(|| { @@ -33,12 +58,16 @@ fn confirm_imported_sidechain_block_works_for_correct_shard() { let signer7 = get_signer(TEST7_SIGNER_PUB); let shard7 = H256::from_slice(&TEST7_MRENCLAVE); + let block_number = 1; + let next_finalization_block_candidate = 20; + register_enclave7(); assert_ok!(Sidechain::confirm_imported_sidechain_block( RuntimeOrigin::signed(signer7.clone()), shard7, - 1, + block_number, + next_finalization_block_candidate, hash )); @@ -58,11 +87,14 @@ fn confirm_imported_sidechain_block_from_shard_neq_mrenclave_errs() { register_enclave7(); + let block_number = 1; + assert_err!( Sidechain::confirm_imported_sidechain_block( RuntimeOrigin::signed(signer7), shard4, - 1, + block_number, + block_number, hash ), pallet_teerex::Error::::WrongMrenclaveForShard @@ -78,110 +110,73 @@ fn confirm_imported_sidechain_block_correct_order() { register_enclave7(); - assert_ok!(confirm_block7(1, H256::random(), true)); + assert_ok!(confirm_block7(1, 2, H256::random(), true)); assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 1); - assert_ok!(confirm_block7(2, H256::random(), true)); + assert_eq!(Sidechain::sidechain_block_finalization_candidate(shard7), 2); + assert_ok!(confirm_block7(2, 3, H256::random(), true)); assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 2); - assert_ok!(confirm_block7(3, H256::random(), true)); + assert_eq!(Sidechain::sidechain_block_finalization_candidate(shard7), 3); + assert_ok!(confirm_block7(3, 4, H256::random(), true)); assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 3); - assert_ok!(confirm_block7(4, H256::random(), true)); + assert_eq!(Sidechain::sidechain_block_finalization_candidate(shard7), 4); + assert_ok!(confirm_block7(4, 5, H256::random(), true)); assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 4); - assert_ok!(confirm_block7(5, H256::random(), true)); + assert_eq!(Sidechain::sidechain_block_finalization_candidate(shard7), 5); + assert_ok!(confirm_block7(5, 6, H256::random(), true)); assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 5); + assert_eq!(Sidechain::sidechain_block_finalization_candidate(shard7), 6); }) } #[test] -fn confirm_imported_sidechain_first_imported_block() { +fn confirm_imported_sidechain_block_wrong_next() { new_test_ext().execute_with(|| { Timestamp::set_timestamp(TEST7_TIMESTAMP); let shard7 = H256::from_slice(&TEST7_MRENCLAVE); register_enclave7(); - let hash_block_3 = H256::random(); - - assert_ok!(confirm_block7(1, H256::random(), true)); - assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 1); - // Queue block number 3. Should not be imported right now, because confirmation of block number 2 is missing - assert_ok!(confirm_block7(3, hash_block_3, false)); - assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 1); - // Queue another block with number 3. Should not be imported at all, because it was not the first one - assert_ok!(confirm_block7(3, H256::random(), false)); + assert_ok!(confirm_block7(1, 2, H256::random(), true)); assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 1); - // Queue block number 2. Block number 3 should now be confirmed as well. - assert_ok!(confirm_block7(2, H256::random(), true)); - assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 3); - assert_eq!( - Sidechain::latest_sidechain_block_confirmation(shard7).block_header_hash, - hash_block_3 + assert_eq!(Sidechain::sidechain_block_finalization_candidate(shard7), 2); + assert_ok!(confirm_block7(2, 4, H256::random(), true)); + assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 2); + assert_eq!(Sidechain::sidechain_block_finalization_candidate(shard7), 4); + assert_err!( + confirm_block7(3, 4, H256::random(), true), + Error::::ReceivedUnexpectedSidechainBlock ); - }) -} - -#[test] -fn confirm_imported_sidechain_block_wrong_order() { - new_test_ext().execute_with(|| { - Timestamp::set_timestamp(TEST7_TIMESTAMP); - let shard7 = H256::from_slice(&TEST7_MRENCLAVE); - - register_enclave7(); - - assert_ok!(confirm_block7(1, H256::random(), true)); - assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 1); - assert_ok!(confirm_block7(4, H256::random(), false)); - assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 1); - assert_ok!(confirm_block7(3, H256::random(), false)); - assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 1); - assert_ok!(confirm_block7(2, H256::random(), true)); - assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 4); - assert_ok!(confirm_block7(5, H256::random(), true)); - assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 5); - }) -} - -#[test] -fn confirm_imported_sidechain_block_too_late() { - new_test_ext().execute_with(|| { - Timestamp::set_timestamp(TEST7_TIMESTAMP); - let shard7 = H256::from_slice(&TEST7_MRENCLAVE); - - register_enclave7(); - - assert_ok!(confirm_block7(1, H256::random(), true)); - assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 1); - assert_ok!(confirm_block7(2, H256::random(), true)); assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 2); - assert_ok!(confirm_block7(3, H256::random(), true)); - assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 3); - assert_ok!(confirm_block7(4, H256::random(), true)); - assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 4); - assert_err!(confirm_block7(2, H256::random(), true), Error::::OutdatedBlockNumber); - assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 4); - assert_err!(confirm_block7(3, H256::random(), true), Error::::OutdatedBlockNumber); + assert_eq!(Sidechain::sidechain_block_finalization_candidate(shard7), 4); + assert_ok!(confirm_block7(4, 5, H256::random(), true)); assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 4); + assert_eq!(Sidechain::sidechain_block_finalization_candidate(shard7), 5); }) } #[test] -fn confirm_imported_sidechain_block_far_too_early() { +fn confirm_imported_sidechain_block_outdated() { new_test_ext().execute_with(|| { Timestamp::set_timestamp(TEST7_TIMESTAMP); let shard7 = H256::from_slice(&TEST7_MRENCLAVE); register_enclave7(); - assert_ok!(confirm_block7(1, H256::random(), true)); + assert_ok!(confirm_block7(1, 2, H256::random(), true)); assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 1); - assert_ok!(confirm_block7(2, H256::random(), true)); - assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 2); - assert_ok!(confirm_block7(2 + EARLY_BLOCK_PROPOSAL_LENIENCE, H256::random(), false)); + assert_eq!(Sidechain::sidechain_block_finalization_candidate(shard7), 2); + assert_ok!(confirm_block7(2, 4, H256::random(), true)); assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 2); + assert_eq!(Sidechain::sidechain_block_finalization_candidate(shard7), 4); assert_err!( - confirm_block7(3 + EARLY_BLOCK_PROPOSAL_LENIENCE, H256::random(), false), - Error::::BlockNumberTooHigh + confirm_block7(2, 4, H256::random(), true), + Error::::ReceivedUnexpectedSidechainBlock ); assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 2); + assert_eq!(Sidechain::sidechain_block_finalization_candidate(shard7), 4); + assert_ok!(confirm_block7(4, 5, H256::random(), true)); + assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 4); + assert_eq!(Sidechain::sidechain_block_finalization_candidate(shard7), 5); }) } @@ -194,7 +189,7 @@ fn dont_process_confirmation_of_second_registered_enclave() { register_enclave(TEST7_SIGNER_PUB, TEST7_CERT, 1); register_enclave(TEST6_SIGNER_PUB, TEST6_CERT, 2); - assert_ok!(confirm_block(shard7, TEST6_SIGNER_PUB, 1, H256::default(), false)); + assert_ok!(confirm_block(shard7, TEST6_SIGNER_PUB, 1, 2, H256::default(), false)); assert_eq!(Sidechain::latest_sidechain_block_confirmation(shard7).block_number, 0); }) } @@ -217,17 +212,26 @@ fn register_enclave(signer_pub_key: &[u8; 32], cert: &[u8], expected_enclave_cou fn confirm_block7( block_number: u64, + next_finalized_block_number: u64, block_header_hash: H256, check_for_event: bool, ) -> DispatchResultWithPostInfo { let shard7 = H256::from_slice(&TEST7_MRENCLAVE); - confirm_block(shard7, TEST7_SIGNER_PUB, block_number, block_header_hash, check_for_event) + confirm_block( + shard7, + TEST7_SIGNER_PUB, + block_number, + next_finalized_block_number, + block_header_hash, + check_for_event, + ) } fn confirm_block( shard7: H256, signer_pub_key: &[u8; 32], block_number: u64, + next_finalized_block_number: u64, block_header_hash: H256, check_for_event: bool, ) -> DispatchResultWithPostInfo { @@ -237,6 +241,7 @@ fn confirm_block( RuntimeOrigin::signed(signer7.clone()), shard7, block_number, + next_finalized_block_number, block_header_hash, )?; diff --git a/teeracle/Cargo.toml b/teeracle/Cargo.toml index 7c9017d5..91ebe13e 100644 --- a/teeracle/Cargo.toml +++ b/teeracle/Cargo.toml @@ -21,27 +21,27 @@ teeracle-primitives = { path = "../primitives/teeracle", default-features = fals substrate-fixed = { tag = "v0.5.9", default-features = false, git = "https://github.com/encointer/substrate-fixed.git" } # substrate -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } # benchmarking -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } hex-literal = { version = "0.3.2", optional = true } test-utils = { path = "../test-utils", optional = true, default-features = false } -timestamp = { package = "pallet-timestamp", default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +timestamp = { package = "pallet-timestamp", default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } [dev-dependencies] -externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } hex-literal = "0.3.2" -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } test-utils = { path = "../test-utils" } -timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } [features] diff --git a/teeracle/src/benchmarking.rs b/teeracle/src/benchmarking.rs index 21a8d935..bd7bc336 100644 --- a/teeracle/src/benchmarking.rs +++ b/teeracle/src/benchmarking.rs @@ -21,13 +21,14 @@ use super::*; -use crate::Pallet as Exchange; +use crate::Pallet as Teeracle; use frame_benchmarking::benchmarks; use frame_system::RawOrigin; use pallet_teerex::Pallet as Teerex; use sp_runtime::traits::CheckedConversion; -use sp_std::borrow::ToOwned; -use teeracle_primitives::{MarketDataSourceString, TradingPairString}; +use sp_std::{borrow::ToOwned, prelude::*}; +use teeracle_primitives::{DataSource, OracleDataName, TradingPairString}; + use test_utils::{ get_signer, ias::{consts::*, setups::*}, @@ -47,7 +48,7 @@ benchmarks! { let signer: T::AccountId = get_signer(TEST4_SETUP.signer_pub); let trading_pair: TradingPairString = "DOT/USD".into(); let rate = U32F32::from_num(43.65); - let data_source: MarketDataSourceString = "https://api.coingecko.com".into(); + let data_source: DataSource = "https://api.coingecko.com".into(); // simply register the enclave before to make sure it already // exists when running the benchmark Teerex::::register_enclave( @@ -56,31 +57,53 @@ benchmarks! { URL.to_vec() ).unwrap(); let mrenclave = Teerex::::enclave(1).unwrap().mr_enclave; - Exchange::::add_to_whitelist(RawOrigin::Root.into(), data_source.clone(), mrenclave).unwrap(); + Teeracle::::add_to_whitelist(RawOrigin::Root.into(), data_source.clone(), mrenclave).unwrap(); }: _(RawOrigin::Signed(signer), data_source.clone(), trading_pair.clone(), Some(rate)) verify { - assert_eq!(Exchange::::exchange_rate(trading_pair, data_source), U32F32::from_num(43.65)); + assert_eq!(Teeracle::::exchange_rate(trading_pair, data_source), U32F32::from_num(43.65)); + } + + update_oracle { + ensure_not_skipping_ra_check(); + timestamp::Pallet::::set_timestamp(TEST4_SETUP.timestamp.checked_into().unwrap()); + let signer: T::AccountId = get_signer(TEST4_SETUP.signer_pub); + let oracle_name = OracleDataName::from("Test_Oracle_Name"); + let data_source = DataSource::from("Test_Source_Name"); + let oracle_blob: crate::OracleDataBlob = + vec![1].try_into().expect("Can Convert to OracleDataBlob; QED"); + // simply register the enclave before to make sure it already + // exists when running the benchmark + Teerex::::register_enclave( + RawOrigin::Signed(signer.clone()).into(), + TEST4_SETUP.cert.to_vec(), + URL.to_vec() + ).unwrap(); + let mrenclave = Teerex::::enclave(1).unwrap().mr_enclave; + Teeracle::::add_to_whitelist(RawOrigin::Root.into(), data_source.clone(), mrenclave).unwrap(); + }: _(RawOrigin::Signed(signer), oracle_name.clone(), data_source.clone(), oracle_blob.clone()) + verify { + assert_eq!(Teeracle::::oracle_data(oracle_name, data_source), oracle_blob); } add_to_whitelist { let mrenclave = TEST4_MRENCLAVE; - let data_source: MarketDataSourceString = "https://api.coingecko.com".into(); + let data_source: DataSource = "https://api.coingecko.com".into(); }: _(RawOrigin::Root, data_source.clone(), mrenclave) verify { - assert_eq!(Exchange::::whitelist(data_source).len(), 1, "mrenclave not added to whitelist") + assert_eq!(Teeracle::::whitelist(data_source).len(), 1, "mrenclave not added to whitelist") } remove_from_whitelist { let mrenclave = TEST4_MRENCLAVE; - let data_source: MarketDataSourceString = "https://api.coingecko.com".into(); + let data_source: DataSource = "https://api.coingecko.com".into(); - Exchange::::add_to_whitelist(RawOrigin::Root.into(), data_source.clone(), mrenclave).unwrap(); + Teeracle::::add_to_whitelist(RawOrigin::Root.into(), data_source.clone(), mrenclave).unwrap(); }: _(RawOrigin::Root, data_source.clone(), mrenclave) verify { - assert_eq!(Exchange::::whitelist(data_source).len(), 0, "mrenclave not removed from whitelist") + assert_eq!(Teeracle::::whitelist(data_source).len(), 0, "mrenclave not removed from whitelist") } } diff --git a/teeracle/src/lib.rs b/teeracle/src/lib.rs index 82b1d7a6..e3b5feff 100644 --- a/teeracle/src/lib.rs +++ b/teeracle/src/lib.rs @@ -33,7 +33,7 @@ pub use crate::weights::WeightInfo; pub use pallet::*; pub use substrate_fixed::types::U32F32; -use teeracle_primitives::MarketDataSourceString; +use teeracle_primitives::{DataSource, MAX_ORACLE_DATA_NAME_LEN}; const MAX_TRADING_PAIR_LEN: usize = 11; const MAX_SOURCE_LEN: usize = 40; @@ -41,11 +41,13 @@ const MAX_SOURCE_LEN: usize = 40; #[frame_support::pallet] pub mod pallet { use super::*; - use frame_support::{pallet_prelude::*, WeakBoundedVec}; + use frame_support::{pallet_prelude::*, BoundedVec, WeakBoundedVec}; use frame_system::pallet_prelude::*; use sp_std::prelude::*; use teeracle_primitives::*; + pub type OracleDataBlob = BoundedVec::MaxOracleBlobLen>; + #[pallet::pallet] #[pallet::generate_store(pub(super) trait Store)] #[pallet::without_storage_info] @@ -59,6 +61,9 @@ pub mod pallet { /// Max number of whitelisted oracle's releases allowed #[pallet::constant] type MaxWhitelistedReleases: Get; + + #[pallet::constant] + type MaxOracleBlobLen: Get; } /// Exchange rates chain's cryptocurrency/currency (trading pair) from different sources @@ -69,18 +74,30 @@ pub mod pallet { Blake2_128Concat, TradingPairString, Blake2_128Concat, - MarketDataSourceString, + DataSource, ExchangeRate, ValueQuery, >; + #[pallet::storage] + #[pallet::getter(fn oracle_data)] + pub(super) type OracleData = StorageDoubleMap< + _, + Blake2_128Concat, + OracleDataName, + Blake2_128Concat, + DataSource, + OracleDataBlob, + ValueQuery, + >; + /// whitelist of trusted oracle's releases for different data sources #[pallet::storage] #[pallet::getter(fn whitelist)] pub(super) type Whitelists = StorageMap< _, Blake2_128Concat, - MarketDataSourceString, + DataSource, WeakBoundedVec<[u8; 32], T::MaxWhitelistedReleases>, ValueQuery, >; @@ -92,10 +109,11 @@ pub mod pallet { #[pallet::generate_deposit(pub(super) fn deposit_event)] pub enum Event { /// The exchange rate of trading pair was set/updated with value from source. \[data_source], [trading_pair], [new value\] - ExchangeRateUpdated(MarketDataSourceString, TradingPairString, Option), - ExchangeRateDeleted(MarketDataSourceString, TradingPairString), - AddedToWhitelist(MarketDataSourceString, [u8; 32]), - RemovedFromWhitelist(MarketDataSourceString, [u8; 32]), + ExchangeRateUpdated(DataSource, TradingPairString, Option), + ExchangeRateDeleted(DataSource, TradingPairString), + OracleUpdated(OracleDataName, DataSource), + AddedToWhitelist(DataSource, [u8; 32]), + RemovedFromWhitelist(DataSource, [u8; 32]), } #[pallet::error] @@ -106,7 +124,9 @@ pub mod pallet { ReleaseNotWhitelisted, ReleaseAlreadyWhitelisted, TradingPairStringTooLong, - MarketDataSourceStringTooLong, + OracleDataNameStringTooLong, + DataSourceStringTooLong, + OracleBlobTooBig, } #[pallet::hooks] @@ -117,11 +137,11 @@ pub mod pallet { #[pallet::weight(::WeightInfo::add_to_whitelist())] pub fn add_to_whitelist( origin: OriginFor, - data_source: MarketDataSourceString, + data_source: DataSource, mrenclave: [u8; 32], ) -> DispatchResult { ensure_root(origin)?; - ensure!(data_source.len() <= MAX_SOURCE_LEN, Error::::MarketDataSourceStringTooLong); + ensure!(data_source.len() <= MAX_SOURCE_LEN, Error::::DataSourceStringTooLong); ensure!( !Self::is_whitelisted(&data_source, mrenclave), >::ReleaseAlreadyWhitelisted @@ -136,7 +156,7 @@ pub mod pallet { #[pallet::weight(::WeightInfo::remove_from_whitelist())] pub fn remove_from_whitelist( origin: OriginFor, - data_source: MarketDataSourceString, + data_source: DataSource, mrenclave: [u8; 32], ) -> DispatchResult { ensure_root(origin)?; @@ -151,10 +171,42 @@ pub mod pallet { Ok(()) } + #[pallet::weight(::WeightInfo::update_oracle())] + pub fn update_oracle( + origin: OriginFor, + oracle_name: OracleDataName, + data_source: DataSource, + new_blob: OracleDataBlob, + ) -> DispatchResultWithPostInfo { + let signer = ensure_signed(origin)?; + >::is_registered_enclave(&signer)?; + let signer_index = >::enclave_index(signer); + let signer_enclave = >::enclave(signer_index) + .ok_or(pallet_teerex::Error::::EmptyEnclaveRegistry)?; + + ensure!( + Self::is_whitelisted(&data_source, signer_enclave.mr_enclave), + >::ReleaseNotWhitelisted + ); + ensure!( + oracle_name.len() <= MAX_ORACLE_DATA_NAME_LEN, + Error::::OracleDataNameStringTooLong + ); + ensure!(data_source.len() <= MAX_SOURCE_LEN, Error::::DataSourceStringTooLong); + ensure!( + new_blob.len() as u32 <= T::MaxOracleBlobLen::get(), + Error::::OracleBlobTooBig + ); + + OracleData::::insert(&oracle_name, &data_source, new_blob); + Self::deposit_event(Event::::OracleUpdated(oracle_name, data_source)); + Ok(().into()) + } + #[pallet::weight(::WeightInfo::update_exchange_rate())] pub fn update_exchange_rate( origin: OriginFor, - data_source: MarketDataSourceString, + data_source: DataSource, trading_pair: TradingPairString, new_value: Option, ) -> DispatchResultWithPostInfo { @@ -163,6 +215,7 @@ pub mod pallet { let sender_index = >::enclave_index(sender); let sender_enclave = >::enclave(sender_index) .ok_or(pallet_teerex::Error::::EmptyEnclaveRegistry)?; + // Todo: Never checks data source len ensure!( trading_pair.len() <= MAX_TRADING_PAIR_LEN, Error::::TradingPairStringTooLong @@ -191,7 +244,7 @@ pub mod pallet { } } impl Pallet { - fn is_whitelisted(data_source: &MarketDataSourceString, mrenclave: [u8; 32]) -> bool { + fn is_whitelisted(data_source: &DataSource, mrenclave: [u8; 32]) -> bool { Self::whitelist(data_source).contains(&mrenclave) } } diff --git a/teeracle/src/mock.rs b/teeracle/src/mock.rs index 05086454..8b27cb12 100644 --- a/teeracle/src/mock.rs +++ b/teeracle/src/mock.rs @@ -14,10 +14,10 @@ limitations under the License. */ -use crate as pallet_exchange; +use crate as pallet_teeracle; use frame_support::{pallet_prelude::GenesisBuild, parameter_types}; use frame_system as system; -use pallet_exchange::Config; +use pallet_teeracle::Config; use sp_core::H256; use sp_keyring::AccountKeyring; use sp_runtime::{ @@ -50,11 +50,11 @@ frame_support::construct_runtime!( NodeBlock = Block, UncheckedExtrinsic = UncheckedExtrinsic, { - System: frame_system::{Pallet, Call, Config, Storage, Event}, - Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, - Timestamp: timestamp::{Pallet, Call, Storage, Inherent}, - Teerex: pallet_teerex::{Pallet, Call, Storage, Event}, - Exchange: pallet_exchange::{Pallet, Call, Storage, Event}, + System: frame_system, + Balances: pallet_balances, + Timestamp: timestamp, + Teerex: pallet_teerex, + Teeracle: pallet_teeracle, } ); @@ -123,6 +123,7 @@ parameter_types! { pub const MomentsPerDay: u64 = 86_400_000; // [ms/d] pub const MaxSilenceTime: u64 = 172_800_000; // 48h pub const MaxWhitelistedReleases: u32 = 10; + pub const MaxOracleBlobLen: u32 = 4096; } impl pallet_teerex::Config for Test { @@ -137,6 +138,7 @@ impl Config for Test { type RuntimeEvent = RuntimeEvent; type WeightInfo = (); type MaxWhitelistedReleases = MaxWhitelistedReleases; + type MaxOracleBlobLen = MaxOracleBlobLen; } // This function basically just builds a genesis storage key/value store according to diff --git a/teeracle/src/tests.rs b/teeracle/src/tests.rs index 67aeb96f..df345cf3 100644 --- a/teeracle/src/tests.rs +++ b/teeracle/src/tests.rs @@ -15,11 +15,12 @@ */ use crate::{mock::*, ExchangeRates}; -use frame_support::{assert_err, assert_ok}; +use frame_support::{assert_err, assert_noop, assert_ok}; use hex_literal::hex; use pallet_teerex::Error; use sp_runtime::DispatchError::BadOrigin; use substrate_fixed::types::U32F32; +use teeracle_primitives::*; use test_utils::ias::consts::{ TEST4_CERT, TEST4_MRENCLAVE, TEST4_SIGNER_PUB, TEST4_TIMESTAMP, TEST5_MRENCLAVE, TEST5_SIGNER_PUB, TEST8_MRENCLAVE, URL, @@ -29,7 +30,7 @@ const COINGECKO_SRC: &str = "https://api.coingecko.com"; const COINMARKETCAP_SRC: &str = "https://coinmarketcap.com/"; const DOT_USD_TRADING_PAIR: &str = "DOT/USD"; -// const TEER_USD_TRADING_PAIR: &str = "TEER/USD"; +const TEER_USD_TRADING_PAIR: &str = "TEER/USD"; // give get_signer a concrete type fn get_signer(pubkey: &[u8; 32]) -> AccountId { @@ -45,12 +46,12 @@ fn register_enclave_and_add_oracle_to_whitelist_ok(src: &str) { URL.to_vec() )); let mrenclave = Teerex::enclave(1).unwrap().mr_enclave; - assert_ok!(Exchange::add_to_whitelist(RuntimeOrigin::root(), src.to_owned(), mrenclave)); + assert_ok!(Teeracle::add_to_whitelist(RuntimeOrigin::root(), src.to_owned(), mrenclave)); } fn update_exchange_rate_dot_dollars_ok(src: &str, rate: Option) { let signer = get_signer(TEST4_SIGNER_PUB); - assert_ok!(Exchange::update_exchange_rate( + assert_ok!(Teeracle::update_exchange_rate( RuntimeOrigin::signed(signer), src.to_owned(), DOT_USD_TRADING_PAIR.to_owned(), @@ -65,26 +66,55 @@ fn update_exchange_rate_works() { let rate = U32F32::from_num(43.65); update_exchange_rate_dot_dollars_ok(COINGECKO_SRC, Some(rate)); - let expected_event = RuntimeEvent::Exchange(crate::Event::ExchangeRateUpdated( + let expected_event = RuntimeEvent::Teeracle(crate::Event::ExchangeRateUpdated( COINGECKO_SRC.to_owned(), DOT_USD_TRADING_PAIR.to_owned(), Some(rate), )); assert!(System::events().iter().any(|a| a.event == expected_event)); assert_eq!( - Exchange::exchange_rate(DOT_USD_TRADING_PAIR.to_owned(), COINGECKO_SRC.to_owned()), + Teeracle::exchange_rate(DOT_USD_TRADING_PAIR.to_owned(), COINGECKO_SRC.to_owned()), rate ); let rate2 = U32F32::from_num(4294967295.65); update_exchange_rate_dot_dollars_ok(COINGECKO_SRC, Some(rate2)); assert_eq!( - Exchange::exchange_rate(DOT_USD_TRADING_PAIR.to_owned(), COINGECKO_SRC.to_owned()), + Teeracle::exchange_rate(DOT_USD_TRADING_PAIR.to_owned(), COINGECKO_SRC.to_owned()), rate2 ); }) } +#[test] +fn update_oracle_works() { + new_test_ext().execute_with(|| { + let signer = get_signer(TEST4_SIGNER_PUB); + register_enclave_and_add_oracle_to_whitelist_ok(&DataSource::from("Test_Source_Name")); + let oracle_blob: crate::OracleDataBlob = + vec![1].try_into().expect("Can Convert to BoundedVec; QED"); + assert_ok!(Teeracle::update_oracle( + RuntimeOrigin::signed(signer), + OracleDataName::from("Test_Oracle_Name"), + DataSource::from("Test_Source_Name"), + oracle_blob.clone() + ),); + let expected_event = RuntimeEvent::Teeracle(crate::Event::OracleUpdated( + OracleDataName::from("Test_Oracle_Name"), + DataSource::from("Test_Source_Name"), + )); + assert!(System::events().iter().any(|a| a.event == expected_event)); + + assert_eq!( + Teeracle::oracle_data( + OracleDataName::from("Test_Oracle_Name"), + DataSource::from("Test_Source_Name") + ), + oracle_blob + ); + }) +} + #[test] fn get_existing_exchange_rate_works() { new_test_ext().execute_with(|| { @@ -92,7 +122,7 @@ fn get_existing_exchange_rate_works() { register_enclave_and_add_oracle_to_whitelist_ok(COINGECKO_SRC); update_exchange_rate_dot_dollars_ok(COINGECKO_SRC, Some(rate)); assert_eq!( - Exchange::exchange_rate(DOT_USD_TRADING_PAIR.to_owned(), COINGECKO_SRC.to_owned()), + Teeracle::exchange_rate(DOT_USD_TRADING_PAIR.to_owned(), COINGECKO_SRC.to_owned()), rate ); }) @@ -106,7 +136,7 @@ fn get_inexisting_exchange_rate_is_zero() { COINGECKO_SRC.to_owned() )); assert_eq!( - Exchange::exchange_rate(DOT_USD_TRADING_PAIR.to_owned(), COINGECKO_SRC.to_owned()), + Teeracle::exchange_rate(DOT_USD_TRADING_PAIR.to_owned(), COINGECKO_SRC.to_owned()), U32F32::from_num(0) ); }) @@ -121,7 +151,7 @@ fn update_exchange_rate_to_none_delete_exchange_rate() { update_exchange_rate_dot_dollars_ok(COINGECKO_SRC, None); - let expected_event = RuntimeEvent::Exchange(crate::Event::ExchangeRateDeleted( + let expected_event = RuntimeEvent::Teeracle(crate::Event::ExchangeRateDeleted( COINGECKO_SRC.to_owned(), DOT_USD_TRADING_PAIR.to_owned(), )); @@ -142,7 +172,7 @@ fn update_exchange_rate_to_zero_delete_exchange_rate() { update_exchange_rate_dot_dollars_ok(COINGECKO_SRC, Some(U32F32::from_num(0))); - let expected_event = RuntimeEvent::Exchange(crate::Event::ExchangeRateDeleted( + let expected_event = RuntimeEvent::Teeracle(crate::Event::ExchangeRateDeleted( COINGECKO_SRC.to_owned(), DOT_USD_TRADING_PAIR.to_owned(), )); @@ -161,7 +191,7 @@ fn update_exchange_rate_from_not_registered_enclave_fails() { let signer = get_signer(TEST4_SIGNER_PUB); let rate = U32F32::from_num(43.65); assert_err!( - Exchange::update_exchange_rate( + Teeracle::update_exchange_rate( RuntimeOrigin::signed(signer), COINGECKO_SRC.to_owned(), DOT_USD_TRADING_PAIR.to_owned(), @@ -172,6 +202,22 @@ fn update_exchange_rate_from_not_registered_enclave_fails() { }) } +#[test] +fn update_oracle_from_not_registered_enclave_fails() { + new_test_ext().execute_with(|| { + let signer = get_signer(TEST4_SIGNER_PUB); + assert_noop!( + Teeracle::update_oracle( + RuntimeOrigin::signed(signer), + OracleDataName::from("Test_Oracle_Name"), + DataSource::from("Test_Source_Name"), + vec![0].try_into().expect("Can Convert to BoundedVec; QED") + ), + Error::::EnclaveIsNotRegistered + ); + }) +} + #[test] fn update_exchange_rate_from_not_whitelisted_oracle_fails() { new_test_ext().execute_with(|| { @@ -185,7 +231,7 @@ fn update_exchange_rate_from_not_whitelisted_oracle_fails() { let rate = U32F32::from_num(43.65); assert_err!( - Exchange::update_exchange_rate( + Teeracle::update_exchange_rate( RuntimeOrigin::signed(signer), COINGECKO_SRC.to_owned(), DOT_USD_TRADING_PAIR.to_owned(), @@ -195,6 +241,30 @@ fn update_exchange_rate_from_not_whitelisted_oracle_fails() { ); }) } + +#[test] +fn update_oracle_from_not_whitelisted_oracle_fails() { + new_test_ext().execute_with(|| { + Timestamp::set_timestamp(TEST4_TIMESTAMP); + let signer = get_signer(TEST4_SIGNER_PUB); + assert_ok!(Teerex::register_enclave( + RuntimeOrigin::signed(signer.clone()), + TEST4_CERT.to_vec(), + URL.to_vec() + )); + + assert_noop!( + Teeracle::update_oracle( + RuntimeOrigin::signed(signer), + OracleDataName::from("Test_Oracle_Name"), + DataSource::from("Test_Source_Name"), + vec![0].try_into().expect("Can Convert to BoundedVec; QED") + ), + crate::Error::::ReleaseNotWhitelisted + ); + }) +} + #[test] fn update_exchange_rate_with_too_long_trading_pair_fails() { new_test_ext().execute_with(|| { @@ -204,7 +274,7 @@ fn update_exchange_rate_with_too_long_trading_pair_fails() { let signer = get_signer(TEST4_SIGNER_PUB); let too_long_trading_pair = "123456789_12".to_owned(); assert_err!( - Exchange::update_exchange_rate( + Teeracle::update_exchange_rate( RuntimeOrigin::signed(signer), COINGECKO_SRC.to_owned(), too_long_trading_pair, @@ -218,126 +288,126 @@ fn update_exchange_rate_with_too_long_trading_pair_fails() { #[test] fn add_to_whitelist_works() { new_test_ext().execute_with(|| { - assert_ok!(Exchange::add_to_whitelist( + assert_ok!(Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); - let expected_event = RuntimeEvent::Exchange(crate::Event::AddedToWhitelist( + let expected_event = RuntimeEvent::Teeracle(crate::Event::AddedToWhitelist( COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE, )); assert!(System::events().iter().any(|a| a.event == expected_event)); - assert_eq!(Exchange::whitelist(COINGECKO_SRC.to_owned()).len(), 1); + assert_eq!(Teeracle::whitelist(COINGECKO_SRC.to_owned()).len(), 1); }) } #[test] fn add_mulitple_src_to_whitelists_works() { new_test_ext().execute_with(|| { - assert_ok!(Exchange::add_to_whitelist( + assert_ok!(Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); - assert_ok!(Exchange::add_to_whitelist( + assert_ok!(Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINMARKETCAP_SRC.to_owned(), TEST4_MRENCLAVE )); - let expected_event = RuntimeEvent::Exchange(crate::Event::AddedToWhitelist( + let expected_event = RuntimeEvent::Teeracle(crate::Event::AddedToWhitelist( COINMARKETCAP_SRC.to_owned(), TEST4_MRENCLAVE, )); assert!(System::events().iter().any(|a| a.event == expected_event)); - assert_eq!(Exchange::whitelist(COINGECKO_SRC.to_owned()).len(), 1); - assert_eq!(Exchange::whitelist(COINMARKETCAP_SRC.to_owned()).len(), 1); + assert_eq!(Teeracle::whitelist(COINGECKO_SRC.to_owned()).len(), 1); + assert_eq!(Teeracle::whitelist(COINMARKETCAP_SRC.to_owned()).len(), 1); }) } #[test] fn add_two_times_to_whitelist_fails() { new_test_ext().execute_with(|| { - assert_ok!(Exchange::add_to_whitelist( + assert_ok!(Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); assert_err!( - Exchange::add_to_whitelist( + Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE ), crate::Error::::ReleaseAlreadyWhitelisted ); - assert_eq!(Exchange::whitelist(COINGECKO_SRC.to_owned()).len(), 1); + assert_eq!(Teeracle::whitelist(COINGECKO_SRC.to_owned()).len(), 1); }) } #[test] fn add_too_many_oracles_to_whitelist_fails() { new_test_ext().execute_with(|| { - assert_ok!(Exchange::add_to_whitelist( + assert_ok!(Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); - assert_ok!(Exchange::add_to_whitelist( + assert_ok!(Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST5_MRENCLAVE )); - assert_ok!(Exchange::add_to_whitelist( + assert_ok!(Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d2") )); - assert_ok!(Exchange::add_to_whitelist( + assert_ok!(Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d3") )); - assert_ok!(Exchange::add_to_whitelist( + assert_ok!(Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d4") )); - assert_ok!(Exchange::add_to_whitelist( + assert_ok!(Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d5") )); - assert_ok!(Exchange::add_to_whitelist( + assert_ok!(Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d6") )); - assert_ok!(Exchange::add_to_whitelist( + assert_ok!(Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d7") )); - assert_ok!(Exchange::add_to_whitelist( + assert_ok!(Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d8") )); - assert_ok!(Exchange::add_to_whitelist( + assert_ok!(Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d9") )); assert_err!( - Exchange::add_to_whitelist( + Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST8_MRENCLAVE ), crate::Error::::ReleaseWhitelistOverflow ); - assert_eq!(Exchange::whitelist(COINGECKO_SRC.to_owned()).len(), 10); + assert_eq!(Teeracle::whitelist(COINGECKO_SRC.to_owned()).len(), 10); }) } #[test] @@ -345,8 +415,8 @@ fn add_to_whitelist_too_long_source_fails() { new_test_ext().execute_with(|| { let too_long_source = "123456789_223456789_323456789_423456789_1".to_owned(); assert_err!( - Exchange::add_to_whitelist(RuntimeOrigin::root(), too_long_source, TEST4_MRENCLAVE), - crate::Error::::MarketDataSourceStringTooLong + Teeracle::add_to_whitelist(RuntimeOrigin::root(), too_long_source, TEST4_MRENCLAVE), + crate::Error::::DataSourceStringTooLong ); }) } @@ -356,72 +426,72 @@ fn non_root_add_to_whitelist_fails() { new_test_ext().execute_with(|| { let signer = get_signer(TEST5_SIGNER_PUB); assert_err!( - Exchange::add_to_whitelist( + Teeracle::add_to_whitelist( RuntimeOrigin::signed(signer), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE ), BadOrigin ); - assert_eq!(Exchange::whitelist(COINGECKO_SRC.to_owned()).len(), 0); + assert_eq!(Teeracle::whitelist(COINGECKO_SRC.to_owned()).len(), 0); }) } #[test] fn remove_from_whitelist_works() { new_test_ext().execute_with(|| { - assert_ok!(Exchange::add_to_whitelist( + assert_ok!(Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); - assert_ok!(Exchange::remove_from_whitelist( + assert_ok!(Teeracle::remove_from_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); - let expected_event = RuntimeEvent::Exchange(crate::Event::RemovedFromWhitelist( + let expected_event = RuntimeEvent::Teeracle(crate::Event::RemovedFromWhitelist( COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE, )); assert!(System::events().iter().any(|a| a.event == expected_event)); - assert_eq!(Exchange::whitelist(COINGECKO_SRC.to_owned()).len(), 0); + assert_eq!(Teeracle::whitelist(COINGECKO_SRC.to_owned()).len(), 0); }) } #[test] fn remove_from_whitelist_not_whitelisted_fails() { new_test_ext().execute_with(|| { - assert_ok!(Exchange::add_to_whitelist( + assert_ok!(Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); assert_err!( - Exchange::remove_from_whitelist( + Teeracle::remove_from_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST5_MRENCLAVE ), crate::Error::::ReleaseNotWhitelisted ); - assert_eq!(Exchange::whitelist(COINGECKO_SRC.to_owned()).len(), 1); + assert_eq!(Teeracle::whitelist(COINGECKO_SRC.to_owned()).len(), 1); }) } #[test] fn remove_from_empty_whitelist_doesnt_crash() { new_test_ext().execute_with(|| { - assert_eq!(Exchange::whitelist(COINGECKO_SRC.to_owned()).len(), 0); + assert_eq!(Teeracle::whitelist(COINGECKO_SRC.to_owned()).len(), 0); assert_err!( - Exchange::remove_from_whitelist( + Teeracle::remove_from_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST5_MRENCLAVE ), crate::Error::::ReleaseNotWhitelisted ); - assert_eq!(Exchange::whitelist(COINGECKO_SRC.to_owned()).len(), 0); + assert_eq!(Teeracle::whitelist(COINGECKO_SRC.to_owned()).len(), 0); }) } @@ -429,19 +499,19 @@ fn remove_from_empty_whitelist_doesnt_crash() { fn non_root_remove_from_whitelist_fails() { new_test_ext().execute_with(|| { let signer = get_signer(TEST5_SIGNER_PUB); - assert_ok!(Exchange::add_to_whitelist( + assert_ok!(Teeracle::add_to_whitelist( RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); assert_err!( - Exchange::remove_from_whitelist( + Teeracle::remove_from_whitelist( RuntimeOrigin::signed(signer), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE ), BadOrigin ); - assert_eq!(Exchange::whitelist(COINGECKO_SRC.to_owned()).len(), 1); + assert_eq!(Teeracle::whitelist(COINGECKO_SRC.to_owned()).len(), 1); }) } diff --git a/teeracle/src/weights.rs b/teeracle/src/weights.rs index 544f6462..a5301216 100644 --- a/teeracle/src/weights.rs +++ b/teeracle/src/weights.rs @@ -22,6 +22,7 @@ pub trait WeightInfo { fn add_to_whitelist() -> Weight; fn remove_from_whitelist() -> Weight; fn update_exchange_rate() -> Weight; + fn update_oracle() -> Weight; } pub struct IntegriteeWeight(PhantomData); @@ -35,6 +36,9 @@ impl WeightInfo for IntegriteeWeight { fn update_exchange_rate() -> Weight { Weight::from_ref_time(46_200_000) } + fn update_oracle() -> Weight { + Weight::from_ref_time(46_200_000) + } } // For tests impl WeightInfo for () { @@ -47,4 +51,7 @@ impl WeightInfo for () { fn update_exchange_rate() -> Weight { Weight::from_ref_time(46_200_000) } + fn update_oracle() -> Weight { + Weight::from_ref_time(46_200_000) + } } diff --git a/teerex/Cargo.toml b/teerex/Cargo.toml index 3c673135..3c147845 100644 --- a/teerex/Cargo.toml +++ b/teerex/Cargo.toml @@ -19,27 +19,27 @@ ias-verify = { path = "./ias-verify", default-features = false } teerex-primitives = { path = "../primitives/teerex", default-features = false } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -timestamp = { package = "pallet-timestamp", default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +timestamp = { package = "pallet-timestamp", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } # benchmarking -frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } hex-literal = { version = "0.3.2", optional = true } -pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +pallet-balances = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } test-utils = { path = "../test-utils", default-features = false, optional = true } [dev-dependencies] env_logger = "0.9.0" -externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +externalities = { package = "sp-externalities", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } hex-literal = "0.3.2" -pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } test-utils = { path = "../test-utils" } [features] diff --git a/teerex/ias-verify/Cargo.toml b/teerex/ias-verify/Cargo.toml index f504ba6c..f796812c 100644 --- a/teerex/ias-verify/Cargo.toml +++ b/teerex/ias-verify/Cargo.toml @@ -17,10 +17,10 @@ serde_json = { version = "1.0", default-features = false, features = ["alloc"] } webpki = { default-features = false, git = "https://github.com/scs/webpki-nostd.git" } # substrate dependencies -frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-io = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } -sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.32" } +frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } [dev-dependencies] hex-literal = "*" diff --git a/teerex/ias-verify/src/lib.rs b/teerex/ias-verify/src/lib.rs index 75a43804..2801d65b 100644 --- a/teerex/ias-verify/src/lib.rs +++ b/teerex/ias-verify/src/lib.rs @@ -257,7 +257,7 @@ fn parse_report(report_raw: &[u8]) -> Result { println!("verifyRA attestation status is: {:?}", ra_status); // parse quote body if let Value::String(quote_raw) = &attn_report["isvEnclaveQuoteBody"] { - let quote = match base64::decode("e_raw) { + let quote = match base64::decode(quote_raw) { Ok(q) => q, Err(_) => return Err("Quote Decoding Error"), }; diff --git a/teerex/src/lib.rs b/teerex/src/lib.rs index 99734479..c8046a84 100644 --- a/teerex/src/lib.rs +++ b/teerex/src/lib.rs @@ -111,7 +111,7 @@ pub mod pallet { #[pallet::genesis_build] impl GenesisBuild for GenesisConfig { fn build(&self) { - AllowSGXDebugMode::::put(&self.allow_sgx_debug_mode); + AllowSGXDebugMode::::put(self.allow_sgx_debug_mode); } } @@ -308,7 +308,7 @@ impl Pallet { enclaves_count }; - >::insert(enclave_idx, &enclave); + >::insert(enclave_idx, enclave); Ok(().into()) } @@ -332,7 +332,7 @@ impl Pallet { /// the registry. fn swap_and_pop(index_to_remove: u64, new_enclaves_count: u64) -> DispatchResultWithPostInfo { if index_to_remove != new_enclaves_count { - let last_enclave = >::get(&new_enclaves_count) + let last_enclave = >::get(new_enclaves_count) .ok_or(Error::::EmptyEnclaveRegistry)?; >::insert(index_to_remove, &last_enclave); >::insert(last_enclave.pubkey, index_to_remove); @@ -365,7 +365,7 @@ impl Pallet { pub fn is_registered_enclave( account: &T::AccountId, ) -> Result { - ensure!(>::contains_key(&account), >::EnclaveIsNotRegistered); + ensure!(>::contains_key(account), >::EnclaveIsNotRegistered); Ok(true) } From 98f38b6ec409915477e79356f851c00109c3ca1b Mon Sep 17 00:00:00 2001 From: BillyWooo Date: Wed, 7 Dec 2022 15:35:36 +0100 Subject: [PATCH 11/11] update crate array-bytes (license issue) --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8e4349cd..8eba1538 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -82,9 +82,9 @@ dependencies = [ [[package]] name = "array-bytes" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a913633b0c922e6b745072795f50d90ebea78ba31a57e2ac8c2fc7b50950949" +checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" [[package]] name = "arrayref"