diff --git a/Cargo.lock b/Cargo.lock index 798129dc..8eba1538 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" @@ -81,19 +81,16 @@ dependencies = [ ] [[package]] -name = "arrayref" -version = "0.3.6" +name = "array-bytes" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" +checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" [[package]] -name = "arrayvec" -version = "0.4.12" +name = "arrayref" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -dependencies = [ - "nodrop", -] +checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" [[package]] name = "arrayvec" @@ -109,9 +106,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 +161,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,17 +195,7 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9cf849ee05b2ee5fba5e36f97ff8ec2533916700fc0758d40d92136a42f3388" dependencies = [ - "digest 0.10.3", -] - -[[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", + "digest 0.10.5", ] [[package]] @@ -246,15 +239,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 +269,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" @@ -320,6 +313,16 @@ dependencies = [ "sp-std", ] +[[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" @@ -333,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" @@ -367,7 +364,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 +425,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 +509,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 +565,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 +595,7 @@ dependencies = [ "ff", "generic-array 0.14.6", "group", - "rand_core 0.6.3", + "rand_core 0.6.4", "sec1", "subtle", "zeroize", @@ -562,9 +603,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,15 +641,15 @@ 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", ] [[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", @@ -619,7 +660,7 @@ 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.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support", "frame-system", @@ -654,7 +695,7 @@ 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?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "bitflags", "frame-metadata", @@ -679,13 +720,14 @@ dependencies = [ "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?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "Inflector", "cfg-expr", @@ -699,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.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -711,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.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "proc-macro2", "quote", @@ -721,7 +763,7 @@ 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.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-support", "log", @@ -733,6 +775,7 @@ dependencies = [ "sp-runtime", "sp-std", "sp-version", + "sp-weights", ] [[package]] @@ -743,9 +786,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 +801,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 +811,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 +829,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 +846,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 +864,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 +914,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 +936,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,18 +1030,28 @@ 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" @@ -1027,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", ] @@ -1065,15 +1118,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 +1157,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 +1215,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 +1236,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", @@ -1232,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", @@ -1243,9 +1299,9 @@ dependencies = [ [[package]] name = "memory_units" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" +checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3" [[package]] name = "merlin" @@ -1278,7 +1334,7 @@ dependencies = [ "matrixmultiply", "nalgebra-macros", "num-complex", - "num-rational 0.4.1", + "num-rational", "num-traits", "rand 0.8.5", "rand_distr", @@ -1297,12 +1353,6 @@ 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" @@ -1311,9 +1361,9 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "num-bigint" -version = "0.2.6" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg", "num-integer", @@ -1331,12 +1381,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]] @@ -1349,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", - "num-integer", - "num-traits", -] - [[package]] name = "num-rational" version = "0.4.1" @@ -1368,6 +1406,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", + "num-bigint", "num-integer", "num-traits", ] @@ -1384,9 +1423,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 +1442,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,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.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -1558,7 +1597,7 @@ 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.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "frame-benchmarking", "frame-support", @@ -1576,8 +1615,9 @@ dependencies = [ [[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.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", "log", @@ -1589,9 +1629,9 @@ dependencies = [ [[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", @@ -1616,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", @@ -1642,9 +1682,9 @@ dependencies = [ [[package]] name = "parity-wasm" -version = "0.42.2" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" +checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304" [[package]] name = "parking_lot" @@ -1658,9 +1698,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,17 +1745,28 @@ 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" -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", @@ -1737,9 +1788,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 +1832,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -1801,7 +1852,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 +1866,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 +1918,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 +1938,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 +1958,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 +2033,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 +2047,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 +2081,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 +2095,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 +2129,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 +2149,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 +2185,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", ] @@ -2175,7 +2233,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,14 +2259,14 @@ 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?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "hash-db", "log", @@ -2226,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.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "blake2", "proc-macro-crate", @@ -2238,7 +2296,7 @@ dependencies = [ [[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.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "scale-info", @@ -2251,7 +2309,7 @@ dependencies = [ [[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.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "integer-sqrt", "num-traits", @@ -2266,18 +2324,18 @@ dependencies = [ [[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?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ + "array-bytes", "base58", "bitflags", - "blake2-rfc", + "blake2", "byteorder", "dyn-clonable", "ed25519-zebra", "futures", "hash-db", "hash256-std-hasher", - "hex", "impl-serde", "lazy_static", "libsecp256k1", @@ -2312,12 +2370,12 @@ dependencies = [ [[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?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "blake2", "byteorder", - "digest 0.10.3", - "sha2 0.10.5", + "digest 0.10.5", + "sha2 0.10.6", "sha3", "sp-std", "twox-hash", @@ -2326,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.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "proc-macro2", "quote", @@ -2337,7 +2395,7 @@ dependencies = [ [[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.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "proc-macro2", "quote", @@ -2347,7 +2405,7 @@ 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?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "environmental", "parity-scale-codec", @@ -2358,7 +2416,7 @@ dependencies = [ [[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.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -2372,7 +2430,7 @@ dependencies = [ [[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?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "bytes", "futures", @@ -2398,7 +2456,7 @@ 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.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "lazy_static", "sp-core", @@ -2409,7 +2467,7 @@ dependencies = [ [[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?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "futures", @@ -2425,7 +2483,7 @@ dependencies = [ [[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?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "backtrace", "lazy_static", @@ -2435,7 +2493,7 @@ dependencies = [ [[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.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "either", "hash256-std-hasher", @@ -2452,12 +2510,13 @@ dependencies = [ "sp-core", "sp-io", "sp-std", + "sp-weights", ] [[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.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -2475,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.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "Inflector", "proc-macro-crate", @@ -2487,7 +2546,7 @@ 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?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "scale-info", @@ -2498,7 +2557,7 @@ dependencies = [ [[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?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "hash-db", "log", @@ -2520,12 +2579,12 @@ 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?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.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "impl-serde", "parity-scale-codec", @@ -2538,7 +2597,7 @@ dependencies = [ [[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.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "async-trait", "futures-timer", @@ -2554,7 +2613,7 @@ dependencies = [ [[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?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "sp-std", @@ -2566,7 +2625,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?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "ahash", "hash-db", @@ -2589,7 +2648,7 @@ 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?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "impl-serde", "parity-scale-codec", @@ -2606,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.29#cc370aa61e15c18d23a2f686b812fd576a630afe" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -2617,7 +2676,7 @@ 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?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" dependencies = [ "impl-trait-for-tuples", "log", @@ -2626,17 +2685,43 @@ dependencies = [ "wasmi", ] +[[package]] +name = "sp-weights" +version = "4.0.0" +source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.32#5ea6d95309aaccfa399c5f72e5a14a4b7c6c4ca1" +dependencies = [ + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", + "serde", + "smallvec", + "sp-arithmetic", + "sp-core", + "sp-debug-derive", + "sp-std", +] + [[package]] name = "spin" 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 +2805,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", @@ -2789,18 +2874,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 +2946,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 +2958,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 +2969,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 +3055,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 +3077,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 +3089,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" @@ -3109,28 +3200,37 @@ checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" [[package]] name = "wasmi" -version = "0.9.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca00c5147c319a8ec91ec1a0edbec31e566ce2c9cc93b3f9bb86a9efd0eb795d" +checksum = "06c326c93fbf86419608361a2c925a31754cf109da1b8b55737070b4d6669422" dependencies = [ - "downcast-rs", - "libc", - "memory_units", - "num-rational 0.2.4", - "num-traits", "parity-wasm", "wasmi-validation", + "wasmi_core", ] [[package]] name = "wasmi-validation" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "165343ecd6c018fc09ebcae280752702c9a2ef3e6f8d02f1cfcbdb53ef6d7937" +checksum = "91ff416ad1ff0c42e5a926ed5d5fab74c0f098749aa0ad8b2a34b982ce0e867b" dependencies = [ "parity-wasm", ] +[[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", + "num-rational", + "num-traits", +] + [[package]] name = "web-sys" version = "0.3.60" @@ -3194,46 +3294,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..93d2e19d 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.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.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.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.29" } +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 f217cf6c..7f4696b5 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"; @@ -640,10 +640,9 @@ mod tests { use super::Call as ClaimsCall; use frame_support::{ assert_err, assert_noop, assert_ok, - dispatch::DispatchError::BadOrigin, + dispatch::{DispatchError::BadOrigin, GetDispatchInfo, Pays}, ord_parameter_types, parameter_types, - traits::{ExistenceRequirement, GenesisBuild}, - weights::{GetDispatchInfo, Pays}, + traits::{ExistenceRequirement, GenesisBuild, WithdrawReasons}, }; use sp_runtime::{ @@ -676,8 +675,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 +684,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 +703,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; @@ -716,15 +715,18 @@ mod tests { parameter_types! { pub const MinVestedTransfer: u64 = 1; + pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons = + WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE); } impl pallet_vesting::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type BlockNumberToBalance = Identity; type MinVestedTransfer = MinVestedTransfer; type WeightInfo = (); const MAX_VESTING_SCHEDULES: u32 = 28; + type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons; } parameter_types! { @@ -735,7 +737,7 @@ mod tests { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type VestingSchedule = Vesting; type Prefix = Prefix; type MoveClaimOrigin = frame_system::EnsureSignedBy; @@ -811,7 +813,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(), &[][..]) )); @@ -826,16 +828,25 @@ 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(), &[][..])), + Claims::claim( + RuntimeOrigin::none(), + 42, + sig::(&alice(), &42u64.encode(), &[][..]) + ), Error::::SignerHasNoClaim ); assert_ok!(Claims::claim( - Origin::none(), + RuntimeOrigin::none(), 42, sig::(&bob(), &42u64.encode(), &[][..]) )); @@ -848,10 +859,15 @@ 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(), + RuntimeOrigin::none(), 42, s, StatementKind::Regular.to_text().to_vec() @@ -863,8 +879,16 @@ 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); }); } @@ -873,20 +897,28 @@ 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(), &[][..]) )); @@ -899,7 +931,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(), @@ -907,7 +939,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(), @@ -918,7 +950,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() @@ -928,7 +960,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(), @@ -942,14 +974,20 @@ 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); }); @@ -961,13 +999,16 @@ 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(), &[][..]) )); 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); }); @@ -977,7 +1018,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(); @@ -991,13 +1032,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(); @@ -1011,7 +1052,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); }); } @@ -1020,18 +1061,22 @@ 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); 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(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(), + RuntimeOrigin::none(), 69, sig::(&bob(), &69u64.encode(), &[][..]) )); @@ -1045,23 +1090,33 @@ 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); 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( - Origin::root(), + RuntimeOrigin::root(), eth(&bob()), 200, Some((50, 10, 1)), None )); assert_ok!(Claims::claim( - Origin::none(), + RuntimeOrigin::none(), 69, sig::(&bob(), &69u64.encode(), &[][..]) )); @@ -1086,7 +1141,7 @@ mod tests { new_test_ext().execute_with(|| { assert_noop!( Claims::mint_claim( - Origin::signed(42), + RuntimeOrigin::signed(42), eth(&bob()), 200, None, @@ -1098,7 +1153,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() @@ -1106,18 +1161,18 @@ mod tests { Error::::SignerHasNoClaim ); assert_ok!(Claims::mint_claim( - Origin::root(), + RuntimeOrigin::root(), eth(&bob()), 200, None, 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() @@ -1132,7 +1187,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(), &[][..]) ), @@ -1146,12 +1201,16 @@ 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 ); }); @@ -1170,7 +1229,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)), @@ -1181,7 +1240,11 @@ 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, ); }); @@ -1192,7 +1255,11 @@ 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 ); }); @@ -1203,7 +1270,11 @@ 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 ); }); diff --git a/parentchain/Cargo.toml b/parentchain/Cargo.toml index 76122848..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.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.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.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.32" } +pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } [features] default = ["std"] diff --git a/parentchain/src/mock.rs b/parentchain/src/mock.rs index d9bbef63..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, @@ -68,16 +69,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 +101,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..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.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.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 356de057..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.git", branch = "polkadot-v0.9.29" } +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 fcc7f4c8..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.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.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 c6c9bf4b..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.git", branch = "polkadot-v0.9.29" } +sp-std = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } [features] diff --git a/primitives/teerex/Cargo.toml b/primitives/teerex/Cargo.toml index 22616c1e..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.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.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/sidechain/Cargo.toml b/sidechain/Cargo.toml index a7857754..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.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.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.git", branch = "polkadot-v0.9.29" } +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.git", branch = "polkadot-v0.9.29" } +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.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.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.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.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/lib.rs b/sidechain/src/lib.rs index 586a295d..138d77c6 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; } diff --git a/sidechain/src/mock.rs b/sidechain/src/mock.rs index 3fa828c7..b9b7a25f 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, @@ -67,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; @@ -99,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 = (); @@ -125,7 +126,7 @@ parameter_types! { } impl pallet_teerex::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type MomentsPerDay = MomentsPerDay; type WeightInfo = (); @@ -138,7 +139,7 @@ parameter_types! { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); } diff --git a/sidechain/src/tests.rs b/sidechain/src/tests.rs index 370c1b8a..05bc93cc 100644 --- a/sidechain/src/tests.rs +++ b/sidechain/src/tests.rs @@ -39,7 +39,7 @@ fn confirm_imported_sidechain_block_invalid_next_finalization_candidate() { assert_err!( Sidechain::confirm_imported_sidechain_block( - Origin::signed(signer7.clone()), + RuntimeOrigin::signed(signer7.clone()), shard7, block_number, block_number, @@ -64,7 +64,7 @@ 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, block_number, next_finalization_block_candidate, @@ -72,7 +72,7 @@ fn confirm_imported_sidechain_block_works_for_correct_shard() { )); 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)); }) } @@ -91,7 +91,7 @@ fn confirm_imported_sidechain_block_from_shard_neq_mrenclave_errs() { assert_err!( Sidechain::confirm_imported_sidechain_block( - Origin::signed(signer7), + RuntimeOrigin::signed(signer7), shard4, block_number, block_number, @@ -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(), )); @@ -238,7 +238,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, next_finalized_block_number, @@ -246,8 +246,10 @@ fn confirm_block( )?; if check_for_event { - let expected_event = - Event::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/Cargo.toml b/teeracle/Cargo.toml index 98042079..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.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.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.git", branch = "polkadot-v0.9.29" } +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.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.32" } [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.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.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.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.git", branch = "polkadot-v0.9.29" } +timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.32" } [features] diff --git a/teeracle/src/lib.rs b/teeracle/src/lib.rs index fa74b785..e3b5feff 100644 --- a/teeracle/src/lib.rs +++ b/teeracle/src/lib.rs @@ -56,7 +56,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 bfef81ec..8b27cb12 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, @@ -65,16 +66,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 +98,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 = (); @@ -126,7 +127,7 @@ parameter_types! { } impl pallet_teerex::Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type MomentsPerDay = MomentsPerDay; type WeightInfo = (); @@ -134,7 +135,7 @@ impl pallet_teerex::Config for Test { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type WeightInfo = (); type MaxWhitelistedReleases = MaxWhitelistedReleases; type MaxOracleBlobLen = MaxOracleBlobLen; diff --git a/teeracle/src/tests.rs b/teeracle/src/tests.rs index 66dba786..df345cf3 100644 --- a/teeracle/src/tests.rs +++ b/teeracle/src/tests.rs @@ -40,15 +40,19 @@ 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!(Teeracle::add_to_whitelist(Origin::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!(Teeracle::update_exchange_rate( - Origin::signed(signer), + RuntimeOrigin::signed(signer), src.to_owned(), DOT_USD_TRADING_PAIR.to_owned(), rate @@ -62,7 +66,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::Teeracle(crate::Event::ExchangeRateUpdated( + let expected_event = RuntimeEvent::Teeracle(crate::Event::ExchangeRateUpdated( COINGECKO_SRC.to_owned(), DOT_USD_TRADING_PAIR.to_owned(), Some(rate), @@ -90,12 +94,12 @@ fn update_oracle_works() { let oracle_blob: crate::OracleDataBlob = vec![1].try_into().expect("Can Convert to BoundedVec; QED"); assert_ok!(Teeracle::update_oracle( - Origin::signed(signer), + RuntimeOrigin::signed(signer), OracleDataName::from("Test_Oracle_Name"), DataSource::from("Test_Source_Name"), oracle_blob.clone() ),); - let expected_event = Event::Teeracle(crate::Event::OracleUpdated( + let expected_event = RuntimeEvent::Teeracle(crate::Event::OracleUpdated( OracleDataName::from("Test_Oracle_Name"), DataSource::from("Test_Source_Name"), )); @@ -147,7 +151,7 @@ fn update_exchange_rate_to_none_delete_exchange_rate() { update_exchange_rate_dot_dollars_ok(COINGECKO_SRC, None); - let expected_event = Event::Teeracle(crate::Event::ExchangeRateDeleted( + let expected_event = RuntimeEvent::Teeracle(crate::Event::ExchangeRateDeleted( COINGECKO_SRC.to_owned(), DOT_USD_TRADING_PAIR.to_owned(), )); @@ -168,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 = Event::Teeracle(crate::Event::ExchangeRateDeleted( + let expected_event = RuntimeEvent::Teeracle(crate::Event::ExchangeRateDeleted( COINGECKO_SRC.to_owned(), DOT_USD_TRADING_PAIR.to_owned(), )); @@ -188,7 +192,7 @@ fn update_exchange_rate_from_not_registered_enclave_fails() { let rate = U32F32::from_num(43.65); assert_err!( Teeracle::update_exchange_rate( - Origin::signed(signer), + RuntimeOrigin::signed(signer), COINGECKO_SRC.to_owned(), DOT_USD_TRADING_PAIR.to_owned(), Some(rate) @@ -204,7 +208,7 @@ fn update_oracle_from_not_registered_enclave_fails() { let signer = get_signer(TEST4_SIGNER_PUB); assert_noop!( Teeracle::update_oracle( - Origin::signed(signer), + RuntimeOrigin::signed(signer), OracleDataName::from("Test_Oracle_Name"), DataSource::from("Test_Source_Name"), vec![0].try_into().expect("Can Convert to BoundedVec; QED") @@ -220,7 +224,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() )); @@ -228,7 +232,7 @@ fn update_exchange_rate_from_not_whitelisted_oracle_fails() { let rate = U32F32::from_num(43.65); assert_err!( Teeracle::update_exchange_rate( - Origin::signed(signer), + RuntimeOrigin::signed(signer), COINGECKO_SRC.to_owned(), DOT_USD_TRADING_PAIR.to_owned(), Some(rate) @@ -244,14 +248,14 @@ fn update_oracle_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() )); assert_noop!( Teeracle::update_oracle( - Origin::signed(signer), + RuntimeOrigin::signed(signer), OracleDataName::from("Test_Oracle_Name"), DataSource::from("Test_Source_Name"), vec![0].try_into().expect("Can Convert to BoundedVec; QED") @@ -271,7 +275,7 @@ fn update_exchange_rate_with_too_long_trading_pair_fails() { let too_long_trading_pair = "123456789_12".to_owned(); assert_err!( Teeracle::update_exchange_rate( - Origin::signed(signer), + RuntimeOrigin::signed(signer), COINGECKO_SRC.to_owned(), too_long_trading_pair, rate @@ -285,11 +289,11 @@ fn update_exchange_rate_with_too_long_trading_pair_fails() { fn add_to_whitelist_works() { new_test_ext().execute_with(|| { assert_ok!(Teeracle::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); - let expected_event = Event::Teeracle(crate::Event::AddedToWhitelist( + let expected_event = RuntimeEvent::Teeracle(crate::Event::AddedToWhitelist( COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE, )); @@ -302,16 +306,16 @@ fn add_to_whitelist_works() { fn add_mulitple_src_to_whitelists_works() { new_test_ext().execute_with(|| { assert_ok!(Teeracle::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); assert_ok!(Teeracle::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINMARKETCAP_SRC.to_owned(), TEST4_MRENCLAVE )); - let expected_event = Event::Teeracle(crate::Event::AddedToWhitelist( + let expected_event = RuntimeEvent::Teeracle(crate::Event::AddedToWhitelist( COINMARKETCAP_SRC.to_owned(), TEST4_MRENCLAVE, )); @@ -326,12 +330,16 @@ fn add_mulitple_src_to_whitelists_works() { fn add_two_times_to_whitelist_fails() { new_test_ext().execute_with(|| { assert_ok!(Teeracle::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); assert_err!( - Teeracle::add_to_whitelist(Origin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE), + Teeracle::add_to_whitelist( + RuntimeOrigin::root(), + COINGECKO_SRC.to_owned(), + TEST4_MRENCLAVE + ), crate::Error::::ReleaseAlreadyWhitelisted ); assert_eq!(Teeracle::whitelist(COINGECKO_SRC.to_owned()).len(), 1); @@ -342,57 +350,61 @@ fn add_two_times_to_whitelist_fails() { fn add_too_many_oracles_to_whitelist_fails() { new_test_ext().execute_with(|| { assert_ok!(Teeracle::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); assert_ok!(Teeracle::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST5_MRENCLAVE )); assert_ok!(Teeracle::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d2") )); assert_ok!(Teeracle::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d3") )); assert_ok!(Teeracle::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d4") )); assert_ok!(Teeracle::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d5") )); assert_ok!(Teeracle::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d6") )); assert_ok!(Teeracle::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d7") )); assert_ok!(Teeracle::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d8") )); assert_ok!(Teeracle::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), hex!("f4dedfc9e5fcc48443332bc9b23161c34a3c3f5a692eaffdb228db27b704d9d9") )); assert_err!( - Teeracle::add_to_whitelist(Origin::root(), COINGECKO_SRC.to_owned(), TEST8_MRENCLAVE), + Teeracle::add_to_whitelist( + RuntimeOrigin::root(), + COINGECKO_SRC.to_owned(), + TEST8_MRENCLAVE + ), crate::Error::::ReleaseWhitelistOverflow ); assert_eq!(Teeracle::whitelist(COINGECKO_SRC.to_owned()).len(), 10); @@ -403,7 +415,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!( - Teeracle::add_to_whitelist(Origin::root(), too_long_source, TEST4_MRENCLAVE), + Teeracle::add_to_whitelist(RuntimeOrigin::root(), too_long_source, TEST4_MRENCLAVE), crate::Error::::DataSourceStringTooLong ); }) @@ -415,7 +427,7 @@ fn non_root_add_to_whitelist_fails() { let signer = get_signer(TEST5_SIGNER_PUB); assert_err!( Teeracle::add_to_whitelist( - Origin::signed(signer), + RuntimeOrigin::signed(signer), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE ), @@ -429,16 +441,16 @@ fn non_root_add_to_whitelist_fails() { fn remove_from_whitelist_works() { new_test_ext().execute_with(|| { assert_ok!(Teeracle::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); assert_ok!(Teeracle::remove_from_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); - let expected_event = Event::Teeracle(crate::Event::RemovedFromWhitelist( + let expected_event = RuntimeEvent::Teeracle(crate::Event::RemovedFromWhitelist( COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE, )); @@ -451,13 +463,13 @@ fn remove_from_whitelist_works() { fn remove_from_whitelist_not_whitelisted_fails() { new_test_ext().execute_with(|| { assert_ok!(Teeracle::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); assert_err!( Teeracle::remove_from_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST5_MRENCLAVE ), @@ -473,7 +485,7 @@ fn remove_from_empty_whitelist_doesnt_crash() { assert_eq!(Teeracle::whitelist(COINGECKO_SRC.to_owned()).len(), 0); assert_err!( Teeracle::remove_from_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST5_MRENCLAVE ), @@ -488,13 +500,13 @@ fn non_root_remove_from_whitelist_fails() { new_test_ext().execute_with(|| { let signer = get_signer(TEST5_SIGNER_PUB); assert_ok!(Teeracle::add_to_whitelist( - Origin::root(), + RuntimeOrigin::root(), COINGECKO_SRC.to_owned(), TEST4_MRENCLAVE )); assert_err!( Teeracle::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..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.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.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.git", branch = "polkadot-v0.9.29" } +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.git", branch = "polkadot-v0.9.29" } +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.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.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.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.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 3d6e39c5..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.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.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/src/lib.rs b/teerex/src/lib.rs index 5d5c4d48..c8046a84 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..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, @@ -70,16 +71,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 +103,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 +130,7 @@ parameter_types! { } impl Config for Test { - type Event = Event; + type RuntimeEvent = RuntimeEvent; type Currency = Balances; type MomentsPerDay = MomentsPerDay; type MaxSilenceTime = MaxSilenceTime; @@ -172,7 +173,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..1dd8c6ff 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,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(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 +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(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 +203,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 +226,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 +253,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 +281,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 +297,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 +313,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 +334,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 +373,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 +393,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 +407,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 +436,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 +462,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 +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(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 +505,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 +526,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 +542,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(), @@ -543,8 +555,9 @@ fn verify_unshield_funds_works() { .is_ok()); assert_eq!(Balances::free_balance(bonding_account), 50); - let expected_event = - Event::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)); }) } @@ -560,7 +573,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 +596,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 +611,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 +620,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 +645,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 +677,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(), ));